changeset 29844:fd2081fe0602

Merge
author duke
date Wed, 05 Jul 2017 20:28:17 +0200
parents f7bd3ddc9292 ae6f4d402314
children 38f98cb6b335
files
diffstat 296 files changed, 4421 insertions(+), 3204 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Thu Apr 09 17:37:46 2015 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 20:28:17 2017 +0200
@@ -301,3 +301,4 @@
 eb7febe45865ba6b81f2ea68082262d0708a0b22 jdk9-b56
 f25ee9f62427a9ba27418e5531a89754791a305b jdk9-b57
 6e78dd9b121037719a065fe8fb25b936babdfecb jdk9-b58
+39e8a131289e8386aa4c3e4b184faa812a7c0421 jdk9-b59
--- a/common/autoconf/basics.m4	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/basics.m4	Wed Jul 05 20:28:17 2017 +0200
@@ -658,6 +658,8 @@
     fi
     OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
     $MKDIR -p "$OUTPUT_ROOT"
+    CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
+    $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
     if test ! -d "$OUTPUT_ROOT"; then
       AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
     fi
@@ -703,6 +705,7 @@
   AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
   AC_SUBST(CONF_NAME, $CONF_NAME)
   AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
+  AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
 
   # The spec.gmk file contains all variables for the make system.
   AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
--- a/common/autoconf/basics_windows.m4	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/basics_windows.m4	Wed Jul 05 20:28:17 2017 +0200
@@ -383,45 +383,46 @@
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     AC_MSG_CHECKING([if fixpath can be created])
     FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
-    FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
+    FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
+    FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
     if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-      FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
-      FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
       # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
-      FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
+      FIXPATH="$FIXPATH_BIN -c"
     elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
-      FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
-      FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
-
       # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
       # @ was chosen as separator to minimize risk of other tools messing around with it
-      all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
+      all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \
+          | tr ' ' '\n' | grep '^/./' | sort | uniq`
       fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
-
-      FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
+      FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
     fi
-    rm -f $OUTPUT_ROOT/fixpath*
-    cd $OUTPUT_ROOT
-    $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
+    FIXPATH_SRC_W="$FIXPATH_SRC"
+    FIXPATH_BIN_W="$FIXPATH_BIN"
+    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
+    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
+    $RM -rf $FIXPATH_BIN $FIXPATH_DIR
+    $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
+    cd $FIXPATH_DIR
+    $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
     cd $CURDIR
 
-    if test ! -x $OUTPUT_ROOT/fixpath.exe; then
+    if test ! -x $FIXPATH_BIN; then
       AC_MSG_RESULT([no])
-      cat $OUTPUT_ROOT/fixpath1.log
-      AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
+      cat $FIXPATH_DIR/fixpath1.log
+      AC_MSG_ERROR([Could not create $FIXPATH_BIN])
     fi
     AC_MSG_RESULT([yes])
     AC_MSG_CHECKING([if fixpath.exe works])
-    cd $OUTPUT_ROOT
-    $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
+    cd $FIXPATH_DIR
+    $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
+        > $FIXPATH_DIR/fixpath2.log 2>&1
     cd $CURDIR
-    if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
+    if test ! -x $FIXPATH_DIR/fixpath2.exe; then
       AC_MSG_RESULT([no])
-      cat $OUTPUT_ROOT/fixpath2.log
+      cat $FIXPATH_DIR/fixpath2.log
       AC_MSG_ERROR([fixpath did not work!])
     fi
     AC_MSG_RESULT([yes])
-    rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
   fi
 
   AC_SUBST(FIXPATH)
--- a/common/autoconf/build-performance.m4	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/build-performance.m4	Wed Jul 05 20:28:17 2017 +0200
@@ -336,11 +336,4 @@
   AC_MSG_CHECKING([whether to use sjavac])
   AC_MSG_RESULT([$ENABLE_SJAVAC])
   AC_SUBST(ENABLE_SJAVAC)
-
-  if test "x$ENABLE_SJAVAC" = xyes; then
-    SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
-  else
-    SJAVAC_SERVER_DIR=
-  fi
-  AC_SUBST(SJAVAC_SERVER_DIR)
 ])
--- a/common/autoconf/configure.ac	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/configure.ac	Wed Jul 05 20:28:17 2017 +0200
@@ -261,7 +261,7 @@
 
 # We're messing a bit with internal autoconf variables to put the config.status
 # in the output directory instead of the current directory.
-CONFIG_STATUS="$OUTPUT_ROOT/config.status"
+CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
 
 # Create the actual output files. Now the main work of configure is done.
 AC_OUTPUT
@@ -269,7 +269,7 @@
 
 # Try to move the config.log file to the output directory.
 if test -e ./config.log; then
-  $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
+  $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
 fi
 
 # Make the compare script executable
--- a/common/autoconf/generated-configure.sh	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Wed Jul 05 20:28:17 2017 +0200
@@ -632,7 +632,6 @@
 CFLAGS_CCACHE
 CCACHE
 USE_PRECOMPILED_HEADER
-SJAVAC_SERVER_DIR
 ENABLE_SJAVAC
 SJAVAC_SERVER_JAVA_FLAGS
 SJAVAC_SERVER_JAVA
@@ -884,6 +883,7 @@
 CHECK_MAKE
 CHECK_GMAKE
 PKGHANDLER
+CONFIGURESUPPORT_OUTPUTDIR
 OUTPUT_ROOT
 CONF_NAME
 SPEC
@@ -4365,7 +4365,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1428017006
+DATE_WHEN_GENERATED=1428676283
 
 ###############################################################################
 #
@@ -15266,6 +15266,8 @@
     fi
     OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
     $MKDIR -p "$OUTPUT_ROOT"
+    CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
+    $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
     if test ! -d "$OUTPUT_ROOT"; then
       as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
     fi
@@ -15450,6 +15452,7 @@
   OUTPUT_ROOT=$OUTPUT_ROOT
 
 
+
   # The spec.gmk file contains all variables for the make system.
   ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
 
@@ -27622,7 +27625,7 @@
 $as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
 
     # We need to create a couple of temporary files.
-    VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
+    VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
     $MKDIR -p $VS_ENV_TMP_DIR
 
     # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
@@ -43136,50 +43139,69 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
 $as_echo_n "checking if fixpath can be created... " >&6; }
     FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
-    FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
+    FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
+    FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
     if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-      FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
-      FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
       # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
-      FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
+      FIXPATH="$FIXPATH_BIN -c"
     elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
-      FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
-      FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
-
       # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
       # @ was chosen as separator to minimize risk of other tools messing around with it
-      all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
+      all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" \
+          | tr ' ' '\n' | grep '^/./' | sort | uniq`
       fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
-
-      FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
-    fi
-    rm -f $OUTPUT_ROOT/fixpath*
-    cd $OUTPUT_ROOT
-    $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
+      FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
+    fi
+    FIXPATH_SRC_W="$FIXPATH_SRC"
+    FIXPATH_BIN_W="$FIXPATH_BIN"
+
+  unix_path="$FIXPATH_SRC_W"
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+    windows_path=`$CYGPATH -m "$unix_path"`
+    FIXPATH_SRC_W="$windows_path"
+  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+    windows_path=`cmd //c echo $unix_path`
+    FIXPATH_SRC_W="$windows_path"
+  fi
+
+
+  unix_path="$FIXPATH_BIN_W"
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+    windows_path=`$CYGPATH -m "$unix_path"`
+    FIXPATH_BIN_W="$windows_path"
+  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+    windows_path=`cmd //c echo $unix_path`
+    FIXPATH_BIN_W="$windows_path"
+  fi
+
+    $RM -rf $FIXPATH_BIN $FIXPATH_DIR
+    $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
+    cd $FIXPATH_DIR
+    $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
     cd $CURDIR
 
-    if test ! -x $OUTPUT_ROOT/fixpath.exe; then
+    if test ! -x $FIXPATH_BIN; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      cat $OUTPUT_ROOT/fixpath1.log
-      as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
+      cat $FIXPATH_DIR/fixpath1.log
+      as_fn_error $? "Could not create $FIXPATH_BIN" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
 $as_echo_n "checking if fixpath.exe works... " >&6; }
-    cd $OUTPUT_ROOT
-    $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
+    cd $FIXPATH_DIR
+    $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
+        > $FIXPATH_DIR/fixpath2.log 2>&1
     cd $CURDIR
-    if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
+    if test ! -x $FIXPATH_DIR/fixpath2.exe; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      cat $OUTPUT_ROOT/fixpath2.log
+      cat $FIXPATH_DIR/fixpath2.log
       as_fn_error $? "fixpath did not work!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-    rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
   fi
 
 
@@ -51415,13 +51437,6 @@
 $as_echo "$ENABLE_SJAVAC" >&6; }
 
 
-  if test "x$ENABLE_SJAVAC" = xyes; then
-    SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
-  else
-    SJAVAC_SERVER_DIR=
-  fi
-
-
 
 # Can the C/C++ compiler use precompiled headers?
 
@@ -51849,7 +51864,7 @@
 
 # We're messing a bit with internal autoconf variables to put the config.status
 # in the output directory instead of the current directory.
-CONFIG_STATUS="$OUTPUT_ROOT/config.status"
+CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
 
 # Create the actual output files. Now the main work of configure is done.
 cat >confcache <<\_ACEOF
@@ -53017,7 +53032,7 @@
 
 # Try to move the config.log file to the output directory.
 if test -e ./config.log; then
-  $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
+  $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
 fi
 
 # Make the compare script executable
--- a/common/autoconf/spec.gmk.in	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/spec.gmk.in	Wed Jul 05 20:28:17 2017 +0200
@@ -59,7 +59,7 @@
 MAKE := @MAKE@
 
 # The default make arguments
-MAKE_ARGS = $(MAKE_LOG_FLAGS) -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
+MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" LOG_LEVEL=$(LOG_LEVEL)
 
 OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
@@ -231,13 +231,14 @@
 # Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
 SUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/support
 BUILDTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/buildtools
-MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/makesupport
 
 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
+# This does not get overridden in a bootcycle build
+CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
 
 HOTSPOT_DIST=@HOTSPOT_DIST@
 
@@ -259,7 +260,7 @@
 ENABLE_SJAVAC:=@ENABLE_SJAVAC@
 # Store sjavac server synchronization files here, and
 # the sjavac server log files.
-SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@
+SJAVAC_SERVER_DIR=$(MAKESUPPORT_OUTPUTDIR)/javacservers
 
 # Number of parallel jobs to use for compilation
 JOBS?=@JOBS@
--- a/common/autoconf/toolchain_windows.m4	Thu Apr 09 17:37:46 2015 -0700
+++ b/common/autoconf/toolchain_windows.m4	Wed Jul 05 20:28:17 2017 +0200
@@ -270,7 +270,7 @@
     AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
 
     # We need to create a couple of temporary files.
-    VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
+    VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
     $MKDIR -p $VS_ENV_TMP_DIR
 
     # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
--- a/corba/.hgtags	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/.hgtags	Wed Jul 05 20:28:17 2017 +0200
@@ -301,3 +301,4 @@
 ef4afd6832b00b8687832c2a36c90e43750ebe40 jdk9-b56
 d8ebf1a5b18ccbc849f5bf0f80aa3d78583eee68 jdk9-b57
 86dd5de1f5cb09073019bd629e22cfcd012d8b4b jdk9-b58
+cda6ae062f85fac5555f4e1318885b0ecd998bd1 jdk9-b59
--- a/corba/src/java.corba/share/classes/javax/activity/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/javax/activity/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2004, 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
@@ -30,7 +30,7 @@
 <body bgcolor="white">
 Contains Activity service related exceptions thrown by the ORB machinery during
 unmarshalling.
-<p>
+
 @since 1.5
 </body>
 </html>
--- a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -232,6 +232,8 @@
      * and <tt>loader</tt> is non-null, then call <tt>loader.loadClass(className)</tt>.
      * <LI>If a class was successfully loaded by step 1, 2, 3, or 4, then
      *  return the loaded class, else throw <tt>ClassNotFoundException</tt>.
+     * </UL>
+     *
      * @param className the name of the class.
      * @param remoteCodebase a space-separated list of URLs at which
      * the class might be found. May be null.
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -52,21 +52,21 @@
  * </OL>
  *
  * <P>
- * <a name="anyOps"</a>
+ * <a name="anyOps"></a>
  * A large part of the <code>Any</code> class consists of pairs of methods
  * for inserting values into and extracting values from an
  * <code>Any</code> object.
  * <P>
  * For a given primitive type X, these methods are:
  *  <dl>
- *      <dt><code><bold> void insert_X(X x)</bold></code>
+ *      <dt><code><b>void insert_X(X x)</b></code>
  *      <dd> This method allows the insertion of
  *        an instance <code>x</code> of primitive type <code>X</code>
  *    into the <code>value</code> field of the <code>Any</code> object.
  *    Note that the method
  *    <code>insert_X</code> also resets the <code>Any</code> object's
  *    <code>type</code> field if necessary.
- *      <dt> <code><bold>X extract_X()</bold></code>
+ *      <dt> <code><b>X extract_X()</b></code>
  *      <dd> This method allows the extraction of an instance of
  *        type <code>X</code> from the <code>Any</code> object.
  *    <BR>
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -40,10 +40,10 @@
  * <P>
  * The class also contains two methods:
  * <UL>
- * <LI><code>public int <bold>value</bold>()</code> -- which accesses the
+ * <LI><code>public int <b>value</b>()</code> -- which accesses the
  * <code>value</code> field of a <code>CompletionStatus</code> object
  * <LI><code>public static CompletionStatus
- * <bold>from_int</bold>(int i)</code> --
+ * <b>from_int</b>(int i)</code> --
  * for creating an instance from one of the <code>int</code> members
  * </UL>
  * @see     org.omg.CORBA.SystemException
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -35,7 +35,7 @@
 {
     /** Reads an IDL <code>Any</code> value from the input stream.
     * @return  the <code>Any</code> read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -43,7 +43,7 @@
 
     /** Reads an IDL boolean value from the input stream.
     * @return  the boolean read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -51,7 +51,7 @@
 
     /** Reads an IDL character value from the input stream.
     * @return  the character read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -59,7 +59,7 @@
 
     /** Reads an IDL wide character value from the input stream.
     * @return  the wide character read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -67,7 +67,7 @@
 
     /** Reads an IDL octet value from the input stream.
     * @return  the octet value read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -75,7 +75,7 @@
 
     /** Reads an IDL short from the input stream.
     * @return  the short read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -83,7 +83,7 @@
 
     /** Reads an IDL unsigned short from the input stream.
     * @return  the unsigned short read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -91,7 +91,7 @@
 
     /** Reads an IDL long from the input stream.
     * @return  the long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -99,7 +99,7 @@
 
     /** Reads an IDL unsigned long from the input stream.
     * @return  the unsigned long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -107,7 +107,7 @@
 
     /** Reads an IDL long long from the input stream.
     * @return  the long long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -115,7 +115,7 @@
 
     /** Reads an unsigned IDL long long from the input stream.
     * @return  the unsigned long long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -123,7 +123,7 @@
 
     /** Reads an IDL float from the input stream.
     * @return  the float read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -131,7 +131,7 @@
 
     /** Reads an IDL double from the input stream.
     * @return  the double read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -140,7 +140,7 @@
 
     /** Reads an IDL string from the input stream.
     * @return  the string read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -148,7 +148,7 @@
 
     /** Reads an IDL wide string from the input stream.
     * @return  the wide string read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -156,7 +156,7 @@
 
     /** Reads an IDL CORBA::Object from the input stream.
     * @return  the CORBA::Object read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -164,7 +164,7 @@
 
     /** Reads an IDL Abstract interface from the input stream.
     * @return  the Abstract interface read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -172,7 +172,7 @@
 
     /** Reads an IDL value type from the input stream.
     * @return  the value type read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -180,7 +180,7 @@
 
     /** Reads an IDL typecode from the input stream.
     * @return  the typecode read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -192,7 +192,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -204,7 +204,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -216,7 +216,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -228,7 +228,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -240,7 +240,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -252,7 +252,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -264,7 +264,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -276,7 +276,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -288,7 +288,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -300,7 +300,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -312,7 +312,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -324,7 +324,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -336,7 +336,7 @@
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -71,7 +71,7 @@
      * to attempt determination of whether two distinct object references
      * refer to the same object, since such determination could be impractically
      * expensive.
-     * <P>Default implementation of the org.omg.CORBA.Object method. <P>
+     * <P>Default implementation of the org.omg.CORBA.Object method.
      *
      * @param that the object reference with which to check for equivalence
      * @return <code>true</code> if this object reference is known to be
@@ -87,7 +87,7 @@
     /**
      * Always returns <code>false</code>.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @return <code>false</code>
      */
@@ -99,9 +99,10 @@
      * Returns a hash value that is consistent for the
      * lifetime of the object, using the given number as the maximum.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param maximum an <code>int</code> identifying maximum value of
-     *                  the hashcode
+     *                the hashcode
      * @return this instance's hashcode
      */
     public int _hash(int maximum) {
@@ -113,7 +114,7 @@
      * the message "This is a locally constrained object."  This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param repository_id a <code>String</code>
      * @return NO_IMPLEMENT because this is a locally constrained object
@@ -131,7 +132,8 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @return a duplicate of this <code>LocalObject</code> instance.
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -145,7 +147,8 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -158,7 +161,7 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param operation a <code>String</code> giving the name of an operation
      *        to be performed by the request that is returned
@@ -175,7 +178,7 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param ctx          a <code>Context</code> object containing
      *                     a list of properties
@@ -202,7 +205,7 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param ctx          a <code>Context</code> object containing
      *                     a list of properties
@@ -237,7 +240,8 @@
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -254,7 +258,8 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -275,7 +280,7 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      * @return the ORB instance that created the Delegate contained in this
      * <code>ObjectImpl</code>
      * @exception NO_IMPLEMENT
@@ -291,7 +296,8 @@
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param policy_type  an <code>int</code>
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -310,7 +316,8 @@
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -347,7 +354,8 @@
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
      * <code>org.omg.CORBA.Object</code> method.<P>
-     * Returns <code>true</code> for this <code>LocalObject</code> instance.<P>
+     * Returns <code>true</code> for this <code>LocalObject</code> instance.
+     *
      * @return <code>true</code> always
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -361,7 +369,8 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param operation a <code>String</code> indicating which operation
      *                  to preinvoke
      * @param expectedType the class of the type of operation mentioned above
@@ -381,7 +390,8 @@
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param servant the servant object on which to post-invoke
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -403,8 +413,8 @@
      * <code>org.omg.CORBA.Object</code> method.
      * <P>Called by a stub to obtain an OutputStream for
      * marshaling arguments. The stub must supply the operation name,
-     * and indicate if a response is expected (i.e is this a oneway
-     * call).<P>
+     * and indicate if a response is expected (i.e is this a oneway call).
+     *
      * @param operation the name of the operation being requested
      * @param responseExpected <code>true</code> if a response is expected,
      *                         <code>false</code> if it is a one-way call
@@ -433,7 +443,8 @@
      * marshaled reply. If an exception occurs, <code>_invoke</code> may throw an
      * <code>ApplicationException</code> object which contains an
      * <code>InputStream</code> from
-     * which the user exception state may be unmarshaled.<P>
+     * which the user exception state may be unmarshaled.
+     *
      * @param output the <code>OutputStream</code> to invoke
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -470,7 +481,8 @@
      * <code>ApplicationException.getInputStream()</code>.
      * A null
      * value may also be passed to <code>_releaseReply</code>, in which case the
-     * method is a no-op.<P>
+     * method is a no-op.
+     *
      * @param input the reply stream back to the ORB or null
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -485,7 +497,8 @@
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -63,7 +63,6 @@
  * Note also that you can add any number of
  * <code>NamedValue</code> objects to this list regardless of
  * its original length.
- * <P>
  * <LI><code>org.omg.CORBA.ORB.create_operation_list</code>
  * <PRE>
  *    org.omg.CORBA.NVList nv = orb.create_operation_list(myOperationDef);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -101,7 +101,7 @@
  * <P>
  * When an ORB instance is being created, the class name of the ORB
  * implementation is located using
- * the following standard search order:<P>
+ * the following standard search order:
  *
  * <OL>
  *     <LI>check in Applet parameter or application string array, if any
@@ -1036,7 +1036,7 @@
      * <P>
      * Recursive types can only appear within sequences which can be empty.
      * That way marshaling problems, when transmitting the struct in an Any, are avoided.
-     * <P>
+     *
      * @param id                 the logical id of the referenced type
      * @return                   the requested TypeCode
      */
@@ -1179,7 +1179,7 @@
      * value <tt>true</tt>. If no information for the requested
      * services type is available, the operation returns <tt>false</tt>
      *  (i.e., the service is not supported by this ORB).
-     * <P>
+     *
      * @param service_type a <code>short</code> indicating the
      *        service type for which information is being requested
      * @param service_info a <code>ServiceInformationHolder</code> object
@@ -1203,7 +1203,7 @@
     /**
      * Creates a new <code>DynAny</code> object from the given
      * <code>Any</code> object.
-     * <P>
+     *
      * @param value the <code>Any</code> object from which to create a new
      *        <code>DynAny</code> object
      * @return the new <code>DynAny</code> object created from the given
@@ -1221,7 +1221,7 @@
     /**
      * Creates a basic <code>DynAny</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynAny</code> object
      * @return the new <code>DynAny</code> object created from the given
@@ -1241,7 +1241,7 @@
     /**
      * Creates a new <code>DynStruct</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynStruct</code> object
      * @return the new <code>DynStruct</code> object created from the given
@@ -1261,7 +1261,7 @@
     /**
      * Creates a new <code>DynSequence</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynSequence</code> object
      * @return the new <code>DynSequence</code> object created from the given
@@ -1282,7 +1282,7 @@
     /**
      * Creates a new <code>DynArray</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynArray</code> object
      * @return the new <code>DynArray</code> object created from the given
@@ -1302,7 +1302,7 @@
     /**
      * Creates a new <code>DynUnion</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynUnion</code> object
      * @return the new <code>DynUnion</code> object created from the given
@@ -1322,7 +1322,7 @@
     /**
      * Creates a new <code>DynEnum</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynEnum</code> object
      * @return the new <code>DynEnum</code> object created from the given
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1999, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -53,7 +53,7 @@
  * <code>org.omg.CORBA.Object</code>
  * are provided in the class <code>org.omg.CORBA.portable.ObjectImpl</code>,
  * which is the base class for stubs and object implementations.
- * <p>
+ *
  * @see org.omg.CORBA.portable.ObjectImpl
  */
 
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -31,7 +31,7 @@
  * the client, for access control
  * and other purposes. It contains a single attribute, the name of the
  * <code>Principal</code>, encoded as a sequence of bytes.
- * <P>
+ *
  * @deprecated Deprecated by CORBA 2.2.
  */
 @Deprecated
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -57,7 +57,7 @@
  * Similarly, type information needs to be provided for the response,
  * for either the expected result or for an exception, so the methods
  * <code>result</code> and <code>except</code> take an <code>Any</code>
- * object as a parameter. <p>
+ * object as a parameter.
  *
  * @see org.omg.CORBA.DynamicImplementation
  * @see org.omg.CORBA.NVList
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2001, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -32,8 +32,8 @@
 /**
  * The Holder for <tt>Short</tt>.  For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
- * "Generated Files: Holder Files"</a>.<P
- * A Holder class for a <code>short</code>
+ * "Generated Files: Holder Files"</a>.
+ * <P>A Holder class for a <code>short</code>
  * that is used to store "out" and "inout" parameters in IDL operations.
  * If an IDL operation signature has an IDL <code>short</code> as an "out"
  * or "inout" parameter, the programmer must pass an instance of
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -52,7 +52,7 @@
  * The variable <code>k</code> represents the <code>TCKind</code>
  * instance for the IDL type <code>string</code>, which is
  * <code>tk_string</code>.
- * <P>
+ *
  * <LI>the method <code>value</code> for accessing the
  * <code>_value</code> field of a <code>TCKind</code> constant
  * <P>Example:
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -31,7 +31,7 @@
 /**
  * A container for information about a specific CORBA data
  * type.
- *<P>
+ * <P>
  * <code>TypeCode</code> objects are used:
  * <UL>
  * <LI>in the Dynamic Invocation Interface -- to indicate the types
@@ -59,7 +59,7 @@
  * with the value
  * <code>TCKind.tk_sequence</code> and also fields with the values
  * <code>boolean</code> and <code>10</code> for the
- * type of sequence elements and the length of the sequence. <p>
+ * type of sequence elements and the length of the sequence.
  * </UL>
  *
  * <code>TypeCode</code> objects can be obtained in various ways:
@@ -164,8 +164,7 @@
  *
  * Java IDL extends the CORBA specification to allow all operations permitted
  * on a <code>struct</code> <code>TypeCode</code> to be permitted
- * on an <code>exception</code> <code>TypeCode</code> as well. <p>
- *
+ * on an <code>exception</code> <code>TypeCode</code> as well.
  */
 public abstract class TypeCode implements IDLEntity {
 
@@ -175,23 +174,21 @@
      * they are interchangeable and give identical results when
      * <code>TypeCode</code> operations are applied to them.
      *
-     * @param tc                the <code>TypeCode</code> object to compare against
-     * @return          <code>true</code> if the type codes are equal;
+     * @param tc      the <code>TypeCode</code> object to compare against
+     * @return        <code>true</code> if the type codes are equal;
      *                <code>false</code> otherwise
      */
-
     public abstract boolean equal(TypeCode tc);
 
     /**
-         * Tests to see if the given <code>TypeCode</code> object is
-         * equivalent to this <code>TypeCode</code> object.
-         * <P>
-         *
-         *
-         * @param tc the typecode to compare with this typecode
-         *
-         * @return <code>true</code> if the given typecode is equivalent to
-         *         this typecode; <code>false</code> otherwise
+     * Tests to see if the given <code>TypeCode</code> object is
+     * equivalent to this <code>TypeCode</code> object.
+     *
+     *
+     * @param tc the typecode to compare with this typecode
+     *
+     * @return <code>true</code> if the given typecode is equivalent to
+     *         this typecode; <code>false</code> otherwise
      *
      */
     public abstract boolean equivalent(TypeCode tc);
@@ -199,9 +196,9 @@
     /**
      * Strips out all optional name and member name fields,
      * but leaves all alias typecodes intact.
-         * @return a <code>TypeCode</code> object with optional name and
-         *         member name fields stripped out, except for alias typecodes,
-         *         which are left intact
+     * @return a <code>TypeCode</code> object with optional name and
+     *         member name fields stripped out, except for alias typecodes,
+     *         which are left intact
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
@@ -220,7 +217,6 @@
      *            value of the <code>kind</code> field of this
      *                  <code>TypeCode</code> object
      */
-
     public abstract TCKind kind();
 
     /**
@@ -239,13 +235,12 @@
      * also always have a RepositoryId. If there is no RepositoryId, the
      * method can return an empty string.
      *
-     * @return          the RepositoryId for this <code>TypeCode</code> object
-     *                or an empty string if there is no RepositoryID
+     * @return the RepositoryId for this <code>TypeCode</code> object
+     *         or an empty string if there is no RepositoryID
      * @throws org.omg.CORBA.TypeCodePackage.BadKind if the method
      *           is invoked on an inappropriate kind of<code>TypeCode</code>
      *           object
      */
-
     public abstract String id() throws BadKind;
 
     /**
@@ -268,7 +263,6 @@
      *           is invoked on an inappropriate kind of<code>TypeCode</code>
      *           object
      */
-
     public abstract String name() throws BadKind;
 
     /**
@@ -287,7 +281,6 @@
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract int member_count() throws BadKind;
 
     /**
@@ -312,7 +305,6 @@
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract String member_name(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
 
@@ -336,7 +328,6 @@
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract TypeCode member_type(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
 
@@ -344,13 +335,13 @@
      * Retrieves the label of the union member
      * identified by the given index. For the default member,
      * the label is the zero octet.
-     *<P>
+     * <P>
      * The method <code>member_label</code> can only be invoked on union
      * <code>TypeCode</code> objects.
      *
-     * @param index     index of the union member for which the
+     * @param index   index of the union member for which the
      *                label is being requested
-     * @return          an <code>Any</code> object describing the label of
+     * @return        an <code>Any</code> object describing the label of
      *                the requested union member or the zero octet for
      *                the default member
      * @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is
@@ -360,7 +351,6 @@
      *           is invoked on a non-union <code>TypeCode</code>
      *           object
      */
-
     public abstract Any member_label(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
 
@@ -376,7 +366,6 @@
      *           is invoked on a non-union <code>TypeCode</code>
      *           object
      */
-
     public abstract TypeCode discriminator_type()
         throws BadKind;
 
@@ -393,7 +382,6 @@
      *           is invoked on a non-union <code>TypeCode</code>
      *           object
      */
-
     public abstract int default_index() throws BadKind;
 
     /**
@@ -412,7 +400,6 @@
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract int length() throws BadKind;
 
     /**
@@ -424,7 +411,7 @@
      * that multidimensional arrays are represented by nesting
      * <code>TypeCode</code> objects, one per dimension.
      * For boxed valuetypes, it returns the boxed type.
-     *<P>
+     * <P>
      * The method <code>content_type</code> can be invoked on sequence, array,
      * alias, and boxed valuetype <code>TypeCode</code> objects.
      *
@@ -436,37 +423,36 @@
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract TypeCode content_type() throws BadKind;
 
 
     /**
-         * Returns the number of digits in the fixed type described by this
-         * <code>TypeCode</code> object. For example, the typecode for
-         * the number 3000.275d could be <code>fixed<7,3></code>, where
-         * 7 is the precision and 3 is the scale.
-         *
-         * @return the total number of digits
+     * Returns the number of digits in the fixed type described by this
+     * <code>TypeCode</code> object. For example, the typecode for
+     * the number 3000.275d could be <code>fixed&lt;7,3&gt;</code>, where
+     * 7 is the precision and 3 is the scale.
+     *
+     * @return the total number of digits
      * @throws org.omg.CORBA.TypeCodePackage.BadKind if this method
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
-         *
+     *
      */
     public abstract short fixed_digits() throws BadKind ;
 
     /**
-         * Returns the scale of the fixed type described by this
-         * <code>TypeCode</code> object. A positive number indicates the
-         * number of digits to the right of the decimal point.
-         * For example, the number 3000d could have the
-         * typecode <code>fixed<4,0></code>, where the first number is
-         * the precision and the second number is the scale.
-         * A negative number is also possible and adds zeroes to the
-         * left of the decimal point.  In this case, <code>fixed<1,-3></code>,
-         * could be the typecode for the number 3000d.
-         *
-         * @return the scale of the fixed type that this
-         *         <code>TypeCode</code> object describes
+     * Returns the scale of the fixed type described by this
+     * <code>TypeCode</code> object. A positive number indicates the
+     * number of digits to the right of the decimal point.
+     * For example, the number 3000d could have the
+     * typecode <code>fixed&lt;4,0&gt;</code>, where the first number is
+     * the precision and the second number is the scale.
+     * A negative number is also possible and adds zeroes to the
+     * left of the decimal point.  In this case, <code>fixed&lt;1,-3&gt;</code>,
+     * could be the typecode for the number 3000d.
+     *
+     * @return the scale of the fixed type that this
+     *         <code>TypeCode</code> object describes
      * @throws org.omg.CORBA.TypeCodePackage.BadKind if this method
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
@@ -492,7 +478,6 @@
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
-
     abstract public short member_visibility(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds ;
 
@@ -512,7 +497,6 @@
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
-
     abstract public short type_modifier() throws BadKind ;
 
     /**
@@ -528,6 +512,5 @@
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
-
     abstract public TypeCode concrete_base_type() throws BadKind ;
 }
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html	Wed Jul 05 20:28:17 2017 +0200
@@ -55,44 +55,30 @@
 
 <li>
 CORBA 2.3.1 chapter 4 with the following replacements from the Portable
-Interceptors specification:</li>
-
-	<ul>
-	<li>
-	section 4.2.3.5 <TT>destroy</TT></li>
-
-	<li>
-	section 4.5.2 <TT>CodeFactory</TT> and <TT>PICurrent</TT> are required</li>
-
-	<li>
-	Section 4.5.3.4 as updated for <TT>register_initial_reference</TT></li>
-	</ul>
+Interceptors specification:
+ <ul>
+ <li>section 4.2.3.5 <TT>destroy</TT></li>
+ <li>section 4.5.2 <TT>CodeFactory</TT> and <TT>PICurrent</TT> are required</li>
+ <li>Section 4.5.3.4 as updated for <TT>register_initial_reference</TT></li>
+ </ul>
+</li>
 
 <li>
 CORBA 2.3.1 chapter 5 with the following update from the Portable Interceptors
-specification:</li>
-
-	<ul>
-	<li>
-	5.5.2 <TT>StringSeq</TT> and <TT>WStringSeq</TT> are required. This adds the 
-following 
-	classes
-	to <TT>org.omg.CORBA</TT>:</li>
-
-	<ul>
-	<li>
-	<TT>StringSeqHolder</TT></li>
-
-	<li>
-	<TT>StringSeqHelper</TT></li>
-
-	<li>
-	<TT>WStringSeqHolder</TT></li>
-
-	<li>
-	<TT>WStringSeqHelper</TT></li>
-	</ul>
-</ul>
+specification:
+ <ul>
+  <li>
+  5.5.2 <TT>StringSeq</TT> and <TT>WStringSeq</TT> are required. 
+  This adds the following classes to <TT>org.omg.CORBA</TT>:
+    <ul>
+    <li><TT>StringSeqHolder</TT></li>
+    <li><TT>StringSeqHelper</TT></li>
+    <li><TT>WStringSeqHolder</TT></li>
+    <li><TT>WStringSeqHelper</TT></li>
+    </ul>
+  </li>
+ </ul>
+</li>
 
 <li>
 CORBA 2.3.1 sections 10.6.1 and 10.6.2 are supported for repository IDs.</li>
@@ -101,18 +87,13 @@
 CORBA 2.3.1 section 10.7 for <TT>TypeCode</TT> APIs.</li>
 
 <li>
-CORBA 2.3.1 chapter 11, Portable Object Adapter (POA), with the following updates from the Portable Interceptors specification:</li>
-
-<ul>
-<li>
-Section 11.3.7 POAs must preserve all policies</li>
-
-<li>
-Section 11.3.8.2 again states that POAs must preserve all policies</li>
-
-<li>
-Section 11.3.8.26 <tt>POA::id</tt> is required.</li>
-</ul>
+CORBA 2.3.1 chapter 11, Portable Object Adapter (POA), with the following updates from the Portable Interceptors specification:
+  <ul>
+  <li>Section 11.3.7 POAs must preserve all policies</li>
+  <li>Section 11.3.8.2 again states that POAs must preserve all policies</li>
+  <li>Section 11.3.8.26 <tt>POA::id</tt> is required.</li>
+  </ul>
+</li>
 
 <li>
 CORBA 2.3.1 chapters 13 and 15 define GIOP 1.0, 1.1, and 1.2. The Java SE 6
@@ -124,8 +105,7 @@
 
 <li>
 Portable Interceptors section 13.8 (the new <TT>Coder</TT>/<TT>Decoder</TT> interfaces) 
-and
-all of chapter 21 (the interceptor specification).</li>
+and all of chapter 21 (the interceptor specification).</li>
 
 <li>Section 1.21.8 of the Revised IDL to Java Language Mapping Specification (ptc/00-11-03) 
 has been changed from the version in the  IDL to Java Language Mapping Specification (ptc/00-01-08).</li>
@@ -135,40 +115,24 @@
 Tools</h2>
 
 <ul>
-<li>
-The IDL to Java compiler (<TT>idlj</TT>) complies with:</li>
+<li>The IDL to Java compiler (<TT>idlj</TT>) complies with:
+  <ul>
+  <li>CORBA 2.3.1 chapter 3 (IDL definition)</li>
+  <li>CORBA 2.3.1 chapters 5 and 6 (semantics of Value types)</li>
+  <li>CORBA 2.3.1 section 10.6.5 (pragmas)</li>
+  <li>The IDL to Java mapping specification</li>
+  <li>The Revised IDL to Java language mapping specification section 1.12.1 "local interfaces"</li>
+  </ul>
+</li>
 
-<ul>
-<li>
-CORBA 2.3.1 chapter 3 (IDL definition)</li>
-
-<li>
-CORBA 2.3.1 chapters 5 and 6 (semantics of Value types)</li>
-
-<li>
-CORBA 2.3.1 section 10.6.5 (pragmas)</li>
-
-<li>
-The IDL to Java mapping specification</li>
-
-<li>
-The Revised IDL to Java language mapping specification section 1.12.1 "local interfaces"</li>
-</ul>
-
-<li>
-The Java to IDL compiler (the IIOP backend for <tt>rmic</tt>) complies with:</li>
-
-<ul>
-<li>
-CORBA 2.3.1 chapters 5 and 6 (value types)</li>
-
-<li>
-The Java to IDL language mapping. Note that this implicitly references
-section 1.21 of the IDL to Java language mapping</li>
-
-<li>
-IDL generated by the <tt>-idl</tt> flag complies with CORBA 2.3.1 chapter 3.</li>
-</ul>
+<li>The Java to IDL compiler (the IIOP backend for <tt>rmic</tt>) complies with:
+  <ul>
+  <li>CORBA 2.3.1 chapters 5 and 6 (value types)</li>
+  <li>The Java to IDL language mapping. Note that this implicitly references
+      section 1.21 of the IDL to Java language mapping</li>
+  <li>IDL generated by the <tt>-idl</tt> flag complies with CORBA 2.3.1 chapter 3.</li>
+  </ul>
+</li>
 </ul>
 
 </body>
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html	Wed Jul 05 20:28:17 2017 +0200
@@ -8,65 +8,101 @@
 
 <H1>IDL-to-Java Generated Files</H1>
 
-<P>The files that are generated by the IDL-to-Java compiler, in accordance with the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>, which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 according the <a href="compliance.html">compliance</a> document.
+<P>The files that are generated by the IDL-to-Java compiler, in accordance with 
+the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>,
+which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 
+according the <a href="compliance.html">compliance</a> document.
 
 
-<P>In general IDL names and identifiers are mapped to Java names and identifiers with no change. Because of the nature of the Java language, a single IDL construct may be mapped to several (differently named) Java constructs. The  additional  names are constructed by appending a descriptive suffix. For example, the IDL interface <tt>foo</tt> is mapped to the Java interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>, and optionally <tt>fooPOATie</tt>. 
+<P>In general IDL names and identifiers are mapped to Java names 
+and identifiers with no change. Because of the nature of the Java language,
+a single IDL construct may be mapped to several (differently named) Java constructs.
+The additional names are constructed by appending a descriptive suffix.
+For example, the IDL interface <tt>foo</tt> is mapped to the Java
+interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional
+Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>,
+and optionally <tt>fooPOATie</tt>.
 
 
 
-<P>The mapping in effect reserves the use of several names for its own purposes. These are: 
-<P>
+<P>The mapping in effect reserves the use of several names for its own purposes. These are:
 <UL>
-<LI>The Java class <tt><a href="#helper">&lt;type&gt;Helper</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type. 
-<LI>The Java class <tt><a href="#holder">&lt;type&gt;Holder</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type (with certain exceptions such as <tt>typedef</tt> aliases).
-<LI>The Java classes <tt>&lt;basicJavaType&gt;Holder</tt>, where <tt>&lt;basicJavaType&gt;</tt> is one of the Java primitive datatypes that is used by one of the IDL basic datatypes. 
-<LI>The Java classes <tt><a href="#operations">&lt;interface&gt;Operations</tt></a>, <tt>&lt;interface&gt;POA</tt>, and <tt>&lt;interface&gt;POATie</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface type. 
-<LI>The nested scope Java package name <tt>&lt;interface&gt;Package</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface.
+<LI>The Java class <a href="#helper"><tt>&lt;type&gt;Helper</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type.
+<LI>The Java class <a href="#holder"><tt>&lt;type&gt;Holder</tt></a>, where <tt>&lt;type&gt;</tt>
+is the name of an IDL defined type (with certain exceptions such as <tt>typedef</tt> aliases).
+<LI>The Java classes <tt>&lt;basicJavaType&gt;Holder</tt>, where <tt>&lt;basicJavaType&gt;</tt>
+is one of the Java primitive datatypes that is used by one of the IDL basic datatypes.
+<LI>The Java classes <a href="#operations"><tt>&lt;interface&gt;Operations</tt></a>, <tt>&lt;interface&gt;POA</tt>,
+and <tt>&lt;interface&gt;POATie</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface type.
+<LI>The nested scope Java package name <tt>&lt;interface&gt;Package</tt>, where <tt>&lt;interface&gt;</tt>
+is the name of an IDL interface.
+</UL>
 
 
-<a name="helper">
-<H2>Helper Files</H2></a>
-<P>
-Helper files supply several static methods needed to manipulate the type. These include <tt>Any</tt> insert and extract operations for the type, getting the repository id, getting the typecode, and reading and writing the type from and to a stream. 
+<H2><a name="helper">Helper Files</a></H2>
 
-<P>The helper class for a mapped IDL interface or abstract interface also include narrow operation(s). The static narrow method allows an <tt>org.omg.CORBA.Object</tt> to be narrowed to the object reference of a more specific type. The IDL exception <tt>CORBA::BAD_PARAM</tt> is thrown if the narrow fails because the object reference does not support the requested type. A different system exception is raised to indicate other kinds of errors. Trying to narrow a null will always succeed with a return value of null.
+<P>Helper files supply several static methods needed to manipulate the type.
+These include <tt>Any</tt> insert and extract operations for the type,
+getting the repository id, getting the typecode, and reading
+and writing the type from and to a stream.
 
+<P>The helper class for a mapped IDL interface or abstract interface also
+include narrow operation(s). The static narrow method allows an <tt>org.omg.CORBA.Object</tt>
+to be narrowed to the object reference of a more specific type.
+The IDL exception <tt>CORBA::BAD_PARAM</tt> is thrown if the narrow fails because
+the object reference does not support the requested type. A different system exception
+is raised to indicate other kinds of errors. Trying to narrow a null will always succeed with a return value of null.
 
+<H2><a name="holder">Holder Files</a></H2>
 
-<P>
+<P>Support for out and inout parameter passing modes requires the use of additional holder classes.
+These classes are available for all of the basic IDL datatypes in the <tt>org.omg.CORBA</tt> package
+and are generated for all named user defined IDL types except those defined by typedefs.
+(Note that in this context user defined includes types that are defined in OMG specifications
+such as those for the Interface Repository, and other OMG services.)
 
+<P>Each holder class has a constructor from an instance, a default constructor, and has
+a public instance member, <tt>value</tt> which is the typed value. The default constructor
+sets the value field to the default value for the type as defined by the Java language:
+false for boolean, 0 for numeric and char types, null for strings, null for object references.
 
-<a name="holder">
-<H2>Holder Files</H2></a>
-<P>
-Support for out and inout parameter passing modes requires the use of additional  holder  classes. These classes are available for all of the basic IDL datatypes in the <tt>org.omg.CORBA</tt> package and are generated for all named user defined IDL types except those defined by typedefs. (Note that in this context user defined includes types that are defined in OMG specifications such as those for the Interface Repository, and other OMG services.) 
+<P>To support portable stubs and skeletons, holder classes also implement
+the <tt>org.omg.CORBA.portable.Streamable</tt> interface.
 
 
-<P>Each holder class has a constructor from an instance, a default constructor, and has a public instance member, <tt>value</tt> which is the typed value. The default constructor sets the value field to the default value for the type as defined by the Java language: false for boolean, 0 for numeric and char types, null for strings, null for object references.
+<H2><a name="operations">Operations Files</a></H2>
 
-<P>To support portable stubs and skeletons, holder classes also implement the <tt>org.omg.CORBA.portable.Streamable</tt> interface.
+<P>A non abstract IDL interface is mapped to two public Java interfaces:
+a <em>signature</em> interface and an <em>operations</em> interface.
+The signature interface, which extends <tt>IDLEntity</tt>, has the same
+name as the IDL interface name and is used as the signature type in method declarations
+when interfaces of the specified type are used in other interfaces.
+The operations interface has the same name as the IDL interface with the suffix <tt>Operations</tt>
+appended to the end and is used in the server-side mapping and as a mechanism
+for providing optimized calls for collocated client and servers.
 
+<P>The Java operations interface contains the mapped operation signatures.
+The Java signature interface extends the operations interface,
+the (mapped) base <tt>org.omg.CORBA.Object</tt>, as well as <tt>org.omg.portable.IDLEntity</tt>.
+Methods can be invoked on the signature interface. Interface inheritance
+expressed in IDL is reflected in both the Java signature interface and operations interface hierarchies.
 
-<a name="operations">
-<H2>Operations Files</H2></a>
-<P>
-A non abstract IDL interface is mapped to two public Java interfaces: a <em>signature</em> interface and an <em>operations</em> interface. The signature interface, which extends <tt>IDLEntity</tt>, has the same name as the IDL interface name and is used as the signature type in method declarations when interfaces of the specified type are used in other interfaces. The operations interface has the same name as the IDL interface with the suffix <tt>Operations</tt> appended to the end and is used in the server-side mapping and as a mechanism for providing optimized calls for collocated client and servers.
 
-<P>The Java operations interface contains the mapped operation signatures. The Java signature interface extends the operations interface, the (mapped) base <tt>org.omg.CORBA.Object</tt>, as well as <tt>org.omg.portable.IDLEntity</tt>. Methods can be invoked on the signature interface. Interface inheritance expressed in IDL is reflected in both the Java signature interface and operations interface hierarchies.
+<H2><a name="stub">Stubs</a></H2>
 
-
-
-
-<a name="stub">
-<H2>Stubs</H2></a>
-<P>For the mapping of a non-object-oriented language, there will be a programming interface to the stubs for each interface type. Generally, the stubs will present access to the OMG IDL-defined operations on an object in a way that is easy for programmers to predict once they are familiar with OMG IDL and the language mapping for the particular programming language. The stubs make calls on the rest of the ORB using interfaces that are private to, and presumably optimized for, the particular ORB Core. If more than one ORB is available, there may be different stubs corresponding to the different ORBs. In this case, it is necessary for the ORB and language mapping to cooperate to associate the correct stubs with the particular object reference. 
+<P>For the mapping of a non-object-oriented language, there will be
+a programming interface to the stubs for each interface type. Generally, the stubs
+will present access to the OMG IDL-defined operations on an object in a way that is easy
+for programmers to predict once they are familiar with OMG IDL and the language mapping
+for the particular programming language. The stubs make calls on the rest of the ORB
+using interfaces that are private to, and presumably optimized for, the particular ORB Core.
+If more than one ORB is available, there may be different stubs corresponding to the different ORBs.
+In this case, it is necessary for the ORB and language mapping to cooperate to associate
+the correct stubs with the particular object reference.
 
 <P>Object-oriented programming languages, such as Java, C++, and Smalltalk, do not require stub interfaces.
-<P><P><BR><BR>
 
-
-
+<BR><BR>
 
 </body>
 </html>
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -6,7 +6,7 @@
    <TITLE>package</TITLE>
 <!--
 /*
-* Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 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
@@ -73,7 +73,6 @@
 <TT>ORB</TT> Methods</H3>
 
 <P>Before an application can enter the CORBA environment, it must first: 
-<P>
 <UL>
 <LI>Be initialized into the ORB and possibly the object adapter (POA) environments.
 <LI>Get references to ORB object (for use in future ORB operations) 
@@ -81,7 +80,6 @@
 </UL>
 <P>The following operations are provided to initialize applications and obtain
  the appropriate object references:
- <P>
  <UL>
  <LI>Operations providing access to the ORB, which are discussed in this
  section.
@@ -107,13 +105,13 @@
  that provide access to the ORB:
 <UL>
 <LI>
-<TT><bold>init</bold>()</TT> 
+<TT><b>init</b>()</TT>
 
 <LI>
-<TT><bold>init</bold>(String [] args, Properties props)</TT>
+<TT><b>init</b>(String [] args, Properties props)</TT>
 
 <LI>
-<TT><bold>init</bold>(Applet app, Properties props)</TT>
+<TT><b>init</b>(Applet app, Properties props)</TT>
 </UL>
 
 <P>Using the <tt>init()</tt> method without parameters initiates 
@@ -142,11 +140,11 @@
 resolve initial object references.  These are:
 <UL>
 <LI>
-<TT><bold>resolve_initial_references</bold>(String name)</TT>
+<TT><b>resolve_initial_references</b>(String name)</TT>
 <LI>
-<TT><bold>list_initial_services</bold>()</TT>
+<TT><b>list_initial_services</b>()</TT>
 <LI>
-<TT><bold>register_initial_reference</bold>(String id, 
+<TT><b>register_initial_reference</b>(String id, 
 org.omg.CORBA.Object obj)</TT>
 </UL>
 
@@ -278,7 +276,6 @@
 
 
 <P>Each holder class has:
-<P>
 <UL>
 <LI>a constructor from an instance
 <LI>a default constructor
@@ -291,7 +288,6 @@
 
 <P>The default constructor sets the value field to the default value for the 
 type as defined by the Java language: 
-<P>
 <UL>
 <LI><tt>false</tt> for boolean
 <LI><tt>0</tt> for numeric and char types
@@ -391,7 +387,6 @@
 <h2>Helper Classes </h2>
 <P>Helper files supply several static methods needed to manipulate the type.
  These include:
- <P>
  <UL>
  <LI><tt>Any</tt> insert and extract operations for the type
  <LI>getting the repository id
@@ -455,14 +450,13 @@
 <P>The <A HREF="{@docRoot}/../technotes/guides/idl/jidlExample.html"><em>Hello World</em></A> 
 tutorial uses a <tt>narrow</tt> method that looks 
 like this:
-<P>
 <PRE>
         // create and initialize the ORB
-	ORB orb = ORB.init(args, null);
+        ORB orb = ORB.init(args, null);
 
         // get the root naming context
         org.omg.CORBA.Object objRef = 
-	    orb.resolve_initial_references("NameService");
+            orb.resolve_initial_references("NameService");
         // Use NamingContextExt instead of NamingContext. This is 
         // part of latest Inter-Operable naming Service.  
         NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
@@ -554,7 +548,6 @@
 
 }
 </PRE>
-<P>
 
 <h3>Value Type Helper Classes</h3>
 A helper class for a value type includes different renderings of
@@ -844,7 +837,7 @@
 interfaces have been included for the purpose of creating typecodes (see
 create_value_tc, create_struct_tc, create_union_tc and create_exception_tc
 methods in interface org.omg.CORBA.ORB):
-<BR>&nbs
+<BR>&nbsp;
 <UL>
 <LI>
 IRObject
@@ -893,20 +886,19 @@
 <P>Some of the API included in <TT>org.omg</TT> subpackages throw 
 <tt>NO_IMPLEMENT</tt> exceptions for various reasons.  Among these reasons
 are:
-<P>
-	<UL>
-	<LI>In some cases, for example <tt>LocalObject</tt>, the complete
-	implementation according to the specification indicates that 
-	these API should throw <tt>NO_IMPLEMENT</tt>.
-	<P>
-	<LI>In most cases, for example methods in <tt>ORB.java</tt>, 
-	methods that throw  
-	<tt>NO_IMPLEMENT</tt> are actually implemented in subclasses
-	elsewhere in the ORB code.
-	<P>
-	<LI>In some cases, for example <tt>_get_interface_def()</tt> 
-	and <tt>_get_interface</tt>, API are really not yet implemented.
-	</UL>
+    <UL>
+    <LI>In some cases, for example <tt>LocalObject</tt>, the complete
+    implementation according to the specification indicates that 
+    these API should throw <tt>NO_IMPLEMENT</tt>.
+
+    <LI>In most cases, for example methods in <tt>ORB.java</tt>, 
+    methods that throw  
+    <tt>NO_IMPLEMENT</tt> are actually implemented in subclasses
+    elsewhere in the ORB code.
+
+    <LI>In some cases, for example <tt>_get_interface_def()</tt> 
+    and <tt>_get_interface</tt>, API are really not yet implemented.
+    </UL>
 
 
 
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -56,7 +56,7 @@
      * <p>5. Marshal reply into OutputStream returned by
      *    ResponseHandler.
      * <p>6. Return OutputStream to ORB.
-     * <p>
+     *
      * @param method The method name.
      * @param input The <code>InputStream</code> containing the marshalled arguments.
      * @param handler The <code>ResponseHandler</code> which the servant uses
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1998, 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
@@ -46,57 +46,51 @@
 can override them to provide real implementations.  The ORB included in
 Sun's release of the Java[tm] Platform, Standard Edition 6, includes 
 implementations for the following methods.
-<p>
+
 <h2>List of Unimplemented Features in Package
 <code>org.omg.CORBA.portable</code></h2>
-<p>
+
 <h3>Unimplemented Interfaces in package <code>org.omg.CORBA.portable</code></h3>
   <ul>
-<code>
-    <li>InvokeHandler
-    <li>ResponseHandler
-</code>
+    <li><code>InvokeHandler</code>
+    <li><code>ResponseHandler</code>
   </ul>
-<p>
+
 <h3>Unimplemented Methods in package <code>org.omg.CORBA.portable</code></h3>
 <ul>
-<code>
-<li>InputStream
+<li><code>InputStream</code>
   <ul>
-    <li>public int read()
-    <li>public.math.BigDecimal read_fixed()
-    <li>public org.omg.CORBA.Context read_Context() 
-    <li>public  org.omg.CORBA.Object read_Object(java.lang.Class clz)
-    <li>public org.omg.CORBA.ORB orb() 
+    <li><code>public int read()</code>
+    <li><code>public.math.BigDecimal read_fixed()</code>
+    <li><code>public org.omg.CORBA.Context read_Context()</code>
+    <li><code>public  org.omg.CORBA.Object read_Object(java.lang.Class clz)</code>
+    <li><code>public org.omg.CORBA.ORB orb()</code>
   </ul>
-<li>OutputStream
+<li><code>OutputStream</code>
   <ul>
-    <li>public org.omg.CORBA.ORB orb()
-    <li>public void write_Context(org.omg.CORBA.Context ctx,
-			      org.omg.CORBA.ContextList contexts) 
-    <li>public void write_fixed(java.math.BigDecimal value) 
-    <li>public void write(int b) 
+    <li><code>public org.omg.CORBA.ORB orb()</code>
+    <li><code>public void write_Context(org.omg.CORBA.Context ctx,
+        org.omg.CORBA.ContextList contexts)</code>
+    <li><code>public void write_fixed(java.math.BigDecimal value)</code>
+    <li><code>public void write(int b)</code>
   </ul>
-<li>Delegate
+<li><code>Delegate</code>
   <ul>
-    <li>public void releaseReply(org.omg.CORBA.Object self, InputStream input)
-    <li>public InputStream invoke(org.omg.CORBA.Object self, OutputStream output)
-    <li>public OutputStream request(org.omg.CORBA.Object self, String operation,
-				 boolean responseExpected)
-    <li>public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self,
+    <li><code>public void releaseReply(org.omg.CORBA.Object self, InputStream input)</code>
+    <li><code>public InputStream invoke(org.omgl.CORBA.Object self, OutputStream output)</code>
+    <li><code>public OutputStream request(org.omg.CORBA.Object self, String operation,
+        boolean responseExpected)</code>
+    <li><code>public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self,
                                         org.omg.CORBA.Policy[] policies,
-                                        org.omg.CORBA.SetOverrideType set_add)
-    <li>public org.omg.CORBA.DomainManager[] get_domain_managers(
-                                                org.omg.CORBA.Object
-						self)
-    <li>public org.omg.CORBA.Policy get_policy(org.omg.CORBA.Object self,
-                                         int policy_type)
+                                        org.omg.CORBA.SetOverrideType set_add)</code>
+    <li><code>public org.omg.CORBA.DomainManager[] get_domain_managers(
+                                                org.omg.CORBA.Objectself)</code>
+    <li><code>public org.omg.CORBA.Policy get_policy(org.omg.CORBA.Object self,
+                                         int policy_type)</code>
   </ul>
-</code>
 </ul>
 
 @since JDK1.2
 @serial exclude
 </body>
 </html>
-
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -6,7 +6,7 @@
    <title>package</title>
 <!--
 /*
-* Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 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
@@ -43,23 +43,21 @@
  
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6, ORB complies, see <A 
-HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
+HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
 support in Java[tm] SE 6</A>.
 <P>
 <a name="unimpl"></a>
 The following methods in the abstract class 
 <code>org.omg.CORBA_2_3.ORB</code> are unimplemented:
 <UL>
-  <code>
-  <LI>public org.omg.CORBA.portable.ValueFactory 
-  <b>register_value_factory(String id, org.omg.CORBA.portable.ValueFactory 
-factory)</b>
-  <LI>public void <b>unregister_value_factory(String id)</b>
-  <LI>public org.omg.CORBA.portable.ValueFactory 
-  <b>lookup_value_factory(String id)</b>
-  <LI>public org.omg.CORBA.Object <b>get_value_def(String repid)</b>
-  <LI>public void <b>set_delegate(java.lang.Object wrapper)</b>
-  </code>
+  <LI><code>public org.omg.CORBA.portable.ValueFactory 
+  <b>register_value_factory(String id, org.omg.CORBA.portable.ValueFactory
+     factory)</b></code>
+  <LI><code>public void <b>unregister_value_factory(String id)</b></code>
+  <LI><code>public org.omg.CORBA.portable.ValueFactory 
+  <b>lookup_value_factory(String id)</b></code>
+  <LI><code>public org.omg.CORBA.Object <b>get_value_def(String repid)</b></code>
+  <LI><code>public void <b>set_delegate(java.lang.Object wrapper)</b></code>
 </UL>
 @since JDK 1.3
 <br>
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java	Wed Jul 05 20:28:17 2017 +0200
@@ -77,7 +77,7 @@
      *
      * throw SecurityException if SecurityManager is installed and
      * enableSubclassImplementation SerializablePermission
-     * is not granted or jdk.corba.allowOutputStreamSubclass system
+     * is not granted or jdk.corba.allowInputStreamSubclass system
      * property is either not set or is set to 'false'
      */
     public InputStream() {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 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
@@ -26,7 +26,6 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
-
 -->
 
 </head>
@@ -34,7 +33,7 @@
 
  Provides methods for the input and output of value types, and contains 
  other updates to the <code>org/omg/CORBA/portable</code> package.
-<p>
+
 @since 1.3
 @serial exclude
 </body>
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 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
@@ -32,21 +32,20 @@
 <body bgcolor="white">
 <P>This package contains the following classes, which are used in 
 <tt>org.omg.CosNaming.NamingContextExt</tt>:
-<P>
 <UL>
-<LI><tt>AddressHelper</tt>
+ <LI><tt>AddressHelper</tt>
  <LI><tt>StringNameHelper</tt>
  <LI><tt>URLStringHelper</tt>
  <LI><tt>InvalidAddress</tt>
-
+</UL>
 
 <H3>Package Specification</H3>
- 
+
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 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
@@ -32,7 +32,6 @@
 <body bgcolor="white">
 <P>This package contains Exception classes for the <tt>org.omg.CosNaming</tt>
  package.  The list  of exception classes are:
- <P>
  <UL>
   <LI><tt>AlreadyBound</tt>
   <LI><tt>CannotProceed</tt>
@@ -40,6 +39,7 @@
   <LI><tt>NotEmpty</tt>
   <LI><tt>NotFound</tt>
   <LI><tt>NotFoundReason</tt>
+ </UL>
 
 
 <H3>Package Specification</H3>
@@ -48,7 +48,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -64,12 +64,12 @@
     Istring id;
     Istring kind;
   };
-    
+
   /**
    * A name is a sequence of name components.
    */
   typedef sequence <NameComponent> Name;
-    
+
   /**
    * Specifies whether the given binding is for a object (that is not a
    * naming context) or for a naming context.
@@ -79,7 +79,7 @@
     nobject, 	// name is bound to an object
     ncontext	// name is bound to a naming context
   };
-    
+
   /**
    * A name-to-object association is called a Binding.
    */
@@ -89,12 +89,12 @@
     BindingType binding_type;	// whether name is bound to an object
                                 //  or a naming context
   };
-    
+
   /**
    * List of Bindings.
    */
-  typedef sequence <Binding> BindingList;    
-    
+  typedef sequence <Binding> BindingList;
+
   /**
    * The BindingIterator interface allows a client to iterate through
    * the bindings using the next_one or next_n operations.
@@ -112,24 +112,24 @@
      * @param b the returned binding
      */ 
     boolean next_one(out Binding b);
-    
+
     /**
      * This operation returns at most the requested number of bindings.
      * 
-     * @param how_many the maximum number of bindings tro return <p>
+     * @param how_many the maximum number of bindings to return
      * 
      * @param bl the returned bindings
      */ 
     boolean next_n(in unsigned long how_many, 
-		   out BindingList bl);
-        
+                   out BindingList bl);
+
     // Destroy binding iterator
     /**
      * This operation destroys the iterator.
      */ 
     void destroy();
   };
-    
+
 /** 
  * A naming context is an object that contains a set of name bindings in 
  * which each name is unique. Different names can be bound to an object 
@@ -151,7 +151,7 @@
             not_context, 
             not_object 
         };
-        
+
 /** 
  * Indicates the name does not identify a binding.
  */
@@ -160,7 +160,7 @@
             NotFoundReason why;
             Name rest_of_name;
         };
-    
+
 /**
  * Indicates that the implementation has given up for some reason.
  * The client, however, may be able to continue the operation at the
@@ -171,130 +171,130 @@
             NamingContext cxt;
             Name rest_of_name;
         };
-                                         
+
 /** 
  * Indicates the name is invalid. 
  */
         exception InvalidName 
-        {};                        
-    
+        {};
+
 /**
  * Indicates an object is already bound to the specified name. Only
  * one object can be bound to a particular name in a context. 
  */
         exception AlreadyBound 
         {};
-    
+
 /**
  * Indicates that the Naming Context contains bindings.
  */
         exception NotEmpty 
         {};
-    
+
 /**
  * Creates a binding of a name and an object in the naming context.
  * Naming contexts that are bound using bind do not participate in name
  * resolution when compound names are passed to be resolved. 
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @param obj The Object to bind with the given name<p>
+ * @param obj The Object to bind with the given name.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates
- * the name does not identify a binding.<p>
+ * the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed 
  * Indicates that the implementation has given up for some reason.
  * The client, however, may be able to continue the operation
- * at the returned naming context.<p>
+ * at the returned naming context.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.InvalidName 
- * Indicates that the name is invalid. <p>
+ * Indicates that the name is invalid.
  *
  * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound 
- * Indicates an object is already bound to the specified name.<p> 
+ * Indicates an object is already bound to the specified name.
  */ 
         void bind(in Name n, 
-	      in Object obj)
+                  in Object obj)
         raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName, 
-	     AlreadyBound);
-    
+               CannotProceed, 
+               InvalidName, 
+               AlreadyBound);
+
 /**
  * Names an object that is a naming context. Naming contexts that
  * are bound using bind_context() participate in name resolution 
  * when compound names are passed to be resolved.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @param nc NamingContect object to bind with the given name <p>
+ * @param nc NamingContect object to bind with the given name.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  *
  * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already 
- * bound to the specified name.<p>
+ * bound to the specified name.
  */ 
     void bind_context(in Name n, 
-		      in NamingContext nc)
+                      in NamingContext nc)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName, 
-	     AlreadyBound);
-    
+             CannotProceed, 
+             InvalidName, 
+             AlreadyBound);
+
 /**
  * Creates a binding of a name and an object in the naming context
  * even if the name is already bound in the context. Naming contexts 
  * that are bound using rebind do not participate in name resolution 
  * when compound names are passed to be resolved.
  * 
- * @param  n Name of the object <p>
+ * @param  n Name of the object.
  * 
- * @param obj The Object to rebind with the given name <p>
+ * @param obj The Object to rebind with the given name.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     void rebind(in Name n, 
-		in Object obj)
+                in Object obj)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             CannotProceed, 
+             InvalidName);
+
 /** 
  * Creates a binding of a name and a naming context in the naming
  * context even if the name is already bound in the context. Naming 
  * contexts that are bound using rebind_context() participate in name 
  * resolution when compound names are passed to be resolved.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @param nc NamingContect object to rebind with the given name <p>
+ * @param nc NamingContect object to rebind with the given name.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     void rebind_context(in Name n, 
-			in NamingContext nc)
+                        in NamingContext nc)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
+             CannotProceed, 
+             InvalidName);
 
 /** 
  * The resolve operation is the process of retrieving an object
@@ -304,39 +304,39 @@
  * to the appropriate type. That is, clients typically cast the returned 
  * object from Object to a more specialized interface.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     Object resolve(in Name n)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             CannotProceed, 
+             InvalidName);
+
 /** 
  * The unbind operation removes a name binding from a context.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     void unbind(in Name n)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             CannotProceed, 
+             InvalidName);
+
 /**
  * The list operation allows a client to iterate through a set of
  * bindings in a naming context. <p>
@@ -351,15 +351,15 @@
  * bindings, the binding iterator is a nil object reference.
  * </ul>
  * 
- * @param how_many the maximum number of bindings to return <p>
+ * @param how_many the maximum number of bindings to return.
  * 
- * @param bl the returned list of bindings <p>
+ * @param bl the returned list of bindings.
  * 
- * @param bi the returned binding iterator <p>
+ * @param bi the returned binding iterator.
  */ 
     void list(in unsigned long how_many, 
-	      out BindingList bl, 
-	      out BindingIterator bi);
+              out BindingList bl, 
+              out BindingIterator bi);
 
 /**
  * This operation returns a naming context implemented by the same
@@ -367,7 +367,7 @@
  * The new context is not bound to any name.
  */ 
     NamingContext new_context();
-    
+
 /**
  * This operation creates a new context and binds it to the name
  * supplied as an argument. The newly-created context is implemented 
@@ -375,25 +375,25 @@
  * is, the naming server that implements the context denoted by the 
  * name argument excluding the last component).
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already 
- * bound to the specified name.<p>
+ * bound to the specified name.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     NamingContext bind_new_context(in Name n)
       raises(NotFound, 
-	     AlreadyBound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             AlreadyBound, 
+             CannotProceed, 
+             InvalidName);
+
 /** 
  * The destroy operation deletes a naming context. If the naming 
  * context contains bindings, the NotEmpty exception is raised.
@@ -402,7 +402,7 @@
  */
     void destroy()
       raises(NotEmpty);
-    
+
   };
 
 
@@ -413,7 +413,7 @@
  * part of Interoperable Naming Service.
  * Different names can be bound to an object in the same or different
  * contexts at the same time. Using <tt>NamingContextExt</tt>, you can use
- * URL-based names to bind and resolve. <p>
+ * URL-based names to bind and resolve.
  * 
  * See <a href="http://www.omg.org/technology/documents/formal/naming_service.htm">
  * CORBA COS 
@@ -425,86 +425,84 @@
  * StringName is the Stringified Name, Array of Name Components 
  * represented as a String.
  */
-	typedef string StringName;
+        typedef string StringName;
 
 /**
  * Address is the Host and Port information represented as a String.
  */
-	typedef string Address;
-   
+        typedef string Address;
+
 /**
  * URLString is the URL address (corbaloc: or corbaname:) represented as
  * a String.
  */
-	typedef string URLString;
+        typedef string URLString;
 
 /**
  * This operation creates a stringified name from the array of Name
  * components.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * 
  */ 
-	StringName to_string( in Name n ) raises (InvalidName);
+        StringName to_string( in Name n ) raises (InvalidName);
 
 /**
  * This operation  converts a Stringified Name into an  equivalent array
- * of Name Components. 
+ * of Name Components.
  * 
- * @param sn Stringified Name of the object <p>
+ * @param sn Stringified Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * 
  */ 
-	Name to_name( in StringName sn ) raises (InvalidName);
+        Name to_name( in StringName sn ) raises (InvalidName);
 
 
 /** 
  * Indicates the invalid Stringified name for the object, The
  * reason could be invalid syntax. 
  */
-	exception InvalidAddress 
-	{ };
+        exception InvalidAddress 
+        { };
 
 /**
  * This operation creates a URL based "iiopname://" format name
  * from the Stringified Name of the object.
  * 
- * @param addr internet based address of the host machine where  Name Service is running <p>
- * @param sn Stringified Name of the object <p>
+ * @param addr internet based address of the host machine where Name Service is running.
+ * @param sn Stringified Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress
- * Indicates the internet based address of the host machine is 
- * incorrect <p>
- * 
- */ 
-	URLString to_url( in Address addr, in StringName sn )
-			raises( InvalidAddress, InvalidName );
+ * Indicates the internet based address of the host machine is incorrect
+ */
+        URLString to_url( in Address addr, in StringName sn )
+            raises( InvalidAddress, InvalidName );
 
 
 /**
  * This operation resolves the Stringified name into the object
  * reference. 
  * 
- * @param sn Stringified Name of the object <p>
+ * @param sn Stringified Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.NotFound
- * Indicates there is no object reference for the given name. <p>
+ * Indicates there is no object reference for the given name.
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
- * Indicates that the given compound name is incorrect <p>
+ * Indicates that the given compound name is incorrect.
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * 
  */ 
-	Object resolve_str( in StringName sn)
-		raises( NotFound, CannotProceed,
-			InvalidName);
+        Object resolve_str( in StringName sn)
+            raises( NotFound, CannotProceed,
+            InvalidName);
 
   };
 
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 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
@@ -32,20 +32,20 @@
 
   Provides a naming service for Java&nbsp;IDL.  The Object Request Broker Daemon
   (ORBD) also includes both a transient and persistent naming service.
-  
+
 
   <P>
   The package and all its classes and interfaces 
   were generated by running the tool <code>idlj</code> on the file
   <code>nameservice.idl</code>, which is a module written in OMG IDL.
-  
+
   <H3>Package Specification</H3>
- 
+
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6, ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-  <P>
+
   <H2>Interfaces</H2>
   The package <tt>org.omg.CosNaming</tt> contains two public interfaces
   and several auxiliary classes. 
@@ -62,7 +62,7 @@
   interface supplies the main functionality for the naming service, and
   <code>BindingIterator</code> provides a means of iterating through a list
   of name/object reference bindings.
-  <P>
+
   <H2>Auxiliary Classes</H2>
   In order to map an OMG IDL interface to the Java programming language,
   the idlj compiler creates Java classes that can be thought of
@@ -70,13 +70,13 @@
   Comments for the generated auxiliary classes
   used by the interfaces <code>NamingContext</code> and 
   <code>BindingIterator</code> are included here.
-  <P>
+
   <H3>Classes Used by <code>NamingContext</code> and
   <code>BindingIterator</code></H3>
   The following are classes used by
   the naming service.  (Helper and  holder classes, which are
   generated for each of the classes listed here,  are discussed below.)
- 
+
   <UL>
     <LI><code>public final class <B>NameComponent</B></code> -- 
     a building block for names.  (Names are bound to object references
@@ -89,8 +89,7 @@
     A <code><B>NameComponent</B></code> object consists of two fields:
     <OL>
     <LI><code><B>id</B></code> -- a <code>String</code> used as an identifier
-    <LI><code><B>kind</B></code> -- a <code>String</code> that can be used for 
-any
+    <LI><code><B>kind</B></code> -- a <code>String</code> that can be used for any
     descriptive purpose.  Its importance is that it
     can be used to describe an object without affecting syntax.
     The C programming language, for example, uses the the syntactic convention
@@ -102,16 +101,15 @@
     <code>"c_source"</code>, <code>"object_code"</code>,
     <code>"executable"</code>, 
     <code>"postscript"</code>, and <code>""</code>.  It is not unusual
-	for the <code>kind</code> field to be the empty string.
+    for the <code>kind</code> field to be the empty string.
     </OL>
     <P>
     In a name, each <code>NameComponent</code> object except the last denotes
     a <code>NamingContext</code> object; the last <code>NameComponent</code>
     object denotes the bound object reference.
     This is similar to a path name, in which the last name is the
-    file name, and all names before it are directory names.<p>
-    <P>
-   
+    file name, and all names before it are directory names.
+
     <LI><code>public final class <B>Binding</B></code> -- 
     an object that associates a name with an object reference or a
     naming context.
@@ -125,45 +123,44 @@
     </OL>
     <P>
     The interface <code>NamingContext</code> has methods for
-	binding/unbinding names with object references or naming contexts,
-	for listing bindings,
+    binding/unbinding names with object references or naming contexts,
+    for listing bindings,
     and for resolving bindings (given a name, the method
     <code>resolve</code> returns the object reference bound to it).
-   
-  <P>
-  <LI><code>public final class <B>BindingType</B></code> --
+
+    <LI><code>public final class <B>BindingType</B></code> --
     an object that specifies whether the given <code>Binding</code>
     object is a binding between a name and an object reference (that is,
     not a naming context) or between a name and a naming context.
     <P>
     The class<code>BindingType</code> consists of two methods and
-	four constants. Two of these constants are
-	<code>BindingType</code> objects, and two are <code>int</code>s.
-	<P>
-	The <code>BindingType</code> objects
+    four constants. Two of these constants are
+    <code>BindingType</code> objects, and two are <code>int</code>s.
+    <P>
+    The <code>BindingType</code> objects
     can be passed to the constructor for the class
     <code>Binding</code> or used as parameters or return values.  These
-	<code>BindingType</code> objects are:
+    <code>BindingType</code> objects are:
     <UL>
     <LI><code>public static final BindingType <B>nobject</B></code> -- 
-	to indicate that the binding is with an object reference
+    to indicate that the binding is with an object reference
     <LI><code>public static final BindingType <B>ncontext</B></code> -- 
-	to indicate that the binding is with a naming context
+    to indicate that the binding is with a naming context
     </UL>
     <P>
-	The <code>int</code> constants can be supplied to the method
-	<code>from_int</code> to create  <code>BindingType</code> objects,
-	or they can be return values for the method <code>value</code>.
-	These constants are:
-	<UL>
+    The <code>int</code> constants can be supplied to the method
+    <code>from_int</code> to create  <code>BindingType</code> objects,
+    or they can be return values for the method <code>value</code>.
+    These constants are:
+    <UL>
     <LI><code>public static final int <B>_nobject</B></code>
     <LI><code>public static final int <B>_ncontext</B></code>
-	</UL>
+    </UL>
     If the method <code>from_int</code> is supplied with anything other
-	than <code>_nobject</code>
+    than <code>_nobject</code>
     or <code>_ncontext</code>, it will throw
-	the exception <code>org.omg.CORBA.BAD_PARAM</code>. 
-	<P>Usage is as follows:
+    the exception <code>org.omg.CORBA.BAD_PARAM</code>. 
+    <P>Usage is as follows:
     <PRE>
        BindingType btObject = from_int(_nobject);
        BindingType btContext = from_int(_ncontext);
@@ -182,9 +179,9 @@
        int bt = BindingType.value();
     </PRE>
   </UL>
-  
+
   <H3>Holder Classes</H3>
- 
+
   OMG IDL uses OUT and INOUT parameters for returning values from operations.
   The mapping to the Java programming language, which does not have OUT
   and INOUT parameters, creates a special class for each type, called
@@ -308,7 +305,6 @@
       This associates <code>NameService</code> with the Root Naming
       Context of the <code>CosNaming</code> implementation that you 
       want to use.
-	  <P>
   <LI>Start the standalone Bootstrap server using the following command:
   <pre>
       <code>
@@ -340,13 +336,13 @@
 <code>CosNaming</code> API, please see:
 <ul>
   <li><a href="../../../../technotes/guides/idl/tnameserv.html">
-	Naming Service</a>
+    Naming Service</a>
 </ul>
 <p>
 For an overview of Java&nbsp;IDL, please see:
 <ul>
   <li><a href="../../../../technotes/guides/idl/index.html">
-	Java&nbsp;IDL home page</a>
+    Java&nbsp;IDL home page</a>
 </ul>
 
 @since JDK1.3
--- a/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 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
@@ -45,7 +45,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 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
@@ -48,7 +48,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 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
@@ -46,7 +46,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
- Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 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
@@ -197,22 +197,14 @@
  interface may raise the standard NO_IMPLEMENT exception.
  An attempt to use a <code>DynAny</code> object with the DII may raise the NO_IMPLEMENT 
 exception.
- 
-
-
-
-
-
-<P>
-
 
 <H3>Package Specification</H3>
- 
+
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 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
@@ -42,7 +42,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 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
@@ -45,7 +45,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/IOP/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/IOP/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 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
@@ -52,7 +52,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/Messaging/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/Messaging/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 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
@@ -47,7 +47,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -258,14 +258,14 @@
      * <p>
      * The <code>TAG_ALTERNATE_IIOP_ADDRESS</code> component has an 
      * associated value of type:
-     * <code>
-     *   <pre>
+     * <pre>
+     *   <code>
      *     struct { 
      *         string HostID, 
      *         short Port 
-     *     }; 
-     *   </pre>
-     * </code>
+     *     };
+     *   </code>
+     * </pre>
      * encoded as a CDR encapsulation. 
      * <p>
      * Zero or more instances of the <code>TAG_ALTERNATE_IIOP_ADDRESS</code> 
@@ -601,7 +601,7 @@
 
     /**
      * Create a <code>Codec</code> of the given encoding.
-     * <p>
+     *
      * @param enc The encoding for which to create a <code>Codec</code>.
      * @return A <code>Codec</code> obtained with the given encoding.
      * @exception UnknownEncoding thrown if this factory cannot create a 
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -479,7 +479,7 @@
      * On the client:
      * <ul>
      *   <li>Within the <code>receive_reply</code> interception point, this 
-     *       will only return <code>SUCCESSFUL</code></li>.
+     *       will only return <code>SUCCESSFUL</code>.</li>
      *   <li>Within the <code>receive_exception</code> interception point, 
      *       this will be either <code>SYSTEM_EXCEPTION</code> or 
      *       <code>USER_EXCEPTION</code>.</li>
@@ -545,7 +545,7 @@
     /**
      * Returns a copy of the service context with the given ID that 
      * is associated with the request. 
-     * <p>
+     *
      * @param id The <code>IOP.ServiceId</code> of the service context 
      *     which is to be returned. 
      * @return The <code>IOP.ServiceContext</code> obtained with the 
@@ -579,7 +579,6 @@
    * validity of each attribute or operation.  If it is not valid, attempting 
    * to access it will result in a <code>BAD_INV_ORDER</code> being thrown
    * with a standard minor code of 14.
-   * <p>
    *
    * <table border=1 summary="Shows the validity of each attribute or operation">
    *  <thead>
@@ -934,7 +933,6 @@
    * of each attribute or operation.  If it is not valid, attempting to access 
    * it will result in a <code>BAD_INV_ORDER</code> being thrown with a 
    * standard minor code of 14.
-   * <p>
    *
    *
    * <table border=1 summary="Shows the validity of each attribute or operation">
@@ -1028,7 +1026,7 @@
    *    <td>yes</td> <td>yes</td> <td>yes</td> <td>yes</td> <td>yes</td></tr>
    * 
    *    <tr><td><b>arguments</b></td>
-   *    <td>no </td> <td>yes<sub>1</sub</td> 
+   *    <td>no </td> <td>yes<sub>1</sub></td>
    *                              <td>yes</td> <td>no<sub>2</sub></td> 
    *                                                        <td>no<sub>2</sub>
    *                                                        </td></tr>
@@ -1133,7 +1131,7 @@
    *       servant, which may no longer be available to the ORB. For example, 
    *       if the object's adapter is a POA that uses a 
    *       <code>ServantLocator</code>, then the ORB invokes the interception 
-   *       point after it calls <code>ServantLocator.postinvoke()</code></li>.
+   *       point after it calls <code>ServantLocator.postinvoke()</code>.</li>
    * </ol>
    *
    * @see ServerRequestInterceptor
@@ -1889,7 +1887,7 @@
      * @param type An int specifying the type of policy being created. 
      * @param value An any containing data with which to construct the 
      *     <code>CORBA.Policy</code>. 
-     * @return A <code>CORBA.Policy<code> object of the specified type and 
+     * @return A <code>CORBA.Policy</code> object of the specified type and
      *     value.
      */
     CORBA::Policy create_policy 
@@ -2124,7 +2122,7 @@
    * <p>
    * A client-side logging service written by company X, for example, may 
    * have the following ORBInitializer implementation: 
-   * <code><pre>
+   * <pre><code>
    * package com.x.logging;
    * 
    * import org.omg.PortableInterceptor.Interceptor; 
@@ -2144,7 +2142,7 @@
    *         // This service does not need two init points. 
    *     } 
    * } 
-   * </pre></code>
+   * </code></pre>
    * To run a program called <code>MyApp</code> using this logging 
    * service, the user could type: 
    *   <blockquote><code>
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 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
@@ -44,7 +44,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 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
@@ -56,41 +56,39 @@
 <h2>Known limitations / unimplemented methods in package 
 <code>org.omg.PortableInterceptor</code></h2>
 
-<code>
 <ul>
   <li>
-    <b>RequestInfo</b>
+    <code><b>RequestInfo</b></code>
     <ul>
-      <li><b>sync_scope()</b>: Always returns SYNC_WITH_TRANSPORT</li>
-      <li><b>arguments()</b>: Only supported for DII/DSI calls</li>
-      <li><b>exceptions()</b>: Only supported for DII calls on client side.  
+      <li><code><b>sync_scope()</b></code>: Always returns SYNC_WITH_TRANSPORT</li>
+      <li><code><b>arguments()</b></code>: Only supported for DII/DSI calls</li>
+      <li><code><b>exceptions()</b></code>: Only supported for DII calls on client side.  
           Not supported on server-side.</li>
-      <li><b>contexts()</b>: Only supported for DII calls on client side.
+      <li><code><b>contexts()</b></code>: Only supported for DII calls on client side.
           Not supported on server-side since our ORB does not send contexts.
           </li>
-      <li><b>operation_context()</b>: Only supported for DII calls 
+      <li><code><b>operation_context()</b></code>: Only supported for DII calls 
           on client side.  Not supported on server-side since ORB 
           does not send contexts.</li>
-      <li><b>result()</b>: Only supported for DII/DSI calls</li>
+      <li><code><b>result()</b></code>: Only supported for DII/DSI calls</li>
     </ul>
   </li>
   <li>
-    <b>ClientRequestInfo</b>
+    <code><b>ClientRequestInfo</b></code>
     <ul>
-      <li><b>received_exception_id()</b>: Always returns null in the 
+      <li><code><b>received_exception_id()</b></code>: Always returns null in the 
           DII case</li>
-      <li><b>get_request_policy(int type)</b>: Not implemented.</li>
+      <li><code><b>get_request_policy(int type)</b></code>: Not implemented.</li>
     </ul>
   </li>
   <li>
-    <b>ServerRequestInfo</b>
+    <code><b>ServerRequestInfo</b></code>
     <ul>
-      <li><b>sending_exception()</b>: Does not support user exceptions on 
+      <li><code><b>sending_exception()</b></code>: Does not support user exceptions on 
           the server side in non-DSI case.</li>
     </ul>
   </li>
 </ul>
-</code>
 
 <h2>Package Specification</h2>
 <P>For a precise list of supported sections of official OMG specifications with which 
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 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
@@ -53,7 +53,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 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
@@ -43,7 +43,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 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
@@ -36,7 +36,6 @@
 between different ORB products.  
 
 <P>The Portable Object Adaptor (POA) is designed to meet the following goals:
-<P>
 <UL>
 <LI>Allow programmers to construct object implementations that are portable between different ORB products.
 <LI>Provide support for objects with persistent identities.
@@ -66,7 +65,7 @@
 the Java[tm] Platform, Standard Edition 6, ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 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
@@ -43,13 +43,6 @@
 the Java[tm] Platform, Standard Edition 6 complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
-
-
-
-
-
-
 
 @since 1.4
 <br>
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 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
@@ -52,12 +52,10 @@
 the Java[tm] Platform, Standard Edition 6 complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
 
 <H2>POA-related Interfaces</H2>
 
 <P>The <TT>PortableServer</TT> module defines the following POA-related interfaces:
-<P>
 <UL>
 	<LI><TT>POA</TT>
 	<LI><TT>POAManager</TT>
@@ -79,12 +77,18 @@
 
 <H3>Operations classes</H3>
 
-<P>Each of the interfaces listed above has an associated <code>Operations</code> interface.  The <code>Operations</code> interface is generated by the <code>idlj</code> compiler and contains the method signatures for methods defined in its associated interface.  The <code>Operations</code> interface can be accessed by both the client and the server, while its associated interface can only be called by the client.
+<P>Each of the interfaces listed above has an associated <code>Operations</code> interface.
+The <code>Operations</code> interface is generated by the <code>idlj</code> compiler and
+contains the method signatures for methods defined in its associated interface.
+The <code>Operations</code> interface can be accessed by both the client and the server,
+while its associated interface can only be called by the client.
 
 <H3>Value Classes</H3>
 
-Classes ending in the suffix <code>PolicyValue</code> provide the values used for the <code>create_POA</code> call, which sets the policy for the POA.   See the <a href="#sampleserver">sample code</a> below for a demonstration.  <code>PolicyValue</code> files include the following:
-<P>
+Classes ending in the suffix <code>PolicyValue</code> provide the values used
+for the <code>create_POA</code> call, which sets the policy for the POA. See
+the <a href="#sampleserver">sample code</a> below for a demonstration. 
+<code>PolicyValue</code> files include the following:
 <UL>
 <LI><code>IdAssignmentPolicyValue</code> 
 <LI><code>IdUniquenessPolicyValue</code>
@@ -98,8 +102,11 @@
 <H3>Helper Classes</H3>
 
 <P>Helper classes, which are generated for all user-defined types in an OMG IDL 
-interface, supply static methods needed to manipulate those types.  There is only one method in a helper class that an application programmer uses: the  <code>narrow</code> method.  Only Java interfaces mapped from IDL interfaces will have a helper class that includes a <code>narrow</code> method, so in the <code>PortableServer</code> package, only the following classes have a <code>narrow</code> method:
-<P>
+interface, supply static methods needed to manipulate those types.
+There is only one method in a helper class that an application programmer uses: 
+the  <code>narrow</code> method.  Only Java interfaces mapped from IDL interfaces 
+will have a helper class that includes a <code>narrow</code> method, so in
+the <code>PortableServer</code> package, only the following classes have a <code>narrow</code> method:
 <UL>
 <LI><code>ForwardRequestHelper</code>
 <LI><code>ServantActivatorHelper</code>
@@ -113,22 +120,31 @@
 <H3>Exceptions</H3>
 
 <P>The <code>ForwardRequest</code> exception indicates to the ORB 
-that it is responsible for delivering the current request and subsequent <code>ForwardRequest</code> requests to the object denoted in the 
- <code>forward_reference</code> member of the exception.
+that it is responsible for delivering the current request and
+subsequent <code>ForwardRequest</code> requests to the object denoted in the
+<code>forward_reference</code> member of the exception.
 
 <H3>Interfaces Implemented by the Application Programmer</H3>
 
-<P>Most of what <code>PortableServer</code> does is transparent to the user.  The result is that programmers will use only a few of the interfaces mentioned above.  The remaining interfaces will be provided by the ORB implementation.  The interfaces of interest to application programmers are the following:
-<P>
+<P>Most of what <code>PortableServer</code> does is transparent to the user.
+The result is that programmers will use only a few of the interfaces mentioned above.
+The remaining interfaces will be provided by the ORB implementation.
+The interfaces of interest to application programmers are the following:
 <ul>
-	<LI><code>AdapterActivator</code>
-	<P>Adapter activators are associated with POAs.  An adapter activator supplies a POA with the ability to create child POAs on demand, as a side-effect of receiving a request that names the child POA (or one of its children), or when <code>find_POA</code> is called with an activate parameter value of <code>TRUE</code>.  An application server that creates all its needed POAs at the beginning of execution does not need to use or provide an adapter activator; it is necessary only for the case in which POAs need to be created during request processing.
-	<P>
-	<LI><code>ServantLocator</code>
-	<P>When the POA has the <code>NON_RETAIN</code> policy, it uses servant managers that are <code>ServantLocator</code>s.
-	<P>
-	<LI><code>ServantActivator</code>
-	<P>When the POA has the <code>RETAIN</code> policy, it uses servant managers that are <code>ServantActivator</code>s.
+  <LI><code>AdapterActivator</code>
+  <P>Adapter activators are associated with POAs. 
+  An adapter activator supplies a POA with the ability to create child POAs on demand,
+  as a side-effect of receiving a request that names the child POA (or one of its children),
+  or when <code>find_POA</code> is called with an activate parameter value of <code>TRUE</code>.
+  An application server that creates all its needed POAs at the beginning of execution
+  does not need to use or provide an adapter activator; it is necessary
+  only for the case in which POAs need to be created during request processing.
+  <LI><code>ServantLocator</code>
+  <P>When the POA has the <code>NON_RETAIN</code> policy,
+  it uses servant managers that are <code>ServantLocator</code>s.
+  <LI><code>ServantActivator</code>
+  <P>When the POA has the <code>RETAIN</code> policy,
+  it uses servant managers that are <code>ServantActivator</code>s.
 </ul>
 
 
@@ -141,13 +157,11 @@
 <H2>Related Documentation</H2>
 
 <P>For an overview of Java IDL, please see:
-<P>
-<LI><A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
+<A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
 
 <H2>Example Code</H2>
 <a name="sampleserver"></a>
 <H3>Example Server Code</H3>
-<P>
 <PRE>
 import javax.naming.InitialContext;
 import javax.naming.Context;
@@ -209,9 +223,6 @@
 
 
 
-<P>
-
-
 @since 1.4
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1999, 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
@@ -68,7 +68,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.3
 <br>
 @serial exclude
--- a/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html	Thu Apr 09 17:37:46 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html	Wed Jul 05 20:28:17 2017 +0200
@@ -3,7 +3,7 @@
 <title>org.omg.stub.java.rmi package</title>
 <!--
  
- Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 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
@@ -32,7 +32,7 @@
 <body bgcolor="white">
   Contains RMI-IIOP Stubs for the Remote types that occur in the 
   <tt>java.rmi</tt> package.
-<p>
+
 @since 1.3
 <br>
 @serial exclude
--- a/hotspot/.hgtags	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 20:28:17 2017 +0200
@@ -461,3 +461,4 @@
 fd2d5ec7e7b16c7bf4043a7fe7cfd8af96b819e2 jdk9-b56
 56a85ffe743d3f9d70ba25d6ce82ddd2ad1bf33c jdk9-b57
 ee878f3d6732856f7725c590312bfbe2ffa52cc7 jdk9-b58
+96bcaec07cb165782bae1b9a1f28450b37a10e3a jdk9-b59
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java	Wed Jul 05 20:28:17 2017 +0200
@@ -37,7 +37,9 @@
   private static CIntegerField nGensField;
   private static AddressField youngGenField;
   private static AddressField oldGenField;
-  private static AddressField genSpecsField;
+
+  private static AddressField youngGenSpecField;
+  private static AddressField oldGenSpecField;
 
   private static GenerationFactory genFactory;
 
@@ -55,9 +57,12 @@
     nGensField = type.getCIntegerField("_n_gens");
     youngGenField = type.getAddressField("_young_gen");
     oldGenField = type.getAddressField("_old_gen");
-    genSpecsField = type.getAddressField("_gen_specs");
 
     genFactory = new GenerationFactory();
+
+    Type collectorPolicyType = db.lookupType("GenCollectorPolicy");
+    youngGenSpecField = collectorPolicyType.getAddressField("_young_gen_spec");
+    oldGenSpecField = collectorPolicyType.getAddressField("_old_gen_spec");
   }
 
   public GenCollectedHeap(Address addr) {
@@ -115,21 +120,23 @@
   /** Package-private access to GenerationSpecs */
   GenerationSpec spec(int level) {
     if (Assert.ASSERTS_ENABLED) {
-      Assert.that((level >= 0) && (level < nGens()), "Index " + level +
-                  " out of range (should be between 0 and " + nGens() + ")");
+      Assert.that((level == 0) || (level == 1), "Index " + level +
+                  " out of range (should be 0 or 1)");
     }
 
-    if ((level < 0) || (level >= nGens())) {
+    if ((level != 0) && (level != 1)) {
       return null;
     }
 
-    Address ptrList = genSpecsField.getValue(addr);
-    if (ptrList == null) {
-      return null;
+    if (level == 0) {
+      return (GenerationSpec)
+              VMObjectFactory.newObject(GenerationSpec.class,
+                      youngGenSpecField.getAddress());
+    } else {
+      return (GenerationSpec)
+              VMObjectFactory.newObject(GenerationSpec.class,
+                      oldGenSpecField.getAddress());
     }
-    return (GenerationSpec)
-      VMObjectFactory.newObject(GenerationSpec.class,
-                                ptrList.getAddressAt(level * VM.getVM().getAddressSize()));
   }
 
   public CollectedHeapName kind() {
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -52,9 +52,10 @@
 }
 
 void ConcurrentMarkSweepPolicy::initialize_generations() {
-  _generations = NEW_C_HEAP_ARRAY(GenerationSpecPtr, number_of_generations(), mtGC);
-  _generations[0] = new GenerationSpec(Generation::ParNew, _initial_young_size, _max_young_size);
-  _generations[1] = new GenerationSpec(Generation::ConcurrentMarkSweep, _initial_old_size, _max_old_size);
+  _young_gen_spec = new GenerationSpec(Generation::ParNew, _initial_young_size,
+                                       _max_young_size, _gen_alignment);
+  _old_gen_spec   = new GenerationSpec(Generation::ConcurrentMarkSweep,
+                                       _initial_old_size, _max_old_size, _gen_alignment);
 }
 
 void ConcurrentMarkSweepPolicy::initialize_size_policy(size_t init_eden_size,
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -65,8 +65,6 @@
 #include "services/memoryService.hpp"
 #include "services/runtimeService.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // statics
 CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
 bool CMSCollector::_full_gc_requested = false;
@@ -1593,7 +1591,7 @@
   bitMapLock()->lock_without_safepoint_check();
   if (TraceCMSState) {
     gclog_or_tty->print_cr("CMS foreground collector has asked for control "
-      INTPTR_FORMAT " with first state %d", Thread::current(), first_state);
+      INTPTR_FORMAT " with first state %d", p2i(Thread::current()), first_state);
     gclog_or_tty->print_cr("    gets control with state %d", _collectorState);
   }
 
@@ -1763,27 +1761,27 @@
   // Eden
   if (_eden_chunk_array != NULL) {
     gclog_or_tty->print_cr("eden " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
-                           eden_space->bottom(), eden_space->top(),
-                           eden_space->end(), eden_space->capacity());
+                           p2i(eden_space->bottom()), p2i(eden_space->top()),
+                           p2i(eden_space->end()), eden_space->capacity());
     gclog_or_tty->print_cr("_eden_chunk_index=" SIZE_FORMAT ", "
                            "_eden_chunk_capacity=" SIZE_FORMAT,
                            _eden_chunk_index, _eden_chunk_capacity);
     for (size_t i = 0; i < _eden_chunk_index; i++) {
       gclog_or_tty->print_cr("_eden_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
-                             i, _eden_chunk_array[i]);
+                             i, p2i(_eden_chunk_array[i]));
     }
   }
   // Survivor
   if (_survivor_chunk_array != NULL) {
     gclog_or_tty->print_cr("survivor " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
-                           from_space->bottom(), from_space->top(),
-                           from_space->end(), from_space->capacity());
+                           p2i(from_space->bottom()), p2i(from_space->top()),
+                           p2i(from_space->end()), from_space->capacity());
     gclog_or_tty->print_cr("_survivor_chunk_index=" SIZE_FORMAT ", "
                            "_survivor_chunk_capacity=" SIZE_FORMAT,
                            _survivor_chunk_index, _survivor_chunk_capacity);
     for (size_t i = 0; i < _survivor_chunk_index; i++) {
       gclog_or_tty->print_cr("_survivor_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
-                             i, _survivor_chunk_array[i]);
+                             i, p2i(_survivor_chunk_array[i]));
     }
   }
 }
@@ -1890,7 +1888,7 @@
   while (_collectorState != Idling) {
     if (TraceCMSState) {
       gclog_or_tty->print_cr("Thread " INTPTR_FORMAT " in CMS state %d",
-        Thread::current(), _collectorState);
+        p2i(Thread::current()), _collectorState);
     }
     // The foreground collector
     //   holds the Heap_lock throughout its collection.
@@ -1924,7 +1922,7 @@
         if (TraceCMSState) {
           gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT
             " exiting collection CMS state %d",
-            Thread::current(), _collectorState);
+            p2i(Thread::current()), _collectorState);
         }
         return;
       } else {
@@ -2031,7 +2029,7 @@
     }
     if (TraceCMSState) {
       gclog_or_tty->print_cr("  Thread " INTPTR_FORMAT " done - next CMS state %d",
-        Thread::current(), _collectorState);
+        p2i(Thread::current()), _collectorState);
     }
     assert(_foregroundGCShouldWait, "block post-condition");
   }
@@ -2054,7 +2052,7 @@
   if (TraceCMSState) {
     gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT
       " exiting collection CMS state %d",
-      Thread::current(), _collectorState);
+      p2i(Thread::current()), _collectorState);
   }
   if (PrintGC && Verbose) {
     _cmsGen->print_heap_change(prev_used);
@@ -2112,7 +2110,7 @@
     CGC_lock->notify();
     if (TraceCMSState) {
       gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT " waiting at CMS state %d",
-        Thread::current(), _collectorState);
+        p2i(Thread::current()), _collectorState);
     }
     while (_foregroundGCIsActive) {
       CGC_lock->wait(Mutex::_no_safepoint_check_flag);
@@ -2124,7 +2122,7 @@
   }
   if (TraceCMSState) {
     gclog_or_tty->print_cr("CMS Thread " INTPTR_FORMAT " continuing at CMS state %d",
-      Thread::current(), _collectorState);
+      p2i(Thread::current()), _collectorState);
   }
   return res;
 }
@@ -2356,13 +2354,13 @@
 
   // Clear the marking bit map array before starting, but, just
   // for kicks, first report if the given address is already marked
-  gclog_or_tty->print_cr("Start: Address " PTR_FORMAT " is%s marked", addr,
+  gclog_or_tty->print_cr("Start: Address " PTR_FORMAT " is%s marked", p2i(addr),
                 _markBitMap.isMarked(addr) ? "" : " not");
 
   if (verify_after_remark()) {
     MutexLockerEx x(verification_mark_bm()->lock(), Mutex::_no_safepoint_check_flag);
     bool result = verification_mark_bm()->isMarked(addr);
-    gclog_or_tty->print_cr("TransitiveMark: Address " PTR_FORMAT " %s marked", addr,
+    gclog_or_tty->print_cr("TransitiveMark: Address " PTR_FORMAT " %s marked", p2i(addr),
                            result ? "IS" : "is NOT");
     return result;
   } else {
@@ -2377,13 +2375,13 @@
   CMSCollector* collector = ConcurrentMarkSweepGeneration::_collector;
   if (collector != NULL) {
     CMSBitMap* bitmap = &collector->_markBitMap;
-    st->print_cr("Marking Bits: (CMSBitMap*) " PTR_FORMAT, bitmap);
+    st->print_cr("Marking Bits: (CMSBitMap*) " PTR_FORMAT, p2i(bitmap));
     bitmap->print_on_error(st, " Bits: ");
 
     st->cr();
 
     CMSBitMap* mut_bitmap = &collector->_modUnionTable;
-    st->print_cr("Mod Union Table: (CMSBitMap*) " PTR_FORMAT, mut_bitmap);
+    st->print_cr("Mod Union Table: (CMSBitMap*) " PTR_FORMAT, p2i(mut_bitmap));
     mut_bitmap->print_on_error(st, " Bits: ");
   }
 }
@@ -2406,7 +2404,7 @@
     HeapWord* addr = _marks->offsetToHeapWord(offset);
     if (!_marks->isMarked(addr)) {
       oop(addr)->print_on(gclog_or_tty);
-      gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
+      gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", p2i(addr));
       _failed = true;
     }
     return true;
@@ -2474,7 +2472,7 @@
     // presumably, a mutation to A failed to be picked up by preclean/remark?
     verify_after_remark_work_2();
   } else {
-    warning("Unrecognized value %d for CMSRemarkVerifyVariant",
+    warning("Unrecognized value " UINTX_FORMAT " for CMSRemarkVerifyVariant",
             CMSRemarkVerifyVariant);
   }
   if (!silent) gclog_or_tty->print(" done] ");
@@ -5056,7 +5054,7 @@
       for (size_t i = 0; i < total - 1; i++) {
         if (PrintCMSStatistics > 0) {
           gclog_or_tty->print(" (chunk" SIZE_FORMAT ":" INTPTR_FORMAT ") ",
-                              i, _survivor_chunk_array[i]);
+                              i, p2i(_survivor_chunk_array[i]));
         }
         assert(_survivor_chunk_array[i] < _survivor_chunk_array[i+1],
                "Not sorted");
@@ -5700,8 +5698,8 @@
     gclog_or_tty->print_cr(
       "CMS: Large Block: " PTR_FORMAT ";"
       " Proximity: " PTR_FORMAT " -> " PTR_FORMAT,
-      largestAddr,
-      _cmsSpace->nearLargestChunk(), minAddr + nearLargestOffset);
+      p2i(largestAddr),
+      p2i(_cmsSpace->nearLargestChunk()), p2i(minAddr + nearLargestOffset));
   }
   _cmsSpace->set_nearLargestChunk(minAddr + nearLargestOffset);
 }
@@ -6184,7 +6182,7 @@
     _verification_bm->mark(addr);
     if (!_cms_bm->isMarked(addr)) {
       oop(addr)->print();
-      gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr);
+      gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", p2i(addr));
       fatal("... aborting");
     }
   }
@@ -6979,7 +6977,7 @@
     if (!_cms_bm->isMarked(addr)) {
       oop(addr)->print();
       gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)",
-                             addr);
+                             p2i(addr));
       fatal("... aborting");
     }
 
@@ -7375,16 +7373,16 @@
          "sweep _limit out of bounds");
   if (CMSTraceSweeper) {
     gclog_or_tty->print_cr("\n====================\nStarting new sweep with limit " PTR_FORMAT,
-                        _limit);
+                        p2i(_limit));
   }
 }
 
 void SweepClosure::print_on(outputStream* st) const {
   tty->print_cr("_sp = [" PTR_FORMAT "," PTR_FORMAT ")",
-                _sp->bottom(), _sp->end());
-  tty->print_cr("_limit = " PTR_FORMAT, _limit);
-  tty->print_cr("_freeFinger = " PTR_FORMAT, _freeFinger);
-  NOT_PRODUCT(tty->print_cr("_last_fc = " PTR_FORMAT, _last_fc);)
+                p2i(_sp->bottom()), p2i(_sp->end()));
+  tty->print_cr("_limit = " PTR_FORMAT, p2i(_limit));
+  tty->print_cr("_freeFinger = " PTR_FORMAT, p2i(_freeFinger));
+  NOT_PRODUCT(tty->print_cr("_last_fc = " PTR_FORMAT, p2i(_last_fc));)
   tty->print_cr("_inFreeRange = %d, _freeRangeInFreeLists = %d, _lastFreeRangeCoalesced = %d",
                 _inFreeRange, _freeRangeInFreeLists, _lastFreeRangeCoalesced);
 }
@@ -7428,7 +7426,7 @@
   }
   if (CMSTraceSweeper) {
     gclog_or_tty->print_cr("end of sweep with _limit = " PTR_FORMAT "\n================",
-                           _limit);
+                           p2i(_limit));
   }
 }
 #endif  // PRODUCT
@@ -7437,7 +7435,7 @@
     bool freeRangeInFreeLists) {
   if (CMSTraceSweeper) {
     gclog_or_tty->print("---- Start free range at " PTR_FORMAT " with free block (%d)\n",
-               freeFinger, freeRangeInFreeLists);
+               p2i(freeFinger), freeRangeInFreeLists);
   }
   assert(!inFreeRange(), "Trampling existing free range");
   set_inFreeRange(true);
@@ -7501,14 +7499,14 @@
     // coalesced chunk to the appropriate free list.
     if (inFreeRange()) {
       assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
-             err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
+             err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", p2i(freeFinger())));
       flush_cur_free_chunk(freeFinger(),
                            pointer_delta(addr, freeFinger()));
       if (CMSTraceSweeper) {
         gclog_or_tty->print("Sweep: last chunk: ");
         gclog_or_tty->print("put_free_blk " PTR_FORMAT " ("SIZE_FORMAT") "
                    "[coalesced:%d]\n",
-                   freeFinger(), pointer_delta(addr, freeFinger()),
+                   p2i(freeFinger()), pointer_delta(addr, freeFinger()),
                    lastFreeRangeCoalesced() ? 1 : 0);
       }
     }
@@ -7652,7 +7650,7 @@
         // the midst of a free range, we are coalescing
         print_free_block_coalesced(fc);
         if (CMSTraceSweeper) {
-          gclog_or_tty->print("  -- pick up free block " PTR_FORMAT " (" SIZE_FORMAT ")\n", fc, size);
+          gclog_or_tty->print("  -- pick up free block " PTR_FORMAT " (" SIZE_FORMAT ")\n", p2i(fc), size);
         }
         // remove it from the free lists
         _sp->removeFreeChunkFromFreeLists(fc);
@@ -7714,7 +7712,7 @@
       // this will be swept up when we hit the end of the
       // free range
       if (CMSTraceSweeper) {
-        gclog_or_tty->print("  -- pick up garbage " PTR_FORMAT " (" SIZE_FORMAT ")\n", fc, size);
+        gclog_or_tty->print("  -- pick up garbage " PTR_FORMAT " (" SIZE_FORMAT ")\n", p2i(fc), size);
       }
       // If the chunk is being coalesced and the current free range is
       // in the free lists, remove the current free range so that it
@@ -7807,7 +7805,7 @@
   }
 
   if (CMSTraceSweeper) {
-    gclog_or_tty->print_cr("  -- pick up another chunk at " PTR_FORMAT " (" SIZE_FORMAT ")", fc, chunkSize);
+    gclog_or_tty->print_cr("  -- pick up another chunk at " PTR_FORMAT " (" SIZE_FORMAT ")", p2i(fc), chunkSize);
   }
 
   HeapWord* const fc_addr = (HeapWord*) fc;
@@ -7906,14 +7904,14 @@
          err_msg("eob = " PTR_FORMAT " eob-1 = " PTR_FORMAT " _limit = " PTR_FORMAT
                  " out of bounds wrt _sp = [" PTR_FORMAT "," PTR_FORMAT ")"
                  " when examining fc = " PTR_FORMAT "(" SIZE_FORMAT ")",
-                 eob, eob-1, _limit, _sp->bottom(), _sp->end(), fc, chunk_size));
+                 p2i(eob), p2i(eob-1), p2i(_limit), p2i(_sp->bottom()), p2i(_sp->end()), p2i(fc), chunk_size));
   if (eob >= _limit) {
     assert(eob == _limit || fc->is_free(), "Only a free chunk should allow us to cross over the limit");
     if (CMSTraceSweeper) {
       gclog_or_tty->print_cr("_limit " PTR_FORMAT " reached or crossed by block "
                              "[" PTR_FORMAT "," PTR_FORMAT ") in space "
                              "[" PTR_FORMAT "," PTR_FORMAT ")",
-                             _limit, fc, eob, _sp->bottom(), _sp->end());
+                             p2i(_limit), p2i(fc), p2i(eob), p2i(_sp->bottom()), p2i(_sp->end()));
     }
     // Return the storage we are tracking back into the free lists.
     if (CMSTraceSweeper) {
@@ -7937,7 +7935,7 @@
     }
     if (CMSTraceSweeper) {
       gclog_or_tty->print_cr(" -- add free block " PTR_FORMAT " (" SIZE_FORMAT ") to free lists",
-                    chunk, size);
+                    p2i(chunk), size);
     }
     // A new free range is going to be starting.  The current
     // free range has not been added to the free lists yet or
@@ -8010,7 +8008,7 @@
 void SweepClosure::print_free_block_coalesced(FreeChunk* fc) const {
   if (CMSTraceSweeper) {
     gclog_or_tty->print_cr("Sweep:coal_free_blk " PTR_FORMAT " (" SIZE_FORMAT ")",
-                           fc, fc->size());
+                           p2i(fc), fc->size());
   }
 }
 
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,8 +27,6 @@
 #include "memory/freeBlockDictionary.hpp"
 #include "utilities/copy.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 #ifndef PRODUCT
 
 #define baadbabeHeapWord badHeapWordVal
@@ -74,5 +72,5 @@
 
 void FreeChunk::print_on(outputStream* st) {
   st->print_cr("Next: " PTR_FORMAT " Prev: " PTR_FORMAT " %s",
-    next(), prev(), cantCoalesce() ? "[can't coalesce]" : "");
+    p2i(next()), p2i(prev()), cantCoalesce() ? "[can't coalesce]" : "");
 }
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -28,8 +28,6 @@
 #include "oops/markOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 /////////////////////////////////////////////////////////////////////////
 //// PromotionInfo
 /////////////////////////////////////////////////////////////////////////
@@ -360,6 +358,6 @@
 
 void SpoolBlock::print_on(outputStream* st) const {
   st->print("[" PTR_FORMAT "," PTR_FORMAT "), " SIZE_FORMAT " HeapWords -> " PTR_FORMAT,
-            this, (HeapWord*)displacedHdr + bufferSize,
-            bufferSize, nextSpoolBlock);
+            p2i(this), p2i((HeapWord*)displacedHdr + bufferSize),
+            bufferSize, p2i(nextSpoolBlock));
 }
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -34,8 +34,6 @@
 #include "runtime/os.hpp"
 #include "utilities/dtrace.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 //////////////////////////////////////////////////////////
 // Methods in abstract class VM_CMS_Operation
 //////////////////////////////////////////////////////////
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -2088,10 +2088,7 @@
   _cleanup_times.add((end - start) * 1000.0);
 
   if (G1Log::fine()) {
-    g1h->print_size_transition(gclog_or_tty,
-                               start_used_bytes,
-                               g1h->used(),
-                               g1h->capacity());
+    g1h->g1_policy()->print_heap_transition(start_used_bytes);
   }
 
   // Clean up will have freed any regions completely full of garbage.
@@ -2584,7 +2581,7 @@
  public:
   G1RemarkThreadsClosure(G1CollectedHeap* g1h, CMTask* task) :
     _cm_obj(task), _cm_cl(g1h, g1h->concurrent_mark(), task), _code_cl(&_cm_cl, !CodeBlobToOopClosure::FixRelocations),
-    _thread_parity(SharedHeap::heap()->strong_roots_parity()) {}
+    _thread_parity(Threads::thread_claim_parity()) {}
 
   void do_thread(Thread* thread) {
     if (thread->is_Java_thread()) {
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -31,8 +31,6 @@
 #include "services/memTracker.hpp"
 #include "utilities/copy.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 void G1CardCountsMappingChangedListener::on_commit(uint start_idx, size_t num_regions, bool zero_filled) {
   if (zero_filled) {
     return;
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -33,8 +33,6 @@
 #include "utilities/hashtable.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 class CodeRootSetTable : public Hashtable<nmethod*, mtGC> {
   friend class G1CodeRootSetTest;
   typedef HashtableEntry<nmethod*, mtGC> Entry;
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -66,7 +66,6 @@
 #include "memory/iterator.hpp"
 #include "memory/referenceProcessor.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/vmThread.hpp"
@@ -403,25 +402,6 @@
   return hr;
 }
 
-#ifdef ASSERT
-// A region is added to the collection set as it is retired
-// so an address p can point to a region which will be in the
-// collection set but has not yet been retired.  This method
-// therefore is only accurate during a GC pause after all
-// regions have been retired.  It is used for debugging
-// to check if an nmethod has references to objects that can
-// be move during a partial collection.  Though it can be
-// inaccurate, it is sufficient for G1 because the conservative
-// implementation of is_scavengable() for G1 will indicate that
-// all nmethods must be scanned during a partial collection.
-bool G1CollectedHeap::is_in_partial_collection(const void* p) {
-  if (p == NULL) {
-    return false;
-  }
-  return heap_region_containing(p)->in_collection_set();
-}
-#endif
-
 // Returns true if the reference points to an object that
 // can move in an incremental collection.
 bool G1CollectedHeap::is_scavengable(const void* p) {
@@ -1748,7 +1728,7 @@
 
 
 G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
-  SharedHeap(policy_),
+  SharedHeap(),
   _g1_policy(policy_),
   _dirty_card_queue_set(false),
   _into_cset_dirty_card_queue_set(false),
@@ -3732,7 +3712,14 @@
 
     TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty);
 
-    uint active_workers = workers()->active_workers();
+    uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
+                                                                  workers()->active_workers(),
+                                                                  Threads::number_of_non_daemon_threads());
+    assert(UseDynamicNumberOfGCThreads ||
+           active_workers == workers()->total_workers(),
+           "If not dynamic should be using all the  workers");
+    workers()->set_active_workers(active_workers);
+
     double pause_start_sec = os::elapsedTime();
     g1_policy()->phase_times()->note_gc_start(active_workers, mark_in_progress());
     log_gc_header();
@@ -5430,15 +5417,10 @@
   hot_card_cache->reset_hot_cache_claimed_index();
   hot_card_cache->set_use_cache(false);
 
-  uint n_workers;
-  n_workers =
-    AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
-                                   workers()->active_workers(),
-                                   Threads::number_of_non_daemon_threads());
+  const uint n_workers = workers()->active_workers();
   assert(UseDynamicNumberOfGCThreads ||
          n_workers == workers()->total_workers(),
          "If not dynamic should be using all the  workers");
-  workers()->set_active_workers(n_workers);
   set_par_threads(n_workers);
 
 
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1008,7 +1008,7 @@
   // Set _n_par_threads according to a policy TBD.
   void set_par_threads();
 
-  virtual CollectedHeap::Name kind() const {
+  virtual Name kind() const {
     return CollectedHeap::G1CollectedHeap;
   }
 
@@ -1379,10 +1379,6 @@
 
   inline bool is_in_young(const oop obj);
 
-#ifdef ASSERT
-  virtual bool is_in_partial_collection(const void* p);
-#endif
-
   virtual bool is_scavengable(const void* addr);
 
   // We don't need barriers for initializing stores to objects
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1201,11 +1201,21 @@
   }
 }
 
+void G1CollectorPolicy::print_heap_transition(size_t bytes_before) {
+  size_t bytes_after = _g1->used();
+  size_t capacity = _g1->capacity();
+
+  gclog_or_tty->print(" " SIZE_FORMAT "%s->" SIZE_FORMAT "%s(" SIZE_FORMAT "%s)",
+      byte_size_in_proper_unit(bytes_before),
+      proper_unit_for_byte_size(bytes_before),
+      byte_size_in_proper_unit(bytes_after),
+      proper_unit_for_byte_size(bytes_after),
+      byte_size_in_proper_unit(capacity),
+      proper_unit_for_byte_size(capacity));
+}
+
 void G1CollectorPolicy::print_heap_transition() {
-  _g1->print_size_transition(gclog_or_tty,
-                             _heap_used_bytes_before_gc,
-                             _g1->used(),
-                             _g1->capacity());
+  print_heap_transition(_heap_used_bytes_before_gc);
 }
 
 void G1CollectorPolicy::print_detailed_heap_transition(bool full) {
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -700,6 +700,8 @@
   void record_heap_size_info_at_start(bool full);
 
   // Print heap sizing transition (with less and more detail).
+
+  void print_heap_transition(size_t bytes_before);
   void print_heap_transition();
   void print_detailed_heap_transition(bool full = false);
 
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -154,28 +154,28 @@
     _has_new_data = true;
   }
 
-  double average(){
-    calculate_totals();
+  double average(uint active_threads){
+    calculate_totals(active_threads);
     return _average;
   }
 
-  T sum() {
-    calculate_totals();
+  T sum(uint active_threads) {
+    calculate_totals(active_threads);
     return _sum;
   }
 
-  T minimum() {
-    calculate_totals();
+  T minimum(uint active_threads) {
+    calculate_totals(active_threads);
     return _min;
   }
 
-  T maximum() {
-    calculate_totals();
+  T maximum(uint active_threads) {
+    calculate_totals(active_threads);
     return _max;
   }
 
   void reset() PRODUCT_RETURN;
-  void verify() PRODUCT_RETURN;
+  void verify(uint active_threads) PRODUCT_RETURN;
 
   void set_enabled(bool enabled) { _enabled = enabled; }
 
@@ -183,7 +183,7 @@
 
  private:
 
-  void calculate_totals(){
+  void calculate_totals(uint active_threads){
     if (!_has_new_data) {
       return;
     }
@@ -191,13 +191,14 @@
     _sum = (T)0;
     _min = _data[0];
     _max = _min;
-    for (uint i = 0; i < _length; ++i) {
+    assert(active_threads <= _length, "Wrong number of active threads");
+    for (uint i = 0; i < active_threads; ++i) {
       T val = _data[i];
       _sum += val;
       _min = MIN2(_min, val);
       _max = MAX2(_max, val);
     }
-    _average = (double)_sum / (double)_length;
+    _average = (double)_sum / (double)active_threads;
     _has_new_data = false;
   }
 };
@@ -226,17 +227,18 @@
 }
 
 template <class T>
-void WorkerDataArray<T>::verify() {
+void WorkerDataArray<T>::verify(uint active_threads) {
   if (!_enabled) {
     return;
   }
 
-  for (uint i = 0; i < _length; i++) {
+  assert(active_threads <= _length, "Wrong number of active threads");
+  for (uint i = 0; i < active_threads; i++) {
     assert(_data[i] != WorkerDataArray<T>::uninitialized(),
         err_msg("Invalid data for worker %u in '%s'", i, _title));
   }
   if (_thread_work_items != NULL) {
-    _thread_work_items->verify();
+    _thread_work_items->verify(active_threads);
   }
 }
 
@@ -321,7 +323,7 @@
   }
 
   for (int i = 0; i < GCParPhasesSentinel; i++) {
-    _gc_par_phases[i]->verify();
+    _gc_par_phases[i]->verify(_active_gc_threads);
   }
 }
 
@@ -378,7 +380,7 @@
 
 // return the average time for a phase in milliseconds
 double G1GCPhaseTimes::average_time_ms(GCParPhases phase) {
-  return _gc_par_phases[phase]->average() * 1000.0;
+  return _gc_par_phases[phase]->average(_active_gc_threads) * 1000.0;
 }
 
 double G1GCPhaseTimes::get_time_ms(GCParPhases phase, uint worker_i) {
@@ -386,15 +388,15 @@
 }
 
 double G1GCPhaseTimes::sum_time_ms(GCParPhases phase) {
-  return _gc_par_phases[phase]->sum() * 1000.0;
+  return _gc_par_phases[phase]->sum(_active_gc_threads) * 1000.0;
 }
 
 double G1GCPhaseTimes::min_time_ms(GCParPhases phase) {
-  return _gc_par_phases[phase]->minimum() * 1000.0;
+  return _gc_par_phases[phase]->minimum(_active_gc_threads) * 1000.0;
 }
 
 double G1GCPhaseTimes::max_time_ms(GCParPhases phase) {
-  return _gc_par_phases[phase]->maximum() * 1000.0;
+  return _gc_par_phases[phase]->maximum(_active_gc_threads) * 1000.0;
 }
 
 size_t G1GCPhaseTimes::get_thread_work_item(GCParPhases phase, uint worker_i) {
@@ -404,22 +406,22 @@
 
 size_t G1GCPhaseTimes::sum_thread_work_items(GCParPhases phase) {
   assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
-  return _gc_par_phases[phase]->thread_work_items()->sum();
+  return _gc_par_phases[phase]->thread_work_items()->sum(_active_gc_threads);
 }
 
 double G1GCPhaseTimes::average_thread_work_items(GCParPhases phase) {
   assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
-  return _gc_par_phases[phase]->thread_work_items()->average();
+  return _gc_par_phases[phase]->thread_work_items()->average(_active_gc_threads);
 }
 
 size_t G1GCPhaseTimes::min_thread_work_items(GCParPhases phase) {
   assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
-  return _gc_par_phases[phase]->thread_work_items()->minimum();
+  return _gc_par_phases[phase]->thread_work_items()->minimum(_active_gc_threads);
 }
 
 size_t G1GCPhaseTimes::max_thread_work_items(GCParPhases phase) {
   assert(_gc_par_phases[phase]->thread_work_items() != NULL, "No sub count");
-  return _gc_par_phases[phase]->thread_work_items()->maximum();
+  return _gc_par_phases[phase]->thread_work_items()->maximum(_active_gc_threads);
 }
 
 class G1GCParPhasePrinter : public StackObj {
@@ -455,14 +457,16 @@
   }
 
   void print_time_values(LineBuffer& buf, G1GCPhaseTimes::GCParPhases phase_id, WorkerDataArray<double>* phase) {
-    for (uint i = 0; i < phase->_length; ++i) {
+    uint active_length = _phase_times->_active_gc_threads;
+    for (uint i = 0; i < active_length; ++i) {
       buf.append("  %.1lf", _phase_times->get_time_ms(phase_id, i));
     }
     buf.print_cr();
   }
 
   void print_count_values(LineBuffer& buf, G1GCPhaseTimes::GCParPhases phase_id, WorkerDataArray<size_t>* thread_work_items) {
-    for (uint i = 0; i < thread_work_items->_length; ++i) {
+    uint active_length = _phase_times->_active_gc_threads;
+    for (uint i = 0; i < active_length; ++i) {
       buf.append("  " SIZE_FORMAT, _phase_times->get_thread_work_item(phase_id, i));
     }
     buf.print_cr();
--- a/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,8 +27,6 @@
 #include "gc_implementation/g1/heapRegion.hpp"
 #include "utilities/ostream.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 const char* G1HRPrinter::action_name(ActionType action) {
   switch(action) {
     case Alloc:          return "ALLOC";
@@ -85,18 +83,18 @@
   if (type_str != NULL) {
     if (top != NULL) {
       gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
-                             action_str, type_str, bottom, top);
+                             action_str, type_str, p2i(bottom), p2i(top));
     } else {
       gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
-                             action_str, type_str, bottom);
+                             action_str, type_str, p2i(bottom));
     }
   } else {
     if (top != NULL) {
       gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
-                             action_str, bottom, top);
+                             action_str, p2i(bottom), p2i(top));
     } else {
       gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
-                             action_str, bottom);
+                             action_str, p2i(bottom));
     }
   }
 }
@@ -105,7 +103,7 @@
   const char* action_str = action_name(action);
 
   gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
-                         action_str, bottom, end);
+                         action_str, p2i(bottom), p2i(end));
 }
 
 void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -33,6 +33,7 @@
 #include "gc_implementation/g1/g1MarkSweep.hpp"
 #include "gc_implementation/g1/g1RootProcessor.hpp"
 #include "gc_implementation/g1/g1StringDedup.hpp"
+#include "gc_implementation/shared/markSweep.inline.hpp"
 #include "gc_implementation/shared/gcHeapSummary.hpp"
 #include "gc_implementation/shared/gcTimer.hpp"
 #include "gc_implementation/shared/gcTrace.hpp"
@@ -217,7 +218,7 @@
         // We must adjust the pointers on the single H object.
         oop obj = oop(r->bottom());
         // point all the oops to the new location
-        obj->adjust_pointers();
+        MarkSweep::adjust_pointers(obj);
       }
     } else {
       // This really ought to be "as_CompactibleSpace"...
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,7 +27,6 @@
 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
 #include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
 
 G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -39,8 +39,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/intHisto.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 #define CARD_REPEAT_HISTO 0
 
 #if CARD_REPEAT_HISTO
@@ -156,9 +154,9 @@
                            "RS names card " SIZE_FORMAT_HEX ": "
                            "[" PTR_FORMAT ", " PTR_FORMAT ")",
                            _worker_i,
-                           card_region->bottom(), card_region->end(),
+                           p2i(card_region->bottom()), p2i(card_region->end()),
                            card_index,
-                           card_start, card_start + G1BlockOffsetSharedArray::N_words);
+                           p2i(card_start), p2i(card_start + G1BlockOffsetSharedArray::N_words));
   }
 
   void scan_strong_code_roots(HeapRegion* r) {
@@ -428,7 +426,7 @@
          err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap",
                  p2i(card_ptr),
                  _ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
-                 _ct_bs->addr_for(card_ptr),
+                 p2i(_ct_bs->addr_for(card_ptr)),
                  _g1->addr_to_region(_ct_bs->addr_for(card_ptr))));
 
   // If the card is no longer dirty, nothing to do.
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -39,8 +39,6 @@
 #include "runtime/atomic.inline.hpp"
 #include "runtime/orderAccess.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 int    HeapRegion::LogOfHRGrainBytes = 0;
 int    HeapRegion::LogOfHRGrainWords = 0;
 size_t HeapRegion::GrainBytes        = 0;
@@ -505,7 +503,7 @@
           gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
                                  "["PTR_FORMAT", "PTR_FORMAT") is above "
                                  "top "PTR_FORMAT,
-                                 (void *)obj, _hr->bottom(), _hr->end(), _hr->top());
+                                 p2i(obj), p2i(_hr->bottom()), p2i(_hr->end()), p2i(_hr->top()));
           _failures = true;
           return;
         }
@@ -540,7 +538,7 @@
       if (!nm->is_alive()) {
         gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
                                PTR_FORMAT" in its strong code roots",
-                               _hr->bottom(), _hr->end(), nm);
+                               p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
         _failures = true;
       } else {
         VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
@@ -549,12 +547,12 @@
           gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
                                  PTR_FORMAT" in its strong code roots "
                                  "with no pointers into region",
-                                 _hr->bottom(), _hr->end(), nm);
+                                 p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
           _failures = true;
         } else if (oop_cl.failures()) {
           gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
                                  "failures for nmethod "PTR_FORMAT,
-                                 _hr->bottom(), _hr->end(), nm);
+                                 p2i(_hr->bottom()), p2i(_hr->end()), p2i(nm));
           _failures = true;
         }
       }
@@ -589,7 +587,7 @@
     if (strong_code_roots_length > 0) {
       gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
                              "but has "SIZE_FORMAT" code root entries",
-                             bottom(), end(), strong_code_roots_length);
+                             p2i(bottom()), p2i(end()), strong_code_roots_length);
       *failures = true;
     }
     return;
@@ -624,7 +622,7 @@
     st->print("   ");
   st->print(" TS %5d", _gc_time_stamp);
   st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT,
-            prev_top_at_mark_start(), next_top_at_mark_start());
+            p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()));
   G1OffsetTableContigSpace::print_on(st);
 }
 
@@ -687,23 +685,23 @@
           gclog_or_tty->print_cr("Field "PTR_FORMAT
                                  " of live obj "PTR_FORMAT" in region "
                                  "["PTR_FORMAT", "PTR_FORMAT")",
-                                 p, (void*) _containing_obj,
-                                 from->bottom(), from->end());
+                                 p2i(p), p2i(_containing_obj),
+                                 p2i(from->bottom()), p2i(from->end()));
           print_object(gclog_or_tty, _containing_obj);
           gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
-                                 (void*) obj);
+                                 p2i(obj));
         } else {
           HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
           HeapRegion* to   = _g1h->heap_region_containing((HeapWord*)obj);
           gclog_or_tty->print_cr("Field "PTR_FORMAT
                                  " of live obj "PTR_FORMAT" in region "
                                  "["PTR_FORMAT", "PTR_FORMAT")",
-                                 p, (void*) _containing_obj,
-                                 from->bottom(), from->end());
+                                 p2i(p), p2i(_containing_obj),
+                                 p2i(from->bottom()), p2i(from->end()));
           print_object(gclog_or_tty, _containing_obj);
           gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
                                  "["PTR_FORMAT", "PTR_FORMAT")",
-                                 (void*) obj, to->bottom(), to->end());
+                                 p2i(obj), p2i(to->bottom()), p2i(to->end()));
           print_object(gclog_or_tty, obj);
         }
         gclog_or_tty->print_cr("----------");
@@ -741,12 +739,12 @@
             gclog_or_tty->print_cr("Field "PTR_FORMAT" "
                                    "of obj "PTR_FORMAT", "
                                    "in region "HR_FORMAT,
-                                   p, (void*) _containing_obj,
+                                   p2i(p), p2i(_containing_obj),
                                    HR_FORMAT_PARAMS(from));
             _containing_obj->print_on(gclog_or_tty);
             gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
                                    "in region "HR_FORMAT,
-                                   (void*) obj,
+                                   p2i(obj),
                                    HR_FORMAT_PARAMS(to));
             obj->print_on(gclog_or_tty);
             gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
@@ -783,7 +781,7 @@
         !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
       gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size ("
                              SIZE_FORMAT" words) in a %shumongous region",
-                             p, g1->is_humongous(obj_size) ? "" : "non-",
+                             p2i(p), g1->is_humongous(obj_size) ? "" : "non-",
                              obj_size, is_region_humongous ? "" : "non-");
        *failures = true;
        return;
@@ -797,12 +795,12 @@
                                    ClassLoaderDataGraph::unload_list_contains(klass));
         if (!is_metaspace_object) {
           gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
-                                 "not metadata", klass, (void *)obj);
+                                 "not metadata", p2i(klass), p2i(obj));
           *failures = true;
           return;
         } else if (!klass->is_klass()) {
           gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
-                                 "not a klass", klass, (void *)obj);
+                                 "not a klass", p2i(klass), p2i(obj));
           *failures = true;
           return;
         } else {
@@ -817,7 +815,7 @@
           }
         }
       } else {
-        gclog_or_tty->print_cr(PTR_FORMAT" no an oop", (void *)obj);
+        gclog_or_tty->print_cr(PTR_FORMAT" no an oop", p2i(obj));
         *failures = true;
         return;
       }
@@ -832,7 +830,7 @@
 
   if (p != top()) {
     gclog_or_tty->print_cr("end of last object "PTR_FORMAT" "
-                           "does not match top "PTR_FORMAT, p, top());
+                           "does not match top "PTR_FORMAT, p2i(p), p2i(top()));
     *failures = true;
     return;
   }
@@ -849,7 +847,7 @@
     if (b_start_1 != p) {
       gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" "
                              " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
-                             addr_1, b_start_1, p);
+                             p2i(addr_1), p2i(b_start_1), p2i(p));
       *failures = true;
       return;
     }
@@ -861,7 +859,7 @@
       if (b_start_2 != p) {
         gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" "
                                " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
-                               addr_2, b_start_2, p);
+                               p2i(addr_2), p2i(b_start_2), p2i(p));
         *failures = true;
         return;
       }
@@ -875,7 +873,7 @@
       if (b_start_3 != p) {
         gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" "
                                " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
-                               addr_3, b_start_3, p);
+                               p2i(addr_3), p2i(b_start_3), p2i(p));
         *failures = true;
         return;
       }
@@ -887,7 +885,7 @@
     if (b_start_4 != p) {
       gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" "
                              " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
-                             addr_4, b_start_4, p);
+                             p2i(addr_4), p2i(b_start_4), p2i(p));
       *failures = true;
       return;
     }
@@ -896,7 +894,7 @@
   if (is_region_humongous && object_num > 1) {
     gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
                            "but has "SIZE_FORMAT", objects",
-                           bottom(), end(), object_num);
+                           p2i(bottom()), p2i(end()), object_num);
     *failures = true;
     return;
   }
@@ -947,7 +945,7 @@
   print_short();
   gclog_or_tty->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", "
                 INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-                bottom(), top(), _offsets.threshold(), end());
+                p2i(bottom()), p2i(top()), p2i(_offsets.threshold()), p2i(end()));
 }
 
 HeapWord* G1OffsetTableContigSpace::initialize_threshold() {
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -37,8 +37,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 class PerRegionTable: public CHeapObj<mtGC> {
   friend class OtherRegionsTable;
   friend class HeapRegionRemSetIterator;
@@ -93,10 +91,10 @@
 
     if (G1TraceHeapRegionRememberedSet) {
       gclog_or_tty->print_cr("    PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").",
-                             from,
+                             p2i(from),
                              UseCompressedOops
-                             ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
-                             : (void *)oopDesc::load_decode_heap_oop((oop*)from));
+                             ? p2i(oopDesc::load_decode_heap_oop((narrowOop*)from))
+                             : p2i(oopDesc::load_decode_heap_oop((oop*)from)));
     }
 
     HeapRegion* loc_hr = hr();
@@ -412,17 +410,17 @@
 
   if (G1TraceHeapRegionRememberedSet) {
     gclog_or_tty->print_cr("ORT::add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
-                                                    from,
+                                                    p2i(from),
                                                     UseCompressedOops
-                                                    ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
-                                                    : (void *)oopDesc::load_decode_heap_oop((oop*)from));
+                                                    ? p2i(oopDesc::load_decode_heap_oop((narrowOop*)from))
+                                                    : p2i(oopDesc::load_decode_heap_oop((oop*)from)));
   }
 
   int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
 
   if (G1TraceHeapRegionRememberedSet) {
     gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = %d)",
-                  _hr->bottom(), from_card,
+                  p2i(_hr->bottom()), from_card,
                   FromCardCache::at(tid, cur_hrm_ind));
   }
 
@@ -471,7 +469,7 @@
                                 "[" PTR_FORMAT "...) for ref " PTR_FORMAT ".\n",
                                 align_size_down(uintptr_t(from),
                                                 CardTableModRefBS::card_size),
-                                _hr->bottom(), from);
+                                p2i(_hr->bottom()), p2i(from));
           }
         }
         if (G1TraceHeapRegionRememberedSet) {
@@ -533,7 +531,7 @@
                           "[" PTR_FORMAT "...) for ref " PTR_FORMAT ".\n",
                           align_size_down(uintptr_t(from),
                                           CardTableModRefBS::card_size),
-                          _hr->bottom(), from);
+                          p2i(_hr->bottom()), p2i(from));
     }
   }
   assert(contains_reference(from), "We just added it!");
@@ -602,8 +600,8 @@
     if (G1TraceHeapRegionRememberedSet) {
       gclog_or_tty->print("Coarsened entry in region [" PTR_FORMAT "...] "
                  "for region [" PTR_FORMAT "...] (" SIZE_FORMAT " coarse entries).\n",
-                 _hr->bottom(),
-                 max->hr()->bottom(),
+                 p2i(_hr->bottom()),
+                 p2i(max->hr()->bottom()),
                  _n_coarse_entries);
     }
   }
@@ -857,7 +855,7 @@
   while (iter.has_next(card_index)) {
     HeapWord* card_start =
       G1CollectedHeap::heap()->bot_shared()->address_for_index(card_index);
-    gclog_or_tty->print_cr("  Card " PTR_FORMAT, card_start);
+    gclog_or_tty->print_cr("  Card " PTR_FORMAT, p2i(card_start));
   }
   if (iter.n_yielded() != occupied()) {
     gclog_or_tty->print_cr("Yielded disagrees with occupied:");
@@ -1152,8 +1150,8 @@
     }
     gclog_or_tty->print("Added card " PTR_FORMAT " to region [" PTR_FORMAT "...]"
                         " for ref " PTR_FORMAT ".\n",
-                        _recorded_cards[i], _recorded_regions[i]->bottom(),
-                        _recorded_oops[i]);
+                        p2i(_recorded_cards[i]), p2i(_recorded_regions[i]->bottom()),
+                        p2i(_recorded_oops[i]));
   }
 }
 
@@ -1240,7 +1238,7 @@
   while (iter.has_next(card_index)) {
     HeapWord* card_start =
       G1CollectedHeap::heap()->bot_shared()->address_for_index(card_index);
-    gclog_or_tty->print_cr("  Card " PTR_FORMAT ".", card_start);
+    gclog_or_tty->print_cr("  Card " PTR_FORMAT ".", p2i(card_start));
     sum++;
   }
   guarantee(sum == 11 - 3 + 2048, "Failure");
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,8 +27,6 @@
 #include "gc_implementation/g1/heapRegionRemSet.hpp"
 #include "gc_implementation/g1/heapRegionSet.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 uint FreeRegionList::_unrealistically_long_length = 0;
 
 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
@@ -84,7 +82,7 @@
 
 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
   out->cr();
-  out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
+  out->print_cr("Set: %s ("PTR_FORMAT")", name(), p2i(this));
   out->print_cr("  Region Assumptions");
   out->print_cr("    humongous         : %s", BOOL_TO_STR(regions_humongous()));
   out->print_cr("    free              : %s", BOOL_TO_STR(regions_free()));
@@ -106,7 +104,7 @@
 }
 
 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
-  msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail);
+  msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, p2i(_head), p2i(_tail));
 }
 
 void FreeRegionList::remove_all() {
@@ -277,8 +275,8 @@
 void FreeRegionList::print_on(outputStream* out, bool print_contents) {
   HeapRegionSetBase::print_on(out, print_contents);
   out->print_cr("  Linking");
-  out->print_cr("    head              : "PTR_FORMAT, _head);
-  out->print_cr("    tail              : "PTR_FORMAT, _tail);
+  out->print_cr("    head              : "PTR_FORMAT, p2i(_head));
+  out->print_cr("    tail              : "PTR_FORMAT, p2i(_tail));
 
   if (print_contents) {
     out->print_cr("  Contents");
@@ -306,7 +304,8 @@
 
     count++;
     guarantee(count < _unrealistically_long_length,
-        hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u", name(), count, curr, prev0, prev1, length()));
+        hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u",
+            name(), count, p2i(curr), p2i(prev0), p2i(prev1), length()));
 
     if (curr->next() != NULL) {
       guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -32,8 +32,6 @@
 #include "runtime/thread.hpp"
 #include "runtime/vmThread.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 void ObjPtrQueue::flush() {
   // The buffer might contain refs into the CSet. We have to filter it
   // first before we flush it, otherwise we might end up with an
@@ -182,7 +180,7 @@
                         void** buf, size_t index, size_t sz) {
   gclog_or_tty->print_cr("  SATB BUFFER [%s] buf: "PTR_FORMAT" "
                          "index: "SIZE_FORMAT" sz: "SIZE_FORMAT,
-                         name, buf, index, sz);
+                         name, p2i(buf), index, sz);
 }
 #endif // PRODUCT
 
--- a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -29,8 +29,6 @@
 #include "gc_implementation/g1/survRateGroup.hpp"
 #include "memory/allocation.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 SurvRateGroup::SurvRateGroup(G1CollectorPolicy* g1p,
                              const char* name,
                              size_t summary_surv_rates_len) :
--- a/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -36,8 +36,6 @@
 #include "runtime/virtualspace.hpp"
 #include "runtime/vmThread.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 void CardTableModRefBS::non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr,
                                                              OopsInGenClosure* cl,
                                                              CardTableRS* ct,
@@ -153,8 +151,7 @@
     // result of the dirty card iteration below.
     OrderAccess::storestore();
 
-    // We do not call the non_clean_card_iterate_serial() version because
-    // we want to clear the cards: clear_cl here does the work of finding
+    // We want to clear the cards: clear_cl here does the work of finding
     // contiguous dirty ranges of cards to process and clear.
     clear_cl.do_MemRegion(chunk_mr);
 
@@ -376,13 +373,14 @@
                          " does not exceed used.end() = " PTR_FORMAT ","
                          " yet last_chunk_index_to_check " INTPTR_FORMAT
                          " exceeds last_chunk_index " INTPTR_FORMAT,
-                         last_block, last_block + last_block_size,
-                         used.end(),
+                         p2i(last_block), p2i(last_block + last_block_size),
+                         p2i(used.end()),
                          last_chunk_index_to_check, last_chunk_index));
           assert(sp->used_region().end() > used.end(),
                  err_msg("Expansion did not happen: "
                          "[" PTR_FORMAT "," PTR_FORMAT ") -> [" PTR_FORMAT "," PTR_FORMAT ")",
-                         sp->used_region().start(), sp->used_region().end(), used.start(), used.end()));
+                         p2i(sp->used_region().start()), p2i(sp->used_region().end()),
+                         p2i(used.start()), p2i(used.end())));
           NOISY(tty->print_cr(" process_chunk_boundary: heap expanded; explicitly bounding last_chunk");)
           last_chunk_index_to_check = last_chunk_index;
         }
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -46,7 +46,6 @@
 #include "memory/space.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/handles.inline.hpp"
@@ -56,8 +55,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/workgroup.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 #ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
@@ -1213,7 +1210,7 @@
   if (TraceScavenge) {
     gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}",
        is_in_reserved(new_obj) ? "copying" : "tenuring",
-       new_obj->klass()->internal_name(), (void *)old, (void *)new_obj, new_obj->size());
+       new_obj->klass()->internal_name(), p2i(old), p2i(new_obj), new_obj->size());
   }
 #endif
 
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -26,12 +26,11 @@
 #include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
 #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
+#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
 #include "gc_implementation/parallelScavenge/psTasks.hpp"
 #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.psgc.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
 
 // Checks an individual oop for missing precise marks. Mark
@@ -291,7 +290,7 @@
             Prefetch::write(p, interval);
             oop m = oop(p);
             assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
-            m->push_contents(pm);
+            pm->push_contents(m);
             p += m->size();
           }
           pm->drain_stacks_cond_depth();
@@ -299,7 +298,7 @@
           while (p < to) {
             oop m = oop(p);
             assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
-            m->push_contents(pm);
+            pm->push_contents(m);
             p += m->size();
           }
           pm->drain_stacks_cond_depth();
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -32,8 +32,6 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 //
 // GCTask
 //
@@ -101,7 +99,7 @@
 NOT_PRODUCT(
 void GCTask::print(const char* message) const {
   tty->print(INTPTR_FORMAT " <- " INTPTR_FORMAT "(%u) -> " INTPTR_FORMAT,
-             newer(), this, affinity(), older());
+             p2i(newer()), p2i(this), affinity(), p2i(older()));
 }
 )
 
@@ -113,7 +111,7 @@
   GCTaskQueue* result = new GCTaskQueue(false);
   if (TraceGCTaskQueue) {
     tty->print_cr("GCTaskQueue::create()"
-                  " returns " INTPTR_FORMAT, result);
+                  " returns " INTPTR_FORMAT, p2i(result));
   }
   return result;
 }
@@ -123,7 +121,7 @@
   if (TraceGCTaskQueue) {
     tty->print_cr("GCTaskQueue::create_on_c_heap()"
                   " returns " INTPTR_FORMAT,
-                  result);
+                  p2i(result));
   }
   return result;
 }
@@ -134,7 +132,7 @@
   if (TraceGCTaskQueue) {
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " GCTaskQueue::GCTaskQueue() constructor",
-                  this);
+                  p2i(this));
   }
 }
 
@@ -147,7 +145,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " GCTaskQueue::destroy()"
                   "  is_c_heap_obj:  %s",
-                  that,
+                  p2i(that),
                   that->is_c_heap_obj() ? "true" : "false");
   }
   // That instance may have been allocated as a CHeapObj,
@@ -173,7 +171,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " GCTaskQueue::enqueue(task: "
                   INTPTR_FORMAT ")",
-                  this, task);
+                  p2i(this), p2i(task));
     print("before:");
   }
   assert(task != NULL, "shouldn't have null task");
@@ -200,7 +198,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " GCTaskQueue::enqueue(list: "
                   INTPTR_FORMAT ")",
-                  this, list);
+                  p2i(this), p2i(list));
     print("before:");
     list->print("list:");
   }
@@ -234,14 +232,14 @@
 GCTask* GCTaskQueue::dequeue() {
   if (TraceGCTaskQueue) {
     tty->print_cr("[" INTPTR_FORMAT "]"
-                  " GCTaskQueue::dequeue()", this);
+                  " GCTaskQueue::dequeue()", p2i(this));
     print("before:");
   }
   assert(!is_empty(), "shouldn't dequeue from empty list");
   GCTask* result = remove();
   assert(result != NULL, "shouldn't have NULL task");
   if (TraceGCTaskQueue) {
-    tty->print_cr("    return: " INTPTR_FORMAT, result);
+    tty->print_cr("    return: " INTPTR_FORMAT, p2i(result));
     print("after:");
   }
   return result;
@@ -251,7 +249,7 @@
 GCTask* GCTaskQueue::dequeue(uint affinity) {
   if (TraceGCTaskQueue) {
     tty->print_cr("[" INTPTR_FORMAT "]"
-                  " GCTaskQueue::dequeue(%u)", this, affinity);
+                  " GCTaskQueue::dequeue(%u)", p2i(this), affinity);
     print("before:");
   }
   assert(!is_empty(), "shouldn't dequeue from empty list");
@@ -275,7 +273,7 @@
     result = remove();
   }
   if (TraceGCTaskQueue) {
-    tty->print_cr("    return: " INTPTR_FORMAT, result);
+    tty->print_cr("    return: " INTPTR_FORMAT, p2i(result));
     print("after:");
   }
   return result;
@@ -345,7 +343,7 @@
                 "  remove_end: " INTPTR_FORMAT
                 "  length:       %d"
                 "  %s",
-                this, insert_end(), remove_end(), length(), message);
+                p2i(this), p2i(insert_end()), p2i(remove_end()), length(), message);
   uint count = 0;
   for (GCTask* element = insert_end();
        element != NULL;
@@ -486,7 +484,7 @@
 
   assert(!all_workers_active() || active_workers() == ParallelGCThreads,
          err_msg("all_workers_active() is  incorrect: "
-                 "active %d  ParallelGCThreads %d", active_workers(),
+                 "active %d  ParallelGCThreads " UINTX_FORMAT, active_workers(),
                  ParallelGCThreads));
   if (TraceDynamicGCThreads) {
     gclog_or_tty->print_cr("GCTaskManager::set_active_gang(): "
@@ -598,7 +596,7 @@
   MutexLockerEx ml(monitor(), Mutex::_no_safepoint_check_flag);
   if (TraceGCTaskManager) {
     tty->print_cr("GCTaskManager::add_task(" INTPTR_FORMAT " [%s])",
-                  task, GCTask::Kind::to_string(task->kind()));
+                  p2i(task), GCTask::Kind::to_string(task->kind()));
   }
   queue()->enqueue(task);
   // Notify with the lock held to avoid missed notifies.
@@ -678,7 +676,7 @@
   assert(result != NULL, "shouldn't have null task");
   if (TraceGCTaskManager) {
     tty->print_cr("GCTaskManager::get_task(%u) => " INTPTR_FORMAT " [%s]",
-                  which, result, GCTask::Kind::to_string(result->kind()));
+                  which, p2i(result), GCTask::Kind::to_string(result->kind()));
     tty->print_cr("     %s", result->name());
   }
   if (!result->is_idle_task()) {
@@ -864,7 +862,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " IdleGCTask:::do_it()"
       "  should_wait: %s",
-      this, wait_for_task->should_wait() ? "true" : "false");
+      p2i(this), wait_for_task->should_wait() ? "true" : "false");
   }
   MutexLockerEx ml(manager->monitor(), Mutex::_no_safepoint_check_flag);
   if (TraceDynamicGCThreads) {
@@ -878,7 +876,7 @@
       tty->print_cr("[" INTPTR_FORMAT "]"
                     " IdleGCTask::do_it()"
         "  [" INTPTR_FORMAT "] (%s)->wait()",
-        this, manager->monitor(), manager->monitor()->name());
+        p2i(this), p2i(manager->monitor()), manager->monitor()->name());
     }
     manager->monitor()->wait(Mutex::_no_safepoint_check_flag, 0);
   }
@@ -890,7 +888,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " IdleGCTask::do_it() returns"
       "  should_wait: %s",
-      this, wait_for_task->should_wait() ? "true" : "false");
+      p2i(this), wait_for_task->should_wait() ? "true" : "false");
   }
   // Release monitor().
 }
@@ -1000,7 +998,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " WaitForBarrierGCTask::WaitForBarrierGCTask()"
                   "  monitor: " INTPTR_FORMAT,
-                  this, monitor());
+                  p2i(this), p2i(monitor()));
   }
 }
 
@@ -1011,9 +1009,9 @@
                     " WaitForBarrierGCTask::destroy()"
                     "  is_c_heap_obj: %s"
                     "  monitor: " INTPTR_FORMAT,
-                    that,
+                    p2i(that),
                     that->is_c_heap_obj() ? "true" : "false",
-                    that->monitor());
+                    p2i(that->monitor()));
     }
     that->destruct();
     if (that->is_c_heap_obj()) {
@@ -1028,7 +1026,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " WaitForBarrierGCTask::destruct()"
                   "  monitor: " INTPTR_FORMAT,
-                  this, monitor());
+                  p2i(this), p2i(monitor()));
   }
   this->BarrierGCTask::destruct();
   // Clean up that should be in the destructor,
@@ -1044,7 +1042,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " WaitForBarrierGCTask::do_it() waiting for idle"
                   "  monitor: " INTPTR_FORMAT,
-                  this, monitor());
+                  p2i(this), p2i(monitor()));
   }
   {
     // First, wait for the barrier to arrive.
@@ -1062,7 +1060,7 @@
       tty->print_cr("[" INTPTR_FORMAT "]"
                     " WaitForBarrierGCTask::do_it()"
                     "  [" INTPTR_FORMAT "] (%s)->notify_all()",
-                    this, monitor(), monitor()->name());
+                    p2i(this), p2i(monitor()), monitor()->name());
     }
     monitor()->notify_all();
     // Release monitor().
@@ -1074,7 +1072,7 @@
     tty->print_cr("[" INTPTR_FORMAT "]"
                   " WaitForBarrierGCTask::wait_for()"
       "  should_wait: %s",
-      this, should_wait() ? "true" : "false");
+      p2i(this), should_wait() ? "true" : "false");
   }
   {
     // Grab the lock and check again.
@@ -1084,7 +1082,7 @@
         tty->print_cr("[" INTPTR_FORMAT "]"
                       " WaitForBarrierGCTask::wait_for()"
           "  [" INTPTR_FORMAT "] (%s)->wait()",
-          this, monitor(), monitor()->name());
+          p2i(this), p2i(monitor()), monitor()->name());
       }
       monitor()->wait(Mutex::_no_safepoint_check_flag, 0);
     }
@@ -1096,7 +1094,7 @@
       tty->print_cr("[" INTPTR_FORMAT "]"
                     " WaitForBarrierGCTask::wait_for() returns"
         "  should_wait: %s",
-        this, should_wait() ? "true" : "false");
+        p2i(this), should_wait() ? "true" : "false");
     }
     // Release monitor().
   }
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -34,8 +34,6 @@
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 GCTaskThread::GCTaskThread(GCTaskManager* manager,
                            uint           which,
                            uint           processor_id) :
@@ -79,7 +77,7 @@
   tty->print_cr("GC-Thread %u entries: %d", id(), _time_stamp_index);
   for(uint i=0; i<_time_stamp_index; i++) {
     GCTaskTimeStamp* time_stamp = time_stamp_at(i);
-    tty->print_cr("\t[ %s " INT64_FORMAT " " INT64_FORMAT " ]",
+    tty->print_cr("\t[ %s " JLONG_FORMAT " " JLONG_FORMAT " ]",
                   time_stamp->name(),
                   time_stamp->entry_time(),
                   time_stamp->exit_time());
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -203,17 +203,6 @@
   return is_in_young((oop)addr);
 }
 
-#ifdef ASSERT
-// Don't implement this by using is_in_young().  This method is used
-// in some cases to check that is_in_young() is correct.
-bool ParallelScavengeHeap::is_in_partial_collection(const void *p) {
-  assert(is_in_reserved(p) || p == NULL,
-    "Does not work if address is non-null and outside of the heap");
-  // The order of the generations is old (low addr), young (high addr)
-  return p >= old_gen()->reserved().end();
-}
-#endif
-
 // There are two levels of allocation policy here.
 //
 // When an allocation request fails, the requesting thread must invoke a VM
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -83,7 +83,7 @@
     MarkSweep
   };
 
-  ParallelScavengeHeap::Name kind() const {
+  virtual Name kind() const {
     return CollectedHeap::ParallelScavengeHeap;
   }
 
@@ -141,10 +141,6 @@
 
   bool is_in_reserved(const void* p) const;
 
-#ifdef ASSERT
-  virtual bool is_in_partial_collection(const void *p);
-#endif
-
   bool is_in_young(oop p);  // reserved part
   bool is_in_old(oop p);    // reserved part
 
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,6 +27,7 @@
 #include "code/codeCache.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
 #include "gc_implementation/parallelScavenge/pcTasks.hpp"
+#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
 #include "gc_implementation/shared/gcTimer.hpp"
 #include "gc_implementation/shared/gcTraceTime.hpp"
@@ -34,7 +35,6 @@
 #include "memory/universe.hpp"
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/jniHandles.hpp"
@@ -42,8 +42,6 @@
 #include "runtime/vmThread.hpp"
 #include "services/management.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 //
 // ThreadRootsMarkingTask
 //
@@ -221,12 +219,11 @@
   int random_seed = 17;
   do {
     while (ParCompactionManager::steal_objarray(which, &random_seed, task)) {
-      ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
-      k->oop_follow_contents(cm, task.obj(), task.index());
+      cm->follow_contents((objArrayOop)task.obj(), task.index());
       cm->follow_marking_stacks();
     }
     while (ParCompactionManager::steal(which, &random_seed, obj)) {
-      obj->follow_contents(cm);
+      cm->follow_contents(obj);
       cm->follow_marking_stacks();
     }
   } while (!terminator()->offer_termination());
@@ -257,7 +254,7 @@
     which_stack_index = which;
     assert(manager->active_workers() == ParallelGCThreads,
            err_msg("all_workers_active has been incorrectly set: "
-                   " active %d  ParallelGCThreads %d", manager->active_workers(),
+                   " active %d  ParallelGCThreads " UINTX_FORMAT, manager->active_workers(),
                    ParallelGCThreads));
   } else {
     which_stack_index = ParCompactionManager::pop_recycled_stack_index();
@@ -269,7 +266,7 @@
     gclog_or_tty->print_cr("StealRegionCompactionTask::do_it "
                            "region_stack_index %d region_stack = " PTR_FORMAT " "
                            " empty (%d) use all workers %d",
-    which_stack_index, ParCompactionManager::region_list(which_stack_index),
+    which_stack_index, p2i(ParCompactionManager::region_list(which_stack_index)),
     cm->region_stack()->is_empty(),
     use_all_workers);
   }
@@ -336,7 +333,7 @@
     which_stack_index = which;
     assert(manager->active_workers() == ParallelGCThreads,
            err_msg("all_workers_active has been incorrectly set: "
-                   " active %d  ParallelGCThreads %d", manager->active_workers(),
+                   " active %d  ParallelGCThreads " UINTX_FORMAT, manager->active_workers(),
                    ParallelGCThreads));
   } else {
     which_stack_index = stack_index();
@@ -370,7 +367,7 @@
       void* old_region_stack = (void*) cm->region_stack();
       int old_region_stack_index = cm->region_stack_index();
       gclog_or_tty->print_cr("Pushing region stack " PTR_FORMAT "/%d",
-        old_region_stack, old_region_stack_index);
+        p2i(old_region_stack), old_region_stack_index);
     }
 
     cm->set_region_stack(NULL);
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -35,8 +35,6 @@
 
 #include <math.h>
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 PSAdaptiveSizePolicy::PSAdaptiveSizePolicy(size_t init_eden_size,
                                            size_t init_promo_size,
                                            size_t init_survivor_size,
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -28,12 +28,11 @@
 #include "gc_implementation/parallelScavenge/objectStartArray.hpp"
 #include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
+#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psOldGen.hpp"
 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
@@ -180,17 +179,16 @@
     // Drain the overflow stack first, to allow stealing from the marking stack.
     oop obj;
     while (marking_stack()->pop_overflow(obj)) {
-      obj->follow_contents(this);
+      follow_contents(obj);
     }
     while (marking_stack()->pop_local(obj)) {
-      obj->follow_contents(this);
+      follow_contents(obj);
     }
 
     // Process ObjArrays one at a time to avoid marking stack bloat.
     ObjArrayTask task;
     if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) {
-      ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
-      k->oop_follow_contents(this, task.obj(), task.index());
+      follow_contents((objArrayOop)task.obj(), task.index());
     }
   } while (!marking_stacks_empty());
 
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -196,6 +196,10 @@
   // Process tasks remaining on any stack
   void drain_region_stacks();
 
+  void follow_contents(oop obj);
+  void follow_contents(objArrayOop array, int index);
+
+  void update_contents(oop obj);
 };
 
 inline ParCompactionManager* ParCompactionManager::manager_array(int index) {
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -27,6 +27,8 @@
 
 #include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
+#include "oops/objArrayKlass.inline.hpp"
+#include "oops/oop.pcgc.inline.hpp"
 
 void ParCompactionManager::push_objarray(oop obj, size_t index)
 {
@@ -46,4 +48,17 @@
   region_stack()->push(index);
 }
 
+inline void ParCompactionManager::follow_contents(oop obj) {
+  obj->follow_contents(this);
+}
+
+inline void ParCompactionManager::follow_contents(objArrayOop obj, int index) {
+  ObjArrayKlass* k = (ObjArrayKlass*)obj->klass();
+  k->oop_follow_contents(this, obj, index);
+}
+
+inline void ParCompactionManager::update_contents(oop obj) {
+  obj->update_contents(this);
+}
+
 #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -54,8 +54,6 @@
 #include "utilities/events.hpp"
 #include "utilities/stack.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 elapsedTimer        PSMarkSweep::_accumulated_time;
 jlong               PSMarkSweep::_time_of_last_gc   = 0;
 CollectorCounters*  PSMarkSweep::_counters = NULL;
@@ -670,7 +668,7 @@
   jlong ret_val = now - _time_of_last_gc;
   // XXX See note in genCollectedHeap::millis_since_last_gc().
   if (ret_val < 0) {
-    NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
+    NOT_PRODUCT(warning("time warp: " JLONG_FORMAT, ret_val);)
     return 0;
   }
   return ret_val;
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -303,7 +303,7 @@
 
     while (q < end) {
       // point all the oops to the new location
-      size_t size = oop(q)->adjust_pointers();
+      size_t size = MarkSweep::adjust_pointers(oop(q));
       q += size;
     }
 
@@ -324,7 +324,7 @@
     if (oop(q)->is_gc_marked()) {
       // q is alive
       // point all the oops to the new location
-      size_t size = oop(q)->adjust_pointers();
+      size_t size = MarkSweep::adjust_pointers(oop(q));
       debug_only(prev_q = q);
       q += size;
     } else {
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -33,8 +33,6 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 inline const char* PSOldGen::select_name() {
   return UseParallelOldGC ? "ParOldGen" : "PSOldGen";
 }
@@ -440,9 +438,9 @@
                 capacity_in_bytes()/K, used_in_bytes()/K);
   }
   st->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-                virtual_space()->low_boundary(),
-                virtual_space()->high(),
-                virtual_space()->high_boundary());
+                p2i(virtual_space()->low_boundary()),
+                p2i(virtual_space()->high()),
+                p2i(virtual_space()->high_boundary()));
 
   st->print("  object"); object_space()->print_on(st);
 }
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -50,7 +50,6 @@
 #include "memory/referenceProcessor.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/safepoint.hpp"
@@ -63,8 +62,6 @@
 
 #include <math.h>
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // All sizes are in HeapWords.
 const size_t ParallelCompactData::Log2RegionSize  = 16; // 64K words
 const size_t ParallelCompactData::RegionSize      = (size_t)1 << Log2RegionSize;
@@ -223,7 +220,7 @@
                 REGION_IDX_FORMAT " " PTR_FORMAT " "
                 REGION_DATA_FORMAT " " REGION_DATA_FORMAT " "
                 REGION_DATA_FORMAT " " REGION_IDX_FORMAT " %d",
-                i, c->data_location(), dci, c->destination(),
+                i, p2i(c->data_location()), dci, p2i(c->destination()),
                 c->partial_obj_size(), c->live_obj_size(),
                 c->data_size(), c->source_region(), c->destination_count());
 
@@ -273,7 +270,7 @@
   tty->print(SIZE_FORMAT_W(5) " " PTR_FORMAT " "
              SIZE_FORMAT_W(5) " " SIZE_FORMAT_W(5) " "
              SIZE_FORMAT_W(5) " " SIZE_FORMAT_W(5) " %d",
-             i, c->destination(),
+             i, p2i(c->destination()),
              c->partial_obj_size(), c->live_obj_size(),
              c->data_size(), c->source_region(), c->destination_count());
   if (newline) tty->cr();
@@ -634,13 +631,13 @@
     const char * split_type = partial_obj_size == 0 ? "easy" : "hard";
     gclog_or_tty->print_cr("%s split:  src=" PTR_FORMAT " src_c=" SIZE_FORMAT
                            " pos=" SIZE_FORMAT,
-                           split_type, source_next, split_region,
+                           split_type, p2i(source_next), split_region,
                            partial_obj_size);
     gclog_or_tty->print_cr("%s split:  dst=" PTR_FORMAT " dst_c=" SIZE_FORMAT
                            " tn=" PTR_FORMAT,
-                           split_type, split_destination,
+                           split_type, p2i(split_destination),
                            addr_to_region_idx(split_destination),
-                           *target_next);
+                           p2i(*target_next));
 
     if (partial_obj_size != 0) {
       HeapWord* const po_beg = split_info.destination();
@@ -649,8 +646,8 @@
                              "po_beg=" PTR_FORMAT " " SIZE_FORMAT " "
                              "po_end=" PTR_FORMAT " " SIZE_FORMAT,
                              split_type,
-                             po_beg, addr_to_region_idx(po_beg),
-                             po_end, addr_to_region_idx(po_end));
+                             p2i(po_beg), addr_to_region_idx(po_beg),
+                             p2i(po_end), addr_to_region_idx(po_end));
     }
   }
 
@@ -667,8 +664,8 @@
     HeapWord* const source_next_val = source_next == NULL ? NULL : *source_next;
     tty->print_cr("sb=" PTR_FORMAT " se=" PTR_FORMAT " sn=" PTR_FORMAT
                   "tb=" PTR_FORMAT " te=" PTR_FORMAT " tn=" PTR_FORMAT,
-                  source_beg, source_end, source_next_val,
-                  target_beg, target_end, *target_next);
+                  p2i(source_beg), p2i(source_end), p2i(source_next_val),
+                  p2i(target_beg), p2i(target_end), p2i(*target_next));
   }
 
   size_t cur_region = addr_to_region_idx(source_beg);
@@ -1133,9 +1130,9 @@
     const size_t cur_deadwood = pointer_delta(dense_prefix, region_destination);
     if (TraceParallelOldGCDensePrefix && Verbose) {
       tty->print_cr("c#=" SIZE_FORMAT_W(4) " dst=" PTR_FORMAT " "
-                    "dp=" SIZE_FORMAT_W(8) " " "cdw=" SIZE_FORMAT_W(8),
-                    sd.region(cp), region_destination,
-                    dense_prefix, cur_deadwood);
+                    "dp=" PTR_FORMAT " " "cdw=" SIZE_FORMAT_W(8),
+                    sd.region(cp), p2i(region_destination),
+                    p2i(dense_prefix), cur_deadwood);
     }
 
     if (cur_deadwood >= deadwood_goal) {
@@ -1201,7 +1198,7 @@
                 "d2l=" SIZE_FORMAT " d2l%%=%6.4f "
                 "d2r=" SIZE_FORMAT " l2r=" SIZE_FORMAT
                 " ratio=%10.8f",
-                algorithm, addr, region_idx,
+                algorithm, p2i(addr), region_idx,
                 space_live,
                 dead_to_left, dead_to_left_pct,
                 dead_to_right, live_to_right,
@@ -1469,7 +1466,7 @@
 {
   if (TraceParallelOldGCSummaryPhase) {
     tty->print_cr("fill_with_live_objects [" PTR_FORMAT " " PTR_FORMAT ") "
-                  SIZE_FORMAT, start, start + words, words);
+                  SIZE_FORMAT, p2i(start), p2i(start + words), words);
   }
 
   ObjectStartArray* const start_array = _space_info[id].start_array();
@@ -1811,9 +1808,9 @@
     tty->print_cr("id=%d cap=" SIZE_FORMAT " dp=" PTR_FORMAT " "
                   "dp_region=" SIZE_FORMAT " " "dp_count=" SIZE_FORMAT " "
                   "cr_count=" SIZE_FORMAT " " "nt=" PTR_FORMAT,
-                  id, space->capacity_in_words(), dense_prefix_end,
+                  id, space->capacity_in_words(), p2i(dense_prefix_end),
                   dp_region, dp_words / region_size,
-                  cr_words / region_size, new_top);
+                  cr_words / region_size, p2i(new_top));
   }
 }
 
@@ -1831,10 +1828,10 @@
                   SIZE_FORMAT "-" SIZE_FORMAT,
                   src_space_id, space_names[src_space_id],
                   dst_space_id, space_names[dst_space_id],
-                  src_beg, src_end,
+                  p2i(src_beg), p2i(src_end),
                   _summary_data.addr_to_region_idx(src_beg),
                   _summary_data.addr_to_region_idx(src_end),
-                  dst_beg, dst_end,
+                  p2i(dst_beg), p2i(dst_end),
                   _summary_data.addr_to_region_idx(dst_beg),
                   _summary_data.addr_to_region_idx(dst_end));
   }
@@ -2234,8 +2231,8 @@
   heap->trace_heap_after_gc(&_gc_tracer);
 
   if (PrintGCTaskTimeStamps) {
-    gclog_or_tty->print_cr("VM-Thread " INT64_FORMAT " " INT64_FORMAT " "
-                           INT64_FORMAT,
+    gclog_or_tty->print_cr("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " "
+                           JLONG_FORMAT,
                            marking_start.ticks(), compaction_start.ticks(),
                            collection_exit.ticks());
     gc_task_manager()->print_task_time_stamps();
@@ -2754,7 +2751,7 @@
     const RegionData* const c = sd.region(cur_region);
     if (!c->completed()) {
       warning("region " SIZE_FORMAT " not filled:  "
-              "destination_count=" SIZE_FORMAT,
+              "destination_count=%u",
               cur_region, c->destination_count());
       issued_a_warning = true;
     }
@@ -2764,7 +2761,7 @@
     const RegionData* const c = sd.region(cur_region);
     if (!c->available()) {
       warning("region " SIZE_FORMAT " not empty:   "
-              "destination_count=" SIZE_FORMAT,
+              "destination_count=%u",
               cur_region, c->destination_count());
       issued_a_warning = true;
     }
@@ -2776,6 +2773,11 @@
 }
 #endif  // #ifdef ASSERT
 
+inline void UpdateOnlyClosure::do_addr(HeapWord* addr) {
+  _start_array->allocate_block(addr);
+  compaction_manager()->update_contents(oop(addr));
+}
+
 // Update interior oops in the ranges of regions [beg_region, end_region).
 void
 PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm,
@@ -2876,7 +2878,7 @@
       if (start_array != NULL) {
         start_array->allocate_block(addr);
       }
-      oop(addr)->update_contents(cm);
+      cm->update_contents(oop(addr));
       assert(oop(addr)->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(oop(addr))));
     }
   }
@@ -3294,7 +3296,7 @@
   jlong ret_val = now - _time_of_last_gc;
   // XXX See note in genCollectedHeap::millis_since_last_gc().
   if (ret_val < 0) {
-    NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
+    NOT_PRODUCT(warning("time warp: " JLONG_FORMAT, ret_val);)
     return 0;
   }
   return ret_val;
@@ -3360,7 +3362,7 @@
   }
 
   oop moved_oop = (oop) destination();
-  moved_oop->update_contents(compaction_manager());
+  compaction_manager()->update_contents(moved_oop);
   assert(moved_oop->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(moved_oop)));
 
   update_state(words);
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1025,9 +1025,6 @@
                             bool maximum_heap_compaction,
                             ParallelOldTracer *gc_tracer);
 
-  template <class T>
-  static inline void follow_root(ParCompactionManager* cm, T* p);
-
   // Compute the dense prefix for the designated space.  This is an experimental
   // implementation currently not used in production.
   static HeapWord* compute_dense_prefix_via_density(const SpaceId id,
@@ -1336,23 +1333,6 @@
 }
 
 template <class T>
-inline void PSParallelCompact::follow_root(ParCompactionManager* cm, T* p) {
-  assert(!Universe::heap()->is_in_reserved(p),
-         "roots shouldn't be things within the heap");
-
-  T heap_oop = oopDesc::load_heap_oop(p);
-  if (!oopDesc::is_null(heap_oop)) {
-    oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-    if (mark_bitmap()->is_unmarked(obj)) {
-      if (mark_obj(obj)) {
-        obj->follow_contents(cm);
-      }
-    }
-  }
-  cm->follow_marking_stacks();
-}
-
-template <class T>
 inline void PSParallelCompact::mark_and_push(ParCompactionManager* cm, T* p) {
   T heap_oop = oopDesc::load_heap_oop(p);
   if (!oopDesc::is_null(heap_oop)) {
@@ -1524,12 +1504,6 @@
   inline void do_addr(HeapWord* addr);
 };
 
-inline void UpdateOnlyClosure::do_addr(HeapWord* addr)
-{
-  _start_array->allocate_block(addr);
-  oop(addr)->update_contents(compaction_manager());
-}
-
 class FillClosure: public ParMarkBitMapClosure
 {
 public:
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -33,11 +33,8 @@
 #include "memory/memRegion.hpp"
 #include "memory/padded.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.psgc.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 PaddedEnd<PSPromotionManager>* PSPromotionManager::_manager_array = NULL;
 OopStarTaskQueueSet*           PSPromotionManager::_stack_array_depth = NULL;
 PSOldGen*                      PSPromotionManager::_old_gen = NULL;
@@ -325,7 +322,7 @@
 
     _promotion_failed_info.register_copy_failure(obj->size());
 
-    obj->push_contents(this);
+    push_contents(obj);
 
     // Save the mark if needed
     PSScavenge::oop_promotion_failed(obj, obj_mark);
@@ -342,7 +339,7 @@
     gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " (%d)}",
                            "promotion-failure",
                            obj->klass()->internal_name(),
-                           (void *)obj, obj->size());
+                           p2i(obj), obj->size());
 
   }
 #endif
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -212,6 +212,8 @@
   template <class T> inline void claim_or_forward_depth(T* p);
 
   TASKQUEUE_STATS_ONLY(inline void record_steal(StarTask& p);)
+
+  void push_contents(oop obj);
 };
 
 #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -91,6 +91,9 @@
   }
 }
 
+inline void PSPromotionManager::push_contents(oop obj) {
+  obj->push_contents(this);
+}
 //
 // This method is pretty bulky. It would be nice to split it up
 // into smaller submethods, but we need to be careful not to hurt
@@ -227,7 +230,7 @@
         TASKQUEUE_STATS_ONLY(++_arrays_chunked; ++_masked_pushes);
       } else {
         // we'll just push its contents
-        new_obj->push_contents(this);
+        push_contents(new_obj);
       }
     }  else {
       // We lost, someone else "owns" this object
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -46,7 +46,6 @@
 #include "memory/referenceProcessor.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.psgc.inline.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/handles.inline.hpp"
@@ -56,8 +55,6 @@
 #include "services/memoryService.hpp"
 #include "utilities/stack.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 HeapWord*                  PSScavenge::_to_space_top_before_gc = NULL;
 int                        PSScavenge::_consecutive_skipped_scavenges = 0;
 ReferenceProcessor*        PSScavenge::_ref_processor = NULL;
@@ -551,8 +548,8 @@
 
        if (PrintTenuringDistribution) {
          gclog_or_tty->cr();
-         gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold "
-                                UINTX_FORMAT " (max threshold " UINTX_FORMAT ")",
+         gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold %u"
+                                " (max threshold " UINTX_FORMAT ")",
                                 size_policy->calculated_survivor_size_in_bytes(),
                                 _tenuring_threshold, MaxTenuringThreshold);
        }
@@ -694,7 +691,7 @@
   scavenge_exit.update();
 
   if (PrintGCTaskTimeStamps) {
-    tty->print_cr("VM-Thread " INT64_FORMAT " " INT64_FORMAT " " INT64_FORMAT,
+    tty->print_cr("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " " JLONG_FORMAT,
                   scavenge_entry.ticks(), scavenge_midpoint.ticks(),
                   scavenge_exit.ticks());
     gc_task_manager()->print_task_time_stamps();
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -35,7 +35,6 @@
 #include "memory/iterator.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
-#include "oops/oop.psgc.inline.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vmThread.hpp"
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,8 +27,6 @@
 #include "runtime/os.hpp"
 #include "runtime/virtualspace.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // PSVirtualSpace
 
 PSVirtualSpace::PSVirtualSpace(ReservedSpace rs, size_t alignment) :
@@ -218,22 +216,22 @@
 void PSVirtualSpace::print() const {
   gclog_or_tty->print_cr("virtual space [" PTR_FORMAT "]:  alignment="
                          SIZE_FORMAT "K grows %s%s",
-                         this, alignment() / K, grows_up() ? "up" : "down",
+                         p2i(this), alignment() / K, grows_up() ? "up" : "down",
                          special() ? " (pinned in memory)" : "");
   gclog_or_tty->print_cr("    reserved=" SIZE_FORMAT "K"
                          " [" PTR_FORMAT "," PTR_FORMAT "]"
                          " committed=" SIZE_FORMAT "K"
                          " [" PTR_FORMAT "," PTR_FORMAT "]",
                          reserved_size() / K,
-                         reserved_low_addr(), reserved_high_addr(),
+                         p2i(reserved_low_addr()), p2i(reserved_high_addr()),
                          committed_size() / K,
-                         committed_low_addr(), committed_high_addr());
+                         p2i(committed_low_addr()), p2i(committed_high_addr()));
 }
 #endif // #ifndef PRODUCT
 
 void PSVirtualSpace::print_space_boundaries_on(outputStream* st) const {
   st->print_cr(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
-               low_boundary(), high(), high_boundary());
+               p2i(low_boundary()), p2i(high()), p2i(high_boundary()));
 }
 
 PSVirtualSpaceHighToLow::PSVirtualSpaceHighToLow(ReservedSpace rs,
@@ -350,5 +348,5 @@
 void
 PSVirtualSpaceHighToLow::print_space_boundaries_on(outputStream* st) const {
   st->print_cr(" (" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT "]",
-               high_boundary(), low(), low_boundary());
+               p2i(high_boundary()), p2i(low()), p2i(low_boundary()));
 }
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -33,8 +33,6 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 PSYoungGen::PSYoungGen(size_t        initial_size,
                        size_t        min_size,
                        size_t        max_size) :
@@ -419,20 +417,22 @@
     // s1
     gclog_or_tty->print_cr("Current region: [" PTR_FORMAT ", " PTR_FORMAT ") "
       "New region: [" PTR_FORMAT ", " PTR_FORMAT ")",
-      s1->bottom(), s1->end(), s1MR.start(), s1MR.end());
+      p2i(s1->bottom()), p2i(s1->end()),
+      p2i(s1MR.start()), p2i(s1MR.end()));
     gclog_or_tty->print_cr("    Mangle before: [" PTR_FORMAT ", "
       PTR_FORMAT ")  Mangle after: [" PTR_FORMAT ", " PTR_FORMAT ")",
-      delta1_left.start(), delta1_left.end(), delta1_right.start(),
-      delta1_right.end());
+      p2i(delta1_left.start()), p2i(delta1_left.end()),
+      p2i(delta1_right.start()), p2i(delta1_right.end()));
 
     // s2
     gclog_or_tty->print_cr("Current region: [" PTR_FORMAT ", " PTR_FORMAT ") "
       "New region: [" PTR_FORMAT ", " PTR_FORMAT ")",
-      s2->bottom(), s2->end(), s2MR.start(), s2MR.end());
+      p2i(s2->bottom()), p2i(s2->end()),
+      p2i(s2MR.start()), p2i(s2MR.end()));
     gclog_or_tty->print_cr("    Mangle before: [" PTR_FORMAT ", "
       PTR_FORMAT ")  Mangle after: [" PTR_FORMAT ", " PTR_FORMAT ")",
-      delta2_left.start(), delta2_left.end(), delta2_right.start(),
-      delta2_right.end());
+      p2i(delta2_left.start()), p2i(delta2_left.end()),
+      p2i(delta2_right.start()), p2i(delta2_right.end()));
   }
 
 }
@@ -456,22 +456,22 @@
                   requested_eden_size, requested_survivor_size);
     gclog_or_tty->print_cr("    eden: [" PTR_FORMAT ".." PTR_FORMAT ") "
                   SIZE_FORMAT,
-                  eden_space()->bottom(),
-                  eden_space()->end(),
+                  p2i(eden_space()->bottom()),
+                  p2i(eden_space()->end()),
                   pointer_delta(eden_space()->end(),
                                 eden_space()->bottom(),
                                 sizeof(char)));
     gclog_or_tty->print_cr("    from: [" PTR_FORMAT ".." PTR_FORMAT ") "
                   SIZE_FORMAT,
-                  from_space()->bottom(),
-                  from_space()->end(),
+                  p2i(from_space()->bottom()),
+                  p2i(from_space()->end()),
                   pointer_delta(from_space()->end(),
                                 from_space()->bottom(),
                                 sizeof(char)));
     gclog_or_tty->print_cr("      to: [" PTR_FORMAT ".." PTR_FORMAT ") "
                   SIZE_FORMAT,
-                  to_space()->bottom(),
-                  to_space()->end(),
+                  p2i(to_space()->bottom()),
+                  p2i(to_space()->end()),
                   pointer_delta(  to_space()->end(),
                                   to_space()->bottom(),
                                   sizeof(char)));
@@ -572,18 +572,18 @@
     if (PrintAdaptiveSizePolicy && Verbose) {
       gclog_or_tty->print_cr("    [eden_start .. eden_end): "
                     "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
-                    eden_start,
-                    eden_end,
+                    p2i(eden_start),
+                    p2i(eden_end),
                     pointer_delta(eden_end, eden_start, sizeof(char)));
       gclog_or_tty->print_cr("    [from_start .. from_end): "
                     "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
-                    from_start,
-                    from_end,
+                    p2i(from_start),
+                    p2i(from_end),
                     pointer_delta(from_end, from_start, sizeof(char)));
       gclog_or_tty->print_cr("    [  to_start ..   to_end): "
                     "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
-                    to_start,
-                    to_end,
+                    p2i(to_start),
+                    p2i(to_end),
                     pointer_delta(  to_end,   to_start, sizeof(char)));
     }
   } else {
@@ -629,18 +629,18 @@
     if (PrintAdaptiveSizePolicy && Verbose) {
       gclog_or_tty->print_cr("    [eden_start .. eden_end): "
                     "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
-                    eden_start,
-                    eden_end,
+                    p2i(eden_start),
+                    p2i(eden_end),
                     pointer_delta(eden_end, eden_start, sizeof(char)));
       gclog_or_tty->print_cr("    [  to_start ..   to_end): "
                     "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
-                    to_start,
-                    to_end,
+                    p2i(to_start),
+                    p2i(to_end),
                     pointer_delta(  to_end,   to_start, sizeof(char)));
       gclog_or_tty->print_cr("    [from_start .. from_end): "
                     "[" PTR_FORMAT " .. " PTR_FORMAT ") " SIZE_FORMAT,
-                    from_start,
-                    from_end,
+                    p2i(from_start),
+                    p2i(from_end),
                     pointer_delta(from_end, from_start, sizeof(char)));
     }
   }
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -32,8 +32,6 @@
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 uint                    MarkSweep::_total_invocations = 0;
 
 Stack<oop, mtGC>              MarkSweep::_marking_stack;
@@ -64,18 +62,22 @@
   MarkSweep::follow_cld_closure.do_cld(cld);
 }
 
+void MarkSweep::follow_array(objArrayOop array, int index) {
+  ObjArrayKlass* k = (ObjArrayKlass*)array->klass();
+  k->oop_follow_contents(array, index);
+}
+
 void MarkSweep::follow_stack() {
   do {
     while (!_marking_stack.is_empty()) {
       oop obj = _marking_stack.pop();
       assert (obj->is_gc_marked(), "p must be marked");
-      obj->follow_contents();
+      follow_object(obj);
     }
     // Process ObjArrays one at a time to avoid marking stack bloat.
     if (!_objarray_stack.is_empty()) {
       ObjArrayTask task = _objarray_stack.pop();
-      ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
-      k->oop_follow_contents(task.obj(), task.index());
+      follow_array(objArrayOop(task.obj()), task.index());
     }
   } while (!_marking_stack.is_empty() || !_objarray_stack.is_empty());
 }
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -160,10 +160,16 @@
 
   static void follow_stack();   // Empty marking stack.
 
+  static void follow_object(oop obj);
+
+  static void follow_array(objArrayOop array, int index);
+
   static void follow_klass(Klass* klass);
 
   static void follow_class_loader(ClassLoaderData* cld);
 
+  static int adjust_pointers(oop obj);
+
   static void preserve_mark(oop p, markOop mark);
                                 // Save the mark word so it can be restored later
   static void adjust_marks();   // Adjust the pointers in the preserved marks table
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -58,6 +58,10 @@
   MarkSweep::mark_and_push(&op);
 }
 
+inline void MarkSweep::follow_object(oop obj) {
+  obj->follow_contents();
+}
+
 template <class T> inline void MarkSweep::follow_root(T* p) {
   assert(!Universe::heap()->is_in_reserved(p),
          "roots shouldn't be things within the heap");
@@ -66,7 +70,7 @@
     oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
     if (!obj->mark()->is_marked()) {
       mark_object(obj);
-      obj->follow_contents();
+      follow_object(obj);
     }
   }
   follow_stack();
@@ -90,6 +94,10 @@
   _objarray_stack.push(task);
 }
 
+inline int MarkSweep::adjust_pointers(oop obj) {
+  return obj->adjust_pointers();
+}
+
 template <class T> inline void MarkSweep::adjust_pointer(T* p) {
   T heap_oop = oopDesc::load_heap_oop(p);
   if (!oopDesc::is_null(heap_oop)) {
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -31,8 +31,6 @@
 #include "runtime/atomic.inline.hpp"
 #include "runtime/thread.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
   _lgrp_spaces = new (ResourceObj::C_HEAP, mtGC) GrowableArray<LGRPSpace*>(0, true);
   _page_size = os::vm_page_size();
@@ -973,7 +971,7 @@
       break;
     }
     if (e != scan_end) {
-      assert(e < scan_end, err_msg("e: " PTR_FORMAT " scan_end: " PTR_FORMAT, e, scan_end));
+      assert(e < scan_end, err_msg("e: " PTR_FORMAT " scan_end: " PTR_FORMAT, p2i(e), p2i(scan_end)));
 
       if ((page_expected.size != page_size || page_expected.lgrp_id != lgrp_id())
           && page_expected.size != 0) {
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -33,8 +33,6 @@
 #include "runtime/thread.hpp"
 #endif // INCLUDE_ALL_GCS
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 MutableSpace::MutableSpace(size_t alignment): ImmutableSpace(), _top(NULL), _alignment(alignment) {
   assert(MutableSpace::alignment() % os::vm_page_size() == 0,
          "Space should be aligned");
@@ -253,7 +251,7 @@
 void MutableSpace::print_on(outputStream* st) const {
   MutableSpace::print_short_on(st);
   st->print_cr(" [" INTPTR_FORMAT "," INTPTR_FORMAT "," INTPTR_FORMAT ")",
-                 bottom(), top(), end());
+                 p2i(bottom()), p2i(top()), p2i(end()));
 }
 
 void MutableSpace::verify() {
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -27,8 +27,6 @@
 #include "memory/space.inline.hpp"
 #include "utilities/copy.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // Catch-all file for utility classes
 
 #ifndef PRODUCT
@@ -86,7 +84,7 @@
   assert(ZapUnusedHeapArea, "Mangling should not be in use");
 #ifdef ASSERT
   if(TraceZapUnusedHeapArea) {
-    gclog_or_tty->print("Mangling [" PTR_FORMAT " to " PTR_FORMAT ")", mr.start(), mr.end());
+    gclog_or_tty->print("Mangling [" PTR_FORMAT " to " PTR_FORMAT ")", p2i(mr.start()), p2i(mr.end()));
   }
   Copy::fill_to_words(mr.start(), mr.word_size(), badHeapWord);
   if(TraceZapUnusedHeapArea) {
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -185,8 +185,6 @@
 
  public:
   enum Name {
-    Abstract,
-    SharedHeap,
     GenCollectedHeap,
     ParallelScavengeHeap,
     G1CollectedHeap
@@ -196,7 +194,7 @@
     return _filler_array_max_size;
   }
 
-  virtual CollectedHeap::Name kind() const { return CollectedHeap::Abstract; }
+  virtual Name kind() const = 0;
 
   /**
    * Returns JNI error code JNI_ENOMEM if memory could not be allocated,
@@ -291,12 +289,6 @@
     return p == NULL || is_in_closed_subset(p);
   }
 
-#ifdef ASSERT
-  // Returns true if "p" is in the part of the
-  // heap being collected.
-  virtual bool is_in_partial_collection(const void *p) = 0;
-#endif
-
   // An object is scavengable if its location may move during a scavenge.
   // (A scavenge is a GC which is not a full GC.)
   virtual bool is_scavengable(const void *p) = 0;
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -470,13 +470,9 @@
       fatal("Parallel gc not supported here.");
 #endif // INCLUDE_ALL_GCS
     } else {
-      // We do not call the non_clean_card_iterate_serial() version below because
-      // we want to clear the cards (which non_clean_card_iterate_serial() does not
-      // do for us): clear_cl here does the work of finding contiguous dirty ranges
-      // of cards to process and clear.
+      // clear_cl finds contiguous dirty ranges of cards to process and clear.
 
-      DirtyCardToOopClosure* dcto_cl = sp->new_dcto_cl(cl, precision(),
-                                                       cl->gen_boundary());
+      DirtyCardToOopClosure* dcto_cl = sp->new_dcto_cl(cl, precision(), cl->gen_boundary());
       ClearNoncleanCardWrapper clear_cl(dcto_cl, ct);
 
       clear_cl.do_MemRegion(mr);
@@ -484,46 +480,6 @@
   }
 }
 
-// The iterator itself is not MT-aware, but
-// MT-aware callers and closures can use this to
-// accomplish dirty card iteration in parallel. The
-// iterator itself does not clear the dirty cards, or
-// change their values in any manner.
-void CardTableModRefBS::non_clean_card_iterate_serial(MemRegion mr,
-                                                      MemRegionClosure* cl) {
-  bool is_par = (SharedHeap::heap()->n_par_threads() > 0);
-  assert(!is_par ||
-          (SharedHeap::heap()->n_par_threads() ==
-          SharedHeap::heap()->workers()->active_workers()), "Mismatch");
-  for (int i = 0; i < _cur_covered_regions; i++) {
-    MemRegion mri = mr.intersection(_covered[i]);
-    if (mri.word_size() > 0) {
-      jbyte* cur_entry = byte_for(mri.last());
-      jbyte* limit = byte_for(mri.start());
-      while (cur_entry >= limit) {
-        jbyte* next_entry = cur_entry - 1;
-        if (*cur_entry != clean_card) {
-          size_t non_clean_cards = 1;
-          // Should the next card be included in this range of dirty cards.
-          while (next_entry >= limit && *next_entry != clean_card) {
-            non_clean_cards++;
-            cur_entry = next_entry;
-            next_entry--;
-          }
-          // The memory region may not be on a card boundary.  So that
-          // objects beyond the end of the region are not processed, make
-          // cur_cards precise with regard to the end of the memory region.
-          MemRegion cur_cards(addr_for(cur_entry),
-                              non_clean_cards * card_size_in_words);
-          MemRegion dirty_region = cur_cards.intersection(mri);
-          cl->do_MemRegion(dirty_region);
-        }
-        cur_entry = next_entry;
-      }
-    }
-  }
-}
-
 void CardTableModRefBS::dirty_MemRegion(MemRegion mr) {
   assert((HeapWord*)align_size_down((uintptr_t)mr.start(), HeapWordSize) == mr.start(), "Unaligned start");
   assert((HeapWord*)align_size_up  ((uintptr_t)mr.end(),   HeapWordSize) == mr.end(),   "Unaligned end"  );
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -37,7 +37,7 @@
 // the head of "o" is dirtied, not necessarily the card containing the
 // modified field itself.  For object arrays, however, the barrier *is*
 // precise; only the card containing the modified element is dirtied.
-// Any MemRegionClosures used to scan dirty cards should take these
+// Closures used to scan dirty cards should take these
 // considerations into account.
 
 class Generation;
@@ -176,16 +176,7 @@
 
   // Iterate over the portion of the card-table which covers the given
   // region mr in the given space and apply cl to any dirty sub-regions
-  // of mr. Dirty cards are _not_ cleared by the iterator method itself,
-  // but closures may arrange to do so on their own should they so wish.
-  void non_clean_card_iterate_serial(MemRegion mr, MemRegionClosure* cl);
-
-  // A variant of the above that will operate in a parallel mode if
-  // worker threads are available, and clear the dirty cards as it
-  // processes them.
-  // XXX ??? MemRegionClosure above vs OopsInGenClosure below XXX
-  // XXX some new_dcto_cl's take OopClosure's, plus as above there are
-  // some MemRegionClosures. Clean this up everywhere. XXX
+  // of mr. Clears the dirty cards as they are processed.
   void non_clean_card_iterate_possibly_parallel(Space* sp, MemRegion mr,
                                                 OopsInGenClosure* cl, CardTableRS* ct);
 
@@ -379,24 +370,6 @@
 
   // *** Card-table-RemSet-specific things.
 
-  // Invoke "cl.do_MemRegion" on a set of MemRegions that collectively
-  // includes all the modified cards (expressing each card as a
-  // MemRegion).  Thus, several modified cards may be lumped into one
-  // region.  The regions are non-overlapping, and are visited in
-  // *decreasing* address order.  (This order aids with imprecise card
-  // marking, where a dirty card may cause scanning, and summarization
-  // marking, of objects that extend onto subsequent cards.)
-  void mod_card_iterate(MemRegionClosure* cl) {
-    non_clean_card_iterate_serial(_whole_heap, cl);
-  }
-
-  // Like the "mod_cards_iterate" above, except only invokes the closure
-  // for cards within the MemRegion "mr" (which is required to be
-  // card-aligned and sized.)
-  void mod_card_iterate(MemRegion mr, MemRegionClosure* cl) {
-    non_clean_card_iterate_serial(mr, cl);
-  }
-
   static uintx ct_max_alignment_constraint();
 
   // Apply closure "cl" to the dirty cards containing some part of
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -190,11 +190,12 @@
     _min_young_size(0),
     _initial_young_size(0),
     _max_young_size(0),
-    _gen_alignment(0),
     _min_old_size(0),
     _initial_old_size(0),
     _max_old_size(0),
-    _generations(NULL)
+    _gen_alignment(0),
+    _young_gen_spec(NULL),
+    _old_gen_spec(NULL)
 {}
 
 size_t GenCollectorPolicy::scale_by_NewRatio_aligned(size_t base_size) {
@@ -912,9 +913,8 @@
 }
 
 void MarkSweepPolicy::initialize_generations() {
-  _generations = NEW_C_HEAP_ARRAY(GenerationSpecPtr, number_of_generations(), mtGC);
-  _generations[0] = new GenerationSpec(Generation::DefNew, _initial_young_size, _max_young_size);
-  _generations[1] = new GenerationSpec(Generation::MarkSweepCompact, _initial_old_size, _max_old_size);
+  _young_gen_spec = new GenerationSpec(Generation::DefNew, _initial_young_size, _max_young_size, _gen_alignment);
+  _old_gen_spec   = new GenerationSpec(Generation::MarkSweepCompact, _initial_old_size, _max_old_size, _gen_alignment);
 }
 
 void MarkSweepPolicy::initialize_gc_policy_counters() {
--- a/hotspot/src/share/vm/memory/collectorPolicy.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/collectorPolicy.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -208,7 +208,8 @@
 };
 
 class GenCollectorPolicy : public CollectorPolicy {
-friend class TestGenCollectorPolicy;
+  friend class TestGenCollectorPolicy;
+  friend class VMStructs;
  protected:
   size_t _min_young_size;
   size_t _initial_young_size;
@@ -221,7 +222,8 @@
   // time. When using large pages they can differ.
   size_t _gen_alignment;
 
-  GenerationSpec **_generations;
+  GenerationSpec* _young_gen_spec;
+  GenerationSpec* _old_gen_spec;
 
   // Return true if an allocation should be attempted in the older generation
   // if it fails in the younger generation.  Return false, otherwise.
@@ -261,9 +263,14 @@
 
   int number_of_generations() { return 2; }
 
-  virtual GenerationSpec **generations() {
-    assert(_generations != NULL, "Sanity check");
-    return _generations;
+  GenerationSpec* young_gen_spec() const {
+    assert(_young_gen_spec != NULL, "_young_gen_spec should have been initialized");
+    return _young_gen_spec;
+  }
+
+  GenerationSpec* old_gen_spec() const {
+    assert(_old_gen_spec != NULL, "_old_gen_spec should have been initialized");
+    return _old_gen_spec;
   }
 
   virtual GenCollectorPolicy* as_generation_policy() { return this; }
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -49,8 +49,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/stack.inline.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 //
 // DefNewGeneration functions.
 
@@ -137,7 +135,7 @@
   if (TraceScavenge) {
     ResourceMark rm;
     gclog_or_tty->print_cr("KlassScanClosure::do_klass " PTR_FORMAT ", %s, dirty: %s",
-                           klass,
+                           p2i(klass),
                            klass->external_name(),
                            klass->has_modified_oops() ? "true" : "false");
   }
@@ -380,7 +378,7 @@
 
   int next_level = level() + 1;
   GenCollectedHeap* gch = GenCollectedHeap::heap();
-  assert(next_level < gch->_n_gens,
+  assert(next_level < gch->n_gens(),
          "DefNewGeneration cannot be an oldest gen");
 
   Generation* old_gen = gch->old_gen();
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -78,7 +78,7 @@
 };
 
 GenCollectedHeap::GenCollectedHeap(GenCollectorPolicy *policy) :
-  SharedHeap(policy),
+  SharedHeap(),
   _rem_set(NULL),
   _gen_policy(policy),
   _process_strong_tasks(new SubTasksDone(GCH_PS_NumElements)),
@@ -90,7 +90,6 @@
 jint GenCollectedHeap::initialize() {
   CollectedHeap::pre_initialize();
 
-  int i;
   _n_gens = gen_policy()->number_of_generations();
   assert(_n_gens == 2, "There is no support for more than two generations");
 
@@ -101,16 +100,6 @@
   // HeapWordSize).
   guarantee(HeapWordSize == wordSize, "HeapWordSize must equal wordSize");
 
-  // The heap must be at least as aligned as generations.
-  size_t gen_alignment = Generation::GenGrain;
-
-  _gen_specs = gen_policy()->generations();
-
-  // Make sure the sizes are all aligned.
-  for (i = 0; i < _n_gens; i++) {
-    _gen_specs[i]->align(gen_alignment);
-  }
-
   // Allocate space for the heap.
 
   char* heap_address;
@@ -133,12 +122,12 @@
 
   _gch = this;
 
-  ReservedSpace young_rs = heap_rs.first_part(_gen_specs[0]->max_size(), false, false);
-  _young_gen = _gen_specs[0]->init(young_rs, 0, rem_set());
-  heap_rs = heap_rs.last_part(_gen_specs[0]->max_size());
+  ReservedSpace young_rs = heap_rs.first_part(gen_policy()->young_gen_spec()->max_size(), false, false);
+  _young_gen = gen_policy()->young_gen_spec()->init(young_rs, 0, rem_set());
+  heap_rs = heap_rs.last_part(gen_policy()->young_gen_spec()->max_size());
 
-  ReservedSpace old_rs = heap_rs.first_part(_gen_specs[1]->max_size(), false, false);
-  _old_gen = _gen_specs[1]->init(old_rs, 1, rem_set());
+  ReservedSpace old_rs = heap_rs.first_part(gen_policy()->old_gen_spec()->max_size(), false, false);
+  _old_gen = gen_policy()->old_gen_spec()->init(old_rs, 1, rem_set());
   clear_incremental_collection_failed();
 
 #if INCLUDE_ALL_GCS
@@ -155,21 +144,18 @@
 
 char* GenCollectedHeap::allocate(size_t alignment,
                                  ReservedSpace* heap_rs){
-  const char overflow_msg[] = "The size of the object heap + VM data exceeds "
-    "the maximum representable size";
-
   // Now figure out the total size.
-  size_t total_reserved = 0;
-  const size_t pageSize = UseLargePages ?
-      os::large_page_size() : os::vm_page_size();
-
+  const size_t pageSize = UseLargePages ? os::large_page_size() : os::vm_page_size();
   assert(alignment % pageSize == 0, "Must be");
 
-  for (int i = 0; i < _n_gens; i++) {
-    total_reserved += _gen_specs[i]->max_size();
-    if (total_reserved < _gen_specs[i]->max_size()) {
-      vm_exit_during_initialization(overflow_msg);
-    }
+  GenerationSpec* young_spec = gen_policy()->young_gen_spec();
+  GenerationSpec* old_spec = gen_policy()->old_gen_spec();
+
+  // Check for overflow.
+  size_t total_reserved = young_spec->max_size() + old_spec->max_size();
+  if (total_reserved < young_spec->max_size()) {
+    vm_exit_during_initialization("The size of the object heap + VM data exceeds "
+                                  "the maximum representable size");
   }
   assert(total_reserved % alignment == 0,
          err_msg("Gen size; total_reserved=" SIZE_FORMAT ", alignment="
@@ -586,7 +572,7 @@
 class AssertNonScavengableClosure: public OopClosure {
 public:
   virtual void do_oop(oop* p) {
-    assert(!Universe::heap()->is_in_partial_collection(*p),
+    assert(!GenCollectedHeap::heap()->is_in_partial_collection(*p),
       "Referent should not be scavengable.");  }
   virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
 };
@@ -603,7 +589,7 @@
   StrongRootsScope srs(this, activate_scope);
 
   // General roots.
-  assert(_strong_roots_parity != 0, "must have called prologue code");
+  assert(Threads::thread_claim_parity() != 0, "must have called prologue code");
   assert(code_roots != NULL, "code root closure should always be set");
   // _n_termination for _process_strong_tasks should be set up stream
   // in a method not running in a GC worker.  Otherwise the GC worker
@@ -1351,7 +1337,7 @@
   // back a time later than 'now'.
   jlong retVal = now - tolgc_cl.time();
   if (retVal < 0) {
-    NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
+    NOT_PRODUCT(warning("time warp: " JLONG_FORMAT, retVal);)
     return 0;
   }
   return retVal;
--- a/hotspot/src/share/vm/memory/genCollectedHeap.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -67,8 +67,6 @@
   Generation* _young_gen;
   Generation* _old_gen;
 
-  GenerationSpec** _gen_specs;
-
   // The singleton Gen Remembered Set.
   GenRemSet* _rem_set;
 
@@ -141,12 +139,12 @@
   // Initialize ("weak") refs processing support
   virtual void ref_processing_init();
 
-  virtual CollectedHeap::Name kind() const {
+  virtual Name kind() const {
     return CollectedHeap::GenCollectedHeap;
   }
 
-  Generation* young_gen() { return _young_gen; }
-  Generation* old_gen()   { return _old_gen; }
+  Generation* young_gen() const { return _young_gen; }
+  Generation* old_gen()   const { return _old_gen; }
 
   // The generational collector policy.
   GenCollectorPolicy* gen_policy() const { return _gen_policy; }
@@ -217,7 +215,7 @@
   bool is_in_young(oop p);
 
 #ifdef ASSERT
-  virtual bool is_in_partial_collection(const void* p);
+  bool is_in_partial_collection(const void* p);
 #endif
 
   virtual bool is_scavengable(const void* addr) {
--- a/hotspot/src/share/vm/memory/generation.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/generation.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -42,8 +42,6 @@
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 Generation::Generation(ReservedSpace rs, size_t initial_size, int level) :
   _level(level),
   _ref_processor(NULL) {
@@ -63,8 +61,8 @@
 
 GenerationSpec* Generation::spec() {
   GenCollectedHeap* gch = GenCollectedHeap::heap();
-  assert(0 <= level() && level() < gch->_n_gens, "Bad gen level");
-  return gch->_gen_specs[level()];
+  assert(level() == 0 || level() == 1, "Bad gen level");
+  return level() == 0 ? gch->gen_policy()->young_gen_spec() : gch->gen_policy()->old_gen_spec();
 }
 
 size_t Generation::max_capacity() const {
@@ -103,9 +101,9 @@
   st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
              capacity()/K, used()/K);
   st->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-              _virtual_space.low_boundary(),
-              _virtual_space.high(),
-              _virtual_space.high_boundary());
+              p2i(_virtual_space.low_boundary()),
+              p2i(_virtual_space.high()),
+              p2i(_virtual_space.high_boundary()));
 }
 
 void Generation::print_summary_info() { print_summary_info_on(tty); }
--- a/hotspot/src/share/vm/memory/generation.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/generation.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -399,7 +399,7 @@
     // have to guard against non-monotonicity.
     NOT_PRODUCT(
       if (now < _time_of_last_gc) {
-        warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
+        warning("time warp: " JLONG_FORMAT " to " JLONG_FORMAT, _time_of_last_gc, now);
       }
     )
     return _time_of_last_gc;
--- a/hotspot/src/share/vm/memory/generationSpec.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/generationSpec.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -39,11 +39,11 @@
   size_t           _max_size;
 
 public:
-  GenerationSpec(Generation::Name name, size_t init_size, size_t max_size) {
-    _name = name;
-    _init_size = init_size;
-    _max_size = max_size;
-  }
+  GenerationSpec(Generation::Name name, size_t init_size, size_t max_size, size_t alignment) :
+    _name(name),
+    _init_size(align_size_up(init_size, alignment)),
+    _max_size(align_size_up(max_size, alignment))
+  { }
 
   Generation* init(ReservedSpace rs, int level, GenRemSet* remset);
 
@@ -53,12 +53,6 @@
   void set_init_size(size_t size)      { _init_size = size; }
   size_t max_size()              const { return _max_size; }
   void set_max_size(size_t size)       { _max_size = size; }
-
-  // Alignment
-  void align(size_t alignment) {
-    set_init_size(align_size_up(init_size(), alignment));
-    set_max_size(align_size_up(max_size(), alignment));
-  }
 };
 
 typedef GenerationSpec* GenerationSpecPtr;
--- a/hotspot/src/share/vm/memory/heapInspection.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/heapInspection.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -38,8 +38,6 @@
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
 #endif // INCLUDE_ALL_GCS
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // HeapInspection
 
 inline KlassInfoEntry::~KlassInfoEntry() {
@@ -100,8 +98,8 @@
 
   // simplify the formatting (ILP32 vs LP64) - always cast the numbers to 64-bit
   st->print_cr(INT64_FORMAT_W(13) "  " UINT64_FORMAT_W(13) "  %s",
-               (jlong)  _instance_count,
-               (julong) _instance_words * HeapWordSize,
+               (int64_t)_instance_count,
+               (uint64_t)_instance_words * HeapWordSize,
                name());
 }
 
@@ -240,8 +238,8 @@
 
 void KlassInfoHisto::print_elements(outputStream* st) const {
   // simplify the formatting (ILP32 vs LP64) - store the sum in 64-bit
-  jlong total = 0;
-  julong totalw = 0;
+  int64_t total = 0;
+  uint64_t totalw = 0;
   for(int i=0; i < elements()->length(); i++) {
     st->print("%4d: ", i+1);
     elements()->at(i)->print_on(st);
@@ -451,7 +449,7 @@
   if (loader_oop == NULL) {
     st->print("null");
   } else {
-    st->print(INTPTR_FORMAT, klass->class_loader_data());
+    st->print(INTPTR_FORMAT, p2i(klass->class_loader_data()));
   }
 }
 
@@ -557,13 +555,13 @@
         }
 
         if (csv_format) {
-          st->print("%d,%d", e->index(), super_index);
+          st->print("%ld,%d", e->index(), super_index);
           for (int c=0; c<KlassSizeStats::_num_columns; c++) {
             if (selected[c]) {st->print("," JULONG_FORMAT, col_table[c]);}
           }
           st->print(",%s",e->name());
         } else {
-          st->print("%5d %5d", e->index(), super_index);
+          st->print("%5ld %5d", e->index(), super_index);
           for (int c=0; c<KlassSizeStats::_num_columns; c++) {
             if (selected[c]) {print_julong(st, width_table[c], col_table[c]);}
           }
--- a/hotspot/src/share/vm/memory/metachunk.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/metachunk.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -28,8 +28,6 @@
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 class VirtualSpaceNode;
 
 const size_t metadata_chunk_initialize = 0xf7f7f7f7;
@@ -92,7 +90,7 @@
   st->print_cr("Metachunk:"
                " bottom " PTR_FORMAT " top " PTR_FORMAT
                " end " PTR_FORMAT " size " SIZE_FORMAT,
-               bottom(), _top, end(), word_size());
+               p2i(bottom()), p2i(_top), p2i(end()), word_size());
   if (Verbose) {
     st->print_cr("    used " SIZE_FORMAT " free " SIZE_FORMAT,
                  used_word_size(), free_word_size());
--- a/hotspot/src/share/vm/memory/metaspace.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -49,8 +49,6 @@
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > BlockTreeDictionary;
 typedef BinaryTreeDictionary<Metachunk, FreeList<Metachunk> > ChunkTreeDictionary;
 
@@ -346,7 +344,7 @@
   void inc_container_count();
   void dec_container_count();
 #ifdef ASSERT
-  uint container_count_slow();
+  uintx container_count_slow();
   void verify_container_count();
 #endif
 
@@ -388,7 +386,7 @@
 #define assert_is_ptr_aligned(ptr, alignment) \
   assert(is_ptr_aligned(ptr, alignment),      \
     err_msg(PTR_FORMAT " is not aligned to "  \
-      SIZE_FORMAT, ptr, alignment))
+      SIZE_FORMAT, p2i(ptr), alignment))
 
 #define assert_is_size_aligned(size, alignment) \
   assert(is_size_aligned(size, alignment),      \
@@ -463,8 +461,8 @@
 }
 
 #ifdef ASSERT
-uint VirtualSpaceNode::container_count_slow() {
-  uint count = 0;
+uintx VirtualSpaceNode::container_count_slow() {
+  uintx count = 0;
   Metachunk* chunk = first_chunk();
   Metachunk* invalid_chunk = (Metachunk*) top();
   while (chunk < invalid_chunk ) {
@@ -798,10 +796,7 @@
 void VirtualSpaceNode::inc_container_count() {
   assert_lock_strong(SpaceManager::expand_lock());
   _container_count++;
-  assert(_container_count == container_count_slow(),
-         err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
-                 " container_count_slow() " SIZE_FORMAT,
-                 _container_count, container_count_slow()));
+  DEBUG_ONLY(verify_container_count();)
 }
 
 void VirtualSpaceNode::dec_container_count() {
@@ -812,8 +807,8 @@
 #ifdef ASSERT
 void VirtualSpaceNode::verify_container_count() {
   assert(_container_count == container_count_slow(),
-    err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
-            " container_count_slow() " SIZE_FORMAT, _container_count, container_count_slow()));
+    err_msg("Inconsistency in container_count _container_count " UINTX_FORMAT
+            " container_count_slow() " UINTX_FORMAT, _container_count, container_count_slow()));
 }
 #endif
 
@@ -916,7 +911,7 @@
 
   if (!is_available(chunk_word_size)) {
     if (TraceMetadataChunkAllocation) {
-      gclog_or_tty->print("VirtualSpaceNode::take_from_committed() not available %d words ", chunk_word_size);
+      gclog_or_tty->print("VirtualSpaceNode::take_from_committed() not available " SIZE_FORMAT " words ", chunk_word_size);
       // Dump some information about the virtual space that is nearly full
       print_on(gclog_or_tty);
     }
@@ -989,7 +984,7 @@
 
     assert(reserved()->start() == (HeapWord*) _rs.base(),
       err_msg("Reserved start was not set properly " PTR_FORMAT
-        " != " PTR_FORMAT, reserved()->start(), _rs.base()));
+        " != " PTR_FORMAT, p2i(reserved()->start()), p2i(_rs.base())));
     assert(reserved()->word_size() == _rs.size() / BytesPerWord,
       err_msg("Reserved size was not set properly " SIZE_FORMAT
         " != " SIZE_FORMAT, reserved()->word_size(),
@@ -1003,13 +998,13 @@
   size_t used = used_words_in_vs();
   size_t capacity = capacity_words_in_vs();
   VirtualSpace* vs = virtual_space();
-  st->print_cr("   space @ " PTR_FORMAT " " SIZE_FORMAT "K, %3d%% used "
+  st->print_cr("   space @ " PTR_FORMAT " " SIZE_FORMAT "K, " SIZE_FORMAT_W(3) "%% used "
            "[" PTR_FORMAT ", " PTR_FORMAT ", "
            PTR_FORMAT ", " PTR_FORMAT ")",
-           vs, capacity / K,
+           p2i(vs), capacity / K,
            capacity == 0 ? 0 : used * 100 / capacity,
-           bottom(), top(), end(),
-           vs->high_boundary());
+           p2i(bottom()), p2i(top()), p2i(end()),
+           p2i(vs->high_boundary()));
 }
 
 #ifdef ASSERT
@@ -1812,7 +1807,7 @@
     if (TraceMetadataChunkAllocation && Verbose) {
       gclog_or_tty->print_cr("ChunkManager::free_chunks_get: free_list "
                              PTR_FORMAT " head " PTR_FORMAT " size " SIZE_FORMAT,
-                             free_list, chunk, chunk->word_size());
+                             p2i(free_list), p2i(chunk), chunk->word_size());
     }
   } else {
     chunk = humongous_dictionary()->get_chunk(
@@ -1872,7 +1867,7 @@
     }
     gclog_or_tty->print("ChunkManager::chunk_freelist_allocate: " PTR_FORMAT " chunk "
                         PTR_FORMAT "  size " SIZE_FORMAT " count " SIZE_FORMAT " ",
-                        this, chunk, chunk->word_size(), list_count);
+                        p2i(this), p2i(chunk), chunk->word_size(), list_count);
     locked_print_free_chunks(gclog_or_tty);
   }
 
@@ -2019,7 +2014,7 @@
   for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
     Metachunk* chunk = chunks_in_use(i);
     st->print("SpaceManager: %s " PTR_FORMAT,
-                 chunk_size_name(i), chunk);
+                 chunk_size_name(i), p2i(chunk));
     if (chunk != NULL) {
       st->print_cr(" free " SIZE_FORMAT,
                    chunk->free_word_size());
@@ -2130,8 +2125,8 @@
   for (ChunkIndex i = ZeroIndex;
        i < NumberOfInUseLists ;
        i = next_chunk_index(i) ) {
-    st->print_cr("  chunks_in_use " PTR_FORMAT " chunk size " PTR_FORMAT,
-                 chunks_in_use(i),
+    st->print_cr("  chunks_in_use " PTR_FORMAT " chunk size " SIZE_FORMAT,
+                 p2i(chunks_in_use(i)),
                  chunks_in_use(i) == NULL ? 0 : chunks_in_use(i)->word_size());
   }
   st->print_cr("    waste:  Small " SIZE_FORMAT " Medium " SIZE_FORMAT
@@ -2194,7 +2189,7 @@
   }
   _current_chunk = NULL;
   if (TraceMetadataChunkAllocation && Verbose) {
-    gclog_or_tty->print_cr("SpaceManager(): " PTR_FORMAT, this);
+    gclog_or_tty->print_cr("SpaceManager(): " PTR_FORMAT, p2i(this));
   }
 }
 
@@ -2238,7 +2233,7 @@
   dec_total_from_size_metrics();
 
   if (TraceMetadataChunkAllocation && Verbose) {
-    gclog_or_tty->print_cr("~SpaceManager(): " PTR_FORMAT, this);
+    gclog_or_tty->print_cr("~SpaceManager(): " PTR_FORMAT, p2i(this));
     locked_print_chunks_in_use_on(gclog_or_tty);
   }
 
@@ -2258,7 +2253,7 @@
 
   for (ChunkIndex i = ZeroIndex; i < HumongousIndex; i = next_chunk_index(i)) {
     if (TraceMetadataChunkAllocation && Verbose) {
-      gclog_or_tty->print_cr("returned %d %s chunks to freelist",
+      gclog_or_tty->print_cr("returned " SIZE_FORMAT " %s chunks to freelist",
                              sum_count_in_chunks_in_use(i),
                              chunk_size_name(i));
     }
@@ -2266,7 +2261,7 @@
     chunk_manager()->return_chunks(i, chunks);
     set_chunks_in_use(i, NULL);
     if (TraceMetadataChunkAllocation && Verbose) {
-      gclog_or_tty->print_cr("updated freelist count %d %s",
+      gclog_or_tty->print_cr("updated freelist count " SSIZE_FORMAT " %s",
                              chunk_manager()->free_chunks(i)->count(),
                              chunk_size_name(i));
     }
@@ -2279,7 +2274,7 @@
 
   // Humongous chunks
   if (TraceMetadataChunkAllocation && Verbose) {
-    gclog_or_tty->print_cr("returned %d %s humongous chunks to dictionary",
+    gclog_or_tty->print_cr("returned " SIZE_FORMAT " %s humongous chunks to dictionary",
                             sum_count_in_chunks_in_use(HumongousIndex),
                             chunk_size_name(HumongousIndex));
     gclog_or_tty->print("Humongous chunk dictionary: ");
@@ -2293,14 +2288,14 @@
 #endif
     if (TraceMetadataChunkAllocation && Verbose) {
       gclog_or_tty->print(PTR_FORMAT " (" SIZE_FORMAT ") ",
-                          humongous_chunks,
+                          p2i(humongous_chunks),
                           humongous_chunks->word_size());
     }
     assert(humongous_chunks->word_size() == (size_t)
            align_size_up(humongous_chunks->word_size(),
                              smallest_chunk_size()),
            err_msg("Humongous chunk size is wrong: word size " SIZE_FORMAT
-                   " granularity %d",
+                   " granularity " SIZE_FORMAT,
                    humongous_chunks->word_size(), smallest_chunk_size()));
     Metachunk* next_humongous_chunks = humongous_chunks->next();
     humongous_chunks->container()->dec_container_count();
@@ -2309,7 +2304,7 @@
   }
   if (TraceMetadataChunkAllocation && Verbose) {
     gclog_or_tty->cr();
-    gclog_or_tty->print_cr("updated dictionary count %d %s",
+    gclog_or_tty->print_cr("updated dictionary count " SIZE_FORMAT " %s",
                      chunk_manager()->humongous_dictionary()->total_count(),
                      chunk_size_name(HumongousIndex));
   }
@@ -2399,7 +2394,7 @@
 
   assert(new_chunk->is_empty(), "Not ready for reuse");
   if (TraceMetadataChunkAllocation && Verbose) {
-    gclog_or_tty->print("SpaceManager::add_chunk: %d) ",
+    gclog_or_tty->print("SpaceManager::add_chunk: " SIZE_FORMAT ") ",
                         sum_count_in_chunks_in_use());
     new_chunk->print_on(gclog_or_tty);
     chunk_manager()->locked_print_free_chunks(gclog_or_tty);
@@ -3097,7 +3092,7 @@
       metaspace_rs = ReservedSpace(compressed_class_space_size(),
                                    _reserve_alignment, large_pages);
       if (!metaspace_rs.is_reserved()) {
-        vm_exit_during_initialization(err_msg("Could not allocate metaspace: %d bytes",
+        vm_exit_during_initialization(err_msg("Could not allocate metaspace: " SIZE_FORMAT " bytes",
                                               compressed_class_space_size()));
       }
     }
@@ -3119,10 +3114,10 @@
   initialize_class_space(metaspace_rs);
 
   if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) {
-    gclog_or_tty->print_cr("Narrow klass base: " PTR_FORMAT ", Narrow klass shift: " SIZE_FORMAT,
-                            Universe::narrow_klass_base(), Universe::narrow_klass_shift());
+    gclog_or_tty->print_cr("Narrow klass base: " PTR_FORMAT ", Narrow klass shift: %d",
+                            p2i(Universe::narrow_klass_base()), Universe::narrow_klass_shift());
     gclog_or_tty->print_cr("Compressed class space size: " SIZE_FORMAT " Address: " PTR_FORMAT " Req Addr: " PTR_FORMAT,
-                           compressed_class_space_size(), metaspace_rs.base(), requested_addr);
+                           compressed_class_space_size(), p2i(metaspace_rs.base()), p2i(requested_addr));
   }
 }
 
@@ -3251,7 +3246,7 @@
       vm_exit_during_initialization("Unable to dump shared archive.",
           err_msg("Size of archive (" SIZE_FORMAT ") + compressed class space ("
                   SIZE_FORMAT ") == total (" SIZE_FORMAT ") is larger than compressed "
-                  "klass limit: " SIZE_FORMAT, cds_total, compressed_class_space_size(),
+                  "klass limit: " UINT64_FORMAT, cds_total, compressed_class_space_size(),
                   cds_total + compressed_class_space_size(), UnscaledClassSpaceMax));
     }
 
@@ -3262,7 +3257,7 @@
     Universe::set_narrow_klass_base((address)_space_list->current_virtual_space()->bottom());
     if (TraceMetavirtualspaceAllocation && Verbose) {
       gclog_or_tty->print_cr("Setting_narrow_klass_base to Address: " PTR_FORMAT,
-                             _space_list->current_virtual_space()->bottom());
+                             p2i(_space_list->current_virtual_space()->bottom()));
     }
 
     Universe::set_narrow_klass_shift(0);
@@ -3768,10 +3763,10 @@
 }
 
 void Metaspace::dump(outputStream* const out) const {
-  out->print_cr("\nVirtual space manager: " INTPTR_FORMAT, vsm());
+  out->print_cr("\nVirtual space manager: " INTPTR_FORMAT, p2i(vsm()));
   vsm()->dump(out);
   if (using_class_space()) {
-    out->print_cr("\nClass space manager: " INTPTR_FORMAT, class_vsm());
+    out->print_cr("\nClass space manager: " INTPTR_FORMAT, p2i(class_vsm()));
     class_vsm()->dump(out);
   }
 }
@@ -3932,13 +3927,13 @@
   assert(vsn.is_available(word_size), \
     err_msg(#word_size ": " PTR_FORMAT " bytes were not available in " \
             "VirtualSpaceNode [" PTR_FORMAT ", " PTR_FORMAT ")", \
-            (uintptr_t)(word_size * BytesPerWord), vsn.bottom(), vsn.end()));
+            (uintptr_t)(word_size * BytesPerWord), p2i(vsn.bottom()), p2i(vsn.end())));
 
 #define assert_is_available_negative(word_size) \
   assert(!vsn.is_available(word_size), \
     err_msg(#word_size ": " PTR_FORMAT " bytes should not be available in " \
             "VirtualSpaceNode [" PTR_FORMAT ", " PTR_FORMAT ")", \
-            (uintptr_t)(word_size * BytesPerWord), vsn.bottom(), vsn.end()));
+            (uintptr_t)(word_size * BytesPerWord), p2i(vsn.bottom()), p2i(vsn.end())));
 
   static void test_is_available_positive() {
     // Reserve some memory.
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/referenceProcessor.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -35,8 +35,6 @@
 #include "runtime/java.hpp"
 #include "runtime/jniHandles.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 ReferencePolicy* ReferenceProcessor::_always_clear_soft_ref_policy = NULL;
 ReferencePolicy* ReferenceProcessor::_default_soft_ref_policy      = NULL;
 bool             ReferenceProcessor::_pending_list_uses_discovered_field = false;
@@ -161,7 +159,7 @@
 
   NOT_PRODUCT(
   if (now < _soft_ref_timestamp_clock) {
-    warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
+    warning("time warp: " JLONG_FORMAT " to " JLONG_FORMAT,
             _soft_ref_timestamp_clock, now);
   }
   )
@@ -361,7 +359,7 @@
   // field.
   if (TraceReferenceGC && PrintGCDetails) {
     gclog_or_tty->print_cr("ReferenceProcessor::enqueue_discovered_reflist list "
-                           INTPTR_FORMAT, (address)refs_list.head());
+                           INTPTR_FORMAT, p2i(refs_list.head()));
   }
 
   oop obj = NULL;
@@ -375,7 +373,7 @@
       next_d = java_lang_ref_Reference::discovered(obj);
       if (TraceReferenceGC && PrintGCDetails) {
         gclog_or_tty->print_cr("        obj " INTPTR_FORMAT "/next_d " INTPTR_FORMAT,
-                               (void *)obj, (void *)next_d);
+                               p2i(obj), p2i(next_d));
       }
       assert(java_lang_ref_Reference::next(obj) == NULL,
              "Reference not active; should not be discovered");
@@ -402,7 +400,7 @@
       next_d = java_lang_ref_Reference::discovered(obj);
       if (TraceReferenceGC && PrintGCDetails) {
         gclog_or_tty->print_cr("        obj " INTPTR_FORMAT "/next_d " INTPTR_FORMAT,
-                               (void *)obj, (void *)next_d);
+                               p2i(obj), p2i(next_d));
       }
       assert(java_lang_ref_Reference::next(obj) == NULL,
              "The reference should not be enqueued");
@@ -565,7 +563,7 @@
         !policy->should_clear_reference(iter.obj(), _soft_ref_timestamp_clock)) {
       if (TraceReferenceGC) {
         gclog_or_tty->print_cr("Dropping reference (" INTPTR_FORMAT ": %s"  ") by policy",
-                               (void *)iter.obj(), iter.obj()->klass()->internal_name());
+                               p2i(iter.obj()), iter.obj()->klass()->internal_name());
       }
       // Remove Reference object from list
       iter.remove();
@@ -582,9 +580,9 @@
   complete_gc->do_void();
   NOT_PRODUCT(
     if (PrintGCDetails && TraceReferenceGC) {
-      gclog_or_tty->print_cr(" Dropped %d dead Refs out of %d "
-        "discovered Refs by policy, from list " INTPTR_FORMAT,
-        iter.removed(), iter.processed(), (address)refs_list.head());
+      gclog_or_tty->print_cr(" Dropped " SIZE_FORMAT " dead Refs out of " SIZE_FORMAT
+        " discovered Refs by policy, from list " INTPTR_FORMAT,
+        iter.removed(), iter.processed(), p2i(refs_list.head()));
     }
   )
 }
@@ -604,7 +602,7 @@
     if (iter.is_referent_alive()) {
       if (TraceReferenceGC) {
         gclog_or_tty->print_cr("Dropping strongly reachable reference (" INTPTR_FORMAT ": %s)",
-                               (void *)iter.obj(), iter.obj()->klass()->internal_name());
+                               p2i(iter.obj()), iter.obj()->klass()->internal_name());
       }
       // The referent is reachable after all.
       // Remove Reference object from list.
@@ -620,9 +618,9 @@
   }
   NOT_PRODUCT(
     if (PrintGCDetails && TraceReferenceGC && (iter.processed() > 0)) {
-      gclog_or_tty->print_cr(" Dropped %d active Refs out of %d "
-        "Refs in discovered list " INTPTR_FORMAT,
-        iter.removed(), iter.processed(), (address)refs_list.head());
+      gclog_or_tty->print_cr(" Dropped " SIZE_FORMAT " active Refs out of " SIZE_FORMAT
+        " Refs in discovered list " INTPTR_FORMAT,
+        iter.removed(), iter.processed(), p2i(refs_list.head()));
     }
   )
 }
@@ -659,9 +657,9 @@
   complete_gc->do_void();
   NOT_PRODUCT(
     if (PrintGCDetails && TraceReferenceGC && (iter.processed() > 0)) {
-      gclog_or_tty->print_cr(" Dropped %d active Refs out of %d "
-        "Refs in discovered list " INTPTR_FORMAT,
-        iter.removed(), iter.processed(), (address)refs_list.head());
+      gclog_or_tty->print_cr(" Dropped " SIZE_FORMAT " active Refs out of " SIZE_FORMAT
+        " Refs in discovered list " INTPTR_FORMAT,
+        iter.removed(), iter.processed(), p2i(refs_list.head()));
     }
   )
 }
@@ -678,7 +676,6 @@
   ResourceMark rm;
   DiscoveredListIterator iter(refs_list, keep_alive, is_alive);
   while (iter.has_next()) {
-    iter.update_discovered();
     iter.load_ptrs(DEBUG_ONLY(false /* allow_null_referent */));
     if (clear_referent) {
       // NULL out referent pointer
@@ -690,13 +687,11 @@
     if (TraceReferenceGC) {
       gclog_or_tty->print_cr("Adding %sreference (" INTPTR_FORMAT ": %s) as pending",
                              clear_referent ? "cleared " : "",
-                             (void *)iter.obj(), iter.obj()->klass()->internal_name());
+                             p2i(iter.obj()), iter.obj()->klass()->internal_name());
     }
     assert(iter.obj()->is_oop(UseConcMarkSweepGC), "Adding a bad reference");
     iter.next();
   }
-  // Remember to update the next pointer of the last ref.
-  iter.update_discovered();
   // Close the reachable set
   complete_gc->do_void();
 }
@@ -807,11 +802,11 @@
   for (uint i = 0; i < _max_num_q; ++i) {
     total_refs += ref_lists[i].length();
     if (TraceReferenceGC && PrintGCDetails) {
-      gclog_or_tty->print("%d ", ref_lists[i].length());
+      gclog_or_tty->print(SIZE_FORMAT " ", ref_lists[i].length());
     }
   }
   if (TraceReferenceGC && PrintGCDetails) {
-    gclog_or_tty->print_cr(" = %d", total_refs);
+    gclog_or_tty->print_cr(" = " SIZE_FORMAT, total_refs);
   }
   size_t avg_refs = total_refs / _num_q + 1;
   uint to_idx = 0;
@@ -877,11 +872,11 @@
   for (uint i = 0; i < _max_num_q; ++i) {
     balanced_total_refs += ref_lists[i].length();
     if (TraceReferenceGC && PrintGCDetails) {
-      gclog_or_tty->print("%d ", ref_lists[i].length());
+      gclog_or_tty->print(SIZE_FORMAT " ", ref_lists[i].length());
     }
   }
   if (TraceReferenceGC && PrintGCDetails) {
-    gclog_or_tty->print_cr(" = %d", balanced_total_refs);
+    gclog_or_tty->print_cr(" = " SIZE_FORMAT, balanced_total_refs);
     gclog_or_tty->flush();
   }
   assert(total_refs == balanced_total_refs, "Balancing was incomplete");
@@ -923,7 +918,7 @@
   size_t total_list_count = total_count(refs_lists);
 
   if (PrintReferenceGC && PrintGCDetails) {
-    gclog_or_tty->print(", %u refs", total_list_count);
+    gclog_or_tty->print(", " SIZE_FORMAT " refs", total_list_count);
   }
 
   // Phase 1 (soft refs only):
@@ -1016,7 +1011,7 @@
       ShouldNotReachHere();
   }
   if (TraceReferenceGC && PrintGCDetails) {
-    gclog_or_tty->print_cr("Thread %d gets list " INTPTR_FORMAT, id, list);
+    gclog_or_tty->print_cr("Thread %d gets list " INTPTR_FORMAT, id, p2i(list));
   }
   return list;
 }
@@ -1043,14 +1038,14 @@
 
     if (TraceReferenceGC) {
       gclog_or_tty->print_cr("Discovered reference (mt) (" INTPTR_FORMAT ": %s)",
-                             (void *)obj, obj->klass()->internal_name());
+                             p2i(obj), obj->klass()->internal_name());
     }
   } else {
     // If retest was non NULL, another thread beat us to it:
     // The reference has already been discovered...
     if (TraceReferenceGC) {
       gclog_or_tty->print_cr("Already discovered reference (" INTPTR_FORMAT ": %s)",
-                             (void *)obj, obj->klass()->internal_name());
+                             p2i(obj), obj->klass()->internal_name());
     }
   }
 }
@@ -1065,7 +1060,7 @@
   assert(da ? referent->is_oop() : referent->is_oop_or_null(),
          err_msg("Bad referent " INTPTR_FORMAT " found in Reference "
                  INTPTR_FORMAT " during %satomic discovery ",
-                 (void *)referent, (void *)obj, da ? "" : "non-"));
+                 p2i(referent), p2i(obj), da ? "" : "non-"));
 }
 #endif
 
@@ -1145,7 +1140,7 @@
     // The reference has already been discovered...
     if (TraceReferenceGC) {
       gclog_or_tty->print_cr("Already discovered reference (" INTPTR_FORMAT ": %s)",
-                             (void *)obj, obj->klass()->internal_name());
+                             p2i(obj), obj->klass()->internal_name());
     }
     if (RefDiscoveryPolicy == ReferentBasedDiscovery) {
       // assumes that an object is not processed twice;
@@ -1203,7 +1198,7 @@
 
     if (TraceReferenceGC) {
       gclog_or_tty->print_cr("Discovered reference (" INTPTR_FORMAT ": %s)",
-                                (void *)obj, obj->klass()->internal_name());
+                                p2i(obj), obj->klass()->internal_name());
     }
   }
   assert(obj->is_oop(), "Discovered a bad reference");
@@ -1314,7 +1309,7 @@
       // active; we need to trace and mark its cohort.
       if (TraceReferenceGC) {
         gclog_or_tty->print_cr("Precleaning Reference (" INTPTR_FORMAT ": %s)",
-                               (void *)iter.obj(), iter.obj()->klass()->internal_name());
+                               p2i(iter.obj()), iter.obj()->klass()->internal_name());
       }
       // Remove Reference object from list
       iter.remove();
@@ -1337,9 +1332,9 @@
 
   NOT_PRODUCT(
     if (PrintGCDetails && PrintReferenceGC && (iter.processed() > 0)) {
-      gclog_or_tty->print_cr(" Dropped %d Refs out of %d "
-        "Refs in discovered list " INTPTR_FORMAT,
-        iter.removed(), iter.processed(), (address)refs_list.head());
+      gclog_or_tty->print_cr(" Dropped " SIZE_FORMAT " Refs out of " SIZE_FORMAT
+        " Refs in discovered list " INTPTR_FORMAT,
+        iter.removed(), iter.processed(), p2i(refs_list.head()));
     }
   )
 }
--- a/hotspot/src/share/vm/memory/referenceProcessor.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/referenceProcessor.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -173,20 +173,6 @@
     }
   }
 
-  // Update the discovered field.
-  inline void update_discovered() {
-    // First _prev_next ref actually points into DiscoveredList (gross).
-    if (UseCompressedOops) {
-      if (!oopDesc::is_null(*(narrowOop*)_prev_next)) {
-        _keep_alive->do_oop((narrowOop*)_prev_next);
-      }
-    } else {
-      if (!oopDesc::is_null(*(oop*)_prev_next)) {
-        _keep_alive->do_oop((oop*)_prev_next);
-      }
-    }
-  }
-
   // NULL out referent pointer.
   void clear_referent();
 
--- a/hotspot/src/share/vm/memory/sharedHeap.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/sharedHeap.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -35,14 +35,10 @@
 #include "utilities/copy.hpp"
 #include "utilities/workgroup.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 SharedHeap* SharedHeap::_sh;
 
-SharedHeap::SharedHeap(CollectorPolicy* policy_) :
+SharedHeap::SharedHeap() :
   CollectedHeap(),
-  _collector_policy(policy_),
-  _strong_roots_parity(0),
   _workers(NULL)
 {
   _sh = this;  // ch is static, should be set only once.
@@ -70,26 +66,20 @@
   _n_par_threads = t;
 }
 
-void SharedHeap::change_strong_roots_parity() {
-  // Also set the new collection parity.
-  assert(_strong_roots_parity >= 0 && _strong_roots_parity <= 2,
-         "Not in range.");
-  _strong_roots_parity++;
-  if (_strong_roots_parity == 3) _strong_roots_parity = 1;
-  assert(_strong_roots_parity >= 1 && _strong_roots_parity <= 2,
-         "Not in range.");
-}
-
 SharedHeap::StrongRootsScope::StrongRootsScope(SharedHeap* heap, bool activate)
   : MarkScope(activate), _sh(heap)
 {
   if (_active) {
-    _sh->change_strong_roots_parity();
+    Threads::change_thread_claim_parity();
     // Zero the claimed high water mark in the StringTable
     StringTable::clear_parallel_claimed_index();
   }
 }
 
+SharedHeap::StrongRootsScope::~StrongRootsScope() {
+  Threads::assert_all_threads_claimed();
+}
+
 void SharedHeap::set_barrier_set(BarrierSet* bs) {
   _barrier_set = bs;
   // Cached barrier set for fast access in oops
@@ -102,17 +92,3 @@
 }
 
 void SharedHeap::ref_processing_init() {}
-
-// Some utilities.
-void SharedHeap::print_size_transition(outputStream* out,
-                                       size_t bytes_before,
-                                       size_t bytes_after,
-                                       size_t capacity) {
-  out->print(" " SIZE_FORMAT "%s->" SIZE_FORMAT "%s(" SIZE_FORMAT "%s)",
-             byte_size_in_proper_unit(bytes_before),
-             proper_unit_for_byte_size(bytes_before),
-             byte_size_in_proper_unit(bytes_after),
-             proper_unit_for_byte_size(bytes_after),
-             byte_size_in_proper_unit(capacity),
-             proper_unit_for_byte_size(capacity));
-}
--- a/hotspot/src/share/vm/memory/sharedHeap.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/sharedHeap.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -110,19 +110,12 @@
   // set the static pointer "_sh" to that instance.
   static SharedHeap* _sh;
 
-  // A gc policy, controls global gc resource issues
-  CollectorPolicy *_collector_policy;
-
-  // See the discussion below, in the specification of the reader function
-  // for this variable.
-  int _strong_roots_parity;
-
   // If we're doing parallel GC, use this gang of threads.
   FlexibleWorkGang* _workers;
 
   // Full initialization is done in a concrete subtype's "initialize"
   // function.
-  SharedHeap(CollectorPolicy* policy_);
+  SharedHeap();
 
   // Returns true if the calling thread holds the heap lock,
   // or the calling thread is a par gc thread and the heap_lock is held
@@ -156,7 +149,10 @@
 
   bool no_gc_in_progress() { return !is_gc_active(); }
 
-  // Some collectors will perform "process_strong_roots" in parallel.
+  // Note, the below comment needs to be updated to reflect the changes
+  // introduced by JDK-8076225. This should be done as part of JDK-8076289.
+  //
+  //Some collectors will perform "process_strong_roots" in parallel.
   // Such a call will involve claiming some fine-grained tasks, such as
   // scanning of threads.  To make this process simpler, we provide the
   // "strong_roots_parity()" method.  Collectors that start parallel tasks
@@ -182,7 +178,6 @@
   //      task-claiming variables may be initialized, to indicate "never
   //      claimed".
  public:
-  int strong_roots_parity() { return _strong_roots_parity; }
 
   // Call these in sequential code around process_roots.
   // strong_roots_prologue calls change_strong_roots_parity, if
@@ -192,11 +187,10 @@
 
    public:
     StrongRootsScope(SharedHeap* heap, bool activate = true);
+    ~StrongRootsScope();
   };
-  friend class StrongRootsScope;
 
  private:
-  void change_strong_roots_parity();
 
  public:
   FlexibleWorkGang* workers() const { return _workers; }
@@ -214,16 +208,6 @@
   // Sets the number of parallel threads that will be doing tasks
   // (such as process roots) subsequently.
   virtual void set_par_threads(uint t);
-
-  //
-  // New methods from CollectedHeap
-  //
-
-  // Some utilities.
-  void print_size_transition(outputStream* out,
-                             size_t bytes_before,
-                             size_t bytes_after,
-                             size_t capacity);
 };
 
 #endif // SHARE_VM_MEMORY_SHAREDHEAP_HPP
--- a/hotspot/src/share/vm/memory/space.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/space.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -44,8 +44,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top,
                                                 HeapWord* top_obj) {
   if (top_obj != NULL) {
@@ -456,20 +454,20 @@
 void Space::print_on(outputStream* st) const {
   print_short_on(st);
   st->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-                bottom(), end());
+                p2i(bottom()), p2i(end()));
 }
 
 void ContiguousSpace::print_on(outputStream* st) const {
   print_short_on(st);
   st->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-                bottom(), top(), end());
+                p2i(bottom()), p2i(top()), p2i(end()));
 }
 
 void OffsetTableContigSpace::print_on(outputStream* st) const {
   print_short_on(st);
   st->print_cr(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", "
                 INTPTR_FORMAT ", " INTPTR_FORMAT ")",
-              bottom(), top(), _offsets.threshold(), end());
+              p2i(bottom()), p2i(top()), p2i(_offsets.threshold()), p2i(end()));
 }
 
 void ContiguousSpace::verify() const {
@@ -592,7 +590,7 @@
 HeapWord* ContiguousSpace::block_start_const(const void* p) const {
   assert(MemRegion(bottom(), end()).contains(p),
          err_msg("p (" PTR_FORMAT ") not in space [" PTR_FORMAT ", " PTR_FORMAT ")",
-                  p, bottom(), end()));
+                  p2i(p), p2i(bottom()), p2i(end())));
   if (p >= top()) {
     return top();
   } else {
@@ -603,7 +601,7 @@
       cur += oop(cur)->size();
     }
     assert(oop(last)->is_oop(),
-           err_msg(PTR_FORMAT " should be an object start", last));
+           err_msg(PTR_FORMAT " should be an object start", p2i(last)));
     return last;
   }
 }
@@ -611,15 +609,15 @@
 size_t ContiguousSpace::block_size(const HeapWord* p) const {
   assert(MemRegion(bottom(), end()).contains(p),
          err_msg("p (" PTR_FORMAT ") not in space [" PTR_FORMAT ", " PTR_FORMAT ")",
-                  p, bottom(), end()));
+                  p2i(p), p2i(bottom()), p2i(end())));
   HeapWord* current_top = top();
   assert(p <= current_top,
          err_msg("p > current top - p: " PTR_FORMAT ", current top: " PTR_FORMAT,
-                  p, current_top));
+                  p2i(p), p2i(current_top)));
   assert(p == current_top || oop(p)->is_oop(),
          err_msg("p (" PTR_FORMAT ") is not a block start - "
                  "current_top: " PTR_FORMAT ", is_oop: %s",
-                 p, current_top, BOOL_TO_STR(oop(p)->is_oop())));
+                 p2i(p), p2i(current_top), BOOL_TO_STR(oop(p)->is_oop())));
   if (p < current_top) {
     return oop(p)->size();
   } else {
--- a/hotspot/src/share/vm/memory/space.inline.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/space.inline.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -214,7 +214,7 @@
       assert(space->block_is_obj(q), "should be at block boundaries, and should be looking at objs");
 
       // point all the oops to the new location
-      size_t size = oop(q)->adjust_pointers();
+      size_t size = MarkSweep::adjust_pointers(oop(q));
       size = space->adjust_obj_size(size);
 
       q += size;
@@ -238,7 +238,7 @@
     if (oop(q)->is_gc_marked()) {
       // q is alive
       // point all the oops to the new location
-      size_t size = oop(q)->adjust_pointers();
+      size_t size = MarkSweep::adjust_pointers(oop(q));
       size = space->adjust_obj_size(size);
       debug_only(prev_q = q);
       q += size;
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -31,8 +31,6 @@
 #include "runtime/thread.inline.hpp"
 #include "utilities/copy.hpp"
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // Thread-Local Edens support
 
 // static member initialization
@@ -154,7 +152,7 @@
   if (PrintTLAB && Verbose) {
     gclog_or_tty->print("TLAB new size: thread: " INTPTR_FORMAT " [id: %2d]"
                         " refills %d  alloc: %8.6f desired_size: " SIZE_FORMAT " -> " SIZE_FORMAT "\n",
-                        myThread(), myThread()->osthread()->thread_id(),
+                        p2i(myThread()), myThread()->osthread()->thread_id(),
                         _target_refills, _allocation_fraction.average(), desired_size(), aligned_new_size);
   }
   set_desired_size(aligned_new_size);
@@ -263,7 +261,7 @@
                       " slow allocs: %d  refill waste: " SIZE_FORMAT "B"
                       " alloc:%8.5f %8.0fKB refills: %d waste %4.1f%% gc: %dB"
                       " slow: %dB fast: %dB\n",
-                      tag, thrd, thrd->osthread()->thread_id(),
+                      tag, p2i(thrd), thrd->osthread()->thread_id(),
                       _desired_size / (K / HeapWordSize),
                       _slow_allocations, _refill_waste_limit * HeapWordSize,
                       _allocation_fraction.average(),
--- a/hotspot/src/share/vm/memory/universe.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -84,8 +84,6 @@
 #include "classfile/sharedClassUtil.hpp"
 #endif
 
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
 // Known objects
 Klass* Universe::_boolArrayKlassObj                 = NULL;
 Klass* Universe::_byteArrayKlassObj                 = NULL;
@@ -792,12 +790,12 @@
 void Universe::print_compressed_oops_mode() {
   tty->cr();
   tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
-              Universe::heap()->base(), Universe::heap()->reserved_region().byte_size()/M);
+              p2i(Universe::heap()->base()), Universe::heap()->reserved_region().byte_size()/M);
 
   tty->print(", Compressed Oops mode: %s", narrow_oop_mode_to_string(narrow_oop_mode()));
 
   if (Universe::narrow_oop_base() != 0) {
-    tty->print(": " PTR_FORMAT, Universe::narrow_oop_base());
+    tty->print(": " PTR_FORMAT, p2i(Universe::narrow_oop_base()));
   }
 
   if (Universe::narrow_oop_shift() != 0) {
--- a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -42,7 +42,6 @@
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/parNew/parOopClosures.inline.hpp"
 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #endif // INCLUDE_ALL_GCS
 
 // Macro to define InstanceClassLoaderKlass::oop_oop_iterate for virtual/nonvirtual for
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -74,7 +74,6 @@
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp"
 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #endif // INCLUDE_ALL_GCS
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"
--- a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -47,7 +47,6 @@
 #include "gc_implementation/parNew/parOopClosures.inline.hpp"
 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #endif // INCLUDE_ALL_GCS
 
 int InstanceMirrorKlass::_offset_of_static_fields = 0;
--- a/hotspot/src/share/vm/oops/instanceRefKlass.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -43,7 +43,6 @@
 #include "gc_implementation/parNew/parOopClosures.inline.hpp"
 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #endif // INCLUDE_ALL_GCS
 
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
--- a/hotspot/src/share/vm/oops/objArrayKlass.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/oops/objArrayKlass.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -55,7 +55,6 @@
 #include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "oops/oop.pcgc.inline.hpp"
 #endif // INCLUDE_ALL_GCS
 
 ObjArrayKlass* ObjArrayKlass::allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS) {
--- a/hotspot/src/share/vm/runtime/thread.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -3183,6 +3183,7 @@
 int         Threads::_number_of_threads = 0;
 int         Threads::_number_of_non_daemon_threads = 0;
 int         Threads::_return_code = 0;
+int         Threads::_thread_claim_parity = 0;
 size_t      JavaThread::_stack_size_at_create = 0;
 #ifdef ASSERT
 bool        Threads::_vm_complete = false;
@@ -3217,7 +3218,6 @@
   // If CompilerThreads ever become non-JavaThreads, add them here
 }
 
-
 void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) {
   TraceTime timer("Initialize java.lang classes", TraceStartupTime);
 
@@ -4046,6 +4046,26 @@
   VMThread::vm_thread()->oops_do(f, cld_f, cf);
 }
 
+void Threads::change_thread_claim_parity() {
+  // Set the new claim parity.
+  assert(_thread_claim_parity >= 0 && _thread_claim_parity <= 2,
+         "Not in range.");
+  _thread_claim_parity++;
+  if (_thread_claim_parity == 3) _thread_claim_parity = 1;
+  assert(_thread_claim_parity >= 1 && _thread_claim_parity <= 2,
+         "Not in range.");
+}
+
+#ifndef PRODUCT
+void Threads::assert_all_threads_claimed() {
+  ALL_JAVA_THREADS(p) {
+    const int thread_parity = p->oops_do_parity();
+    assert((thread_parity == _thread_claim_parity),
+        err_msg("Thread " PTR_FORMAT " has incorrect parity %d != %d", p2i(p), thread_parity, _thread_claim_parity));
+  }
+}
+#endif // PRODUCT
+
 void Threads::possibly_parallel_oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
   // Introduce a mechanism allowing parallel threads to claim threads as
   // root groups.  Overhead should be small enough to use all the time,
@@ -4060,7 +4080,7 @@
   assert(!is_par ||
          (SharedHeap::heap()->n_par_threads() ==
          SharedHeap::heap()->workers()->active_workers()), "Mismatch");
-  int cp = SharedHeap::heap()->strong_roots_parity();
+  int cp = Threads::thread_claim_parity();
   ALL_JAVA_THREADS(p) {
     if (p->claim_oops_do(is_par, cp)) {
       p->oops_do(f, cld_f, cf);
--- a/hotspot/src/share/vm/runtime/thread.hpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Wed Jul 05 20:28:17 2017 +0200
@@ -551,6 +551,7 @@
   Monitor* owned_locks() const                   { return _owned_locks;          }
   bool owns_locks() const                        { return owned_locks() != NULL; }
   bool owns_locks_but_compiled_lock() const;
+  int oops_do_parity() const                     { return _oops_do_parity; }
 
   // Deadlock detection
   bool allow_allocation()                        { return _allow_allocation_count == 0; }
@@ -1855,6 +1856,7 @@
   static int         _number_of_threads;
   static int         _number_of_non_daemon_threads;
   static int         _return_code;
+  static int         _thread_claim_parity;
 #ifdef ASSERT
   static bool        _vm_complete;
 #endif
@@ -1884,9 +1886,10 @@
   // Does not include JNI_VERSION_1_1
   static jboolean is_supported_jni_version(jint version);
 
-  // Garbage collection
-  static void follow_other_roots(void f(oop*));
+  static int thread_claim_parity() { return _thread_claim_parity; }
+  static void change_thread_claim_parity();
 
+  static void assert_all_threads_claimed() PRODUCT_RETURN;
   // Apply "f->do_oop" to all root oops in all threads.
   // This version may only be called by sequential code.
   static void oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf);
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -527,11 +527,11 @@
   nonstatic_field(CollectedHeap,               _defer_initial_card_mark,                      bool)                                  \
   nonstatic_field(CollectedHeap,               _is_gc_active,                                 bool)                                  \
   nonstatic_field(CollectedHeap,               _total_collections,                            unsigned int)                          \
+                                                                                                                                     \
   nonstatic_field(CompactibleSpace,            _compaction_top,                               HeapWord*)                             \
   nonstatic_field(CompactibleSpace,            _first_dead,                                   HeapWord*)                             \
   nonstatic_field(CompactibleSpace,            _end_of_live,                                  HeapWord*)                             \
                                                                                                                                      \
-                                                                                                                                     \
   nonstatic_field(ContiguousSpace,             _top,                                          HeapWord*)                             \
   nonstatic_field(ContiguousSpace,             _concurrent_iteration_safe_limit,              HeapWord*)                             \
   nonstatic_field(ContiguousSpace,             _saved_mark_word,                              HeapWord*)                             \
@@ -559,7 +559,9 @@
   nonstatic_field(GenCollectedHeap,            _young_gen,                                    Generation*)                           \
   nonstatic_field(GenCollectedHeap,            _old_gen,                                      Generation*)                           \
  nonstatic_field(GenCollectedHeap,             _n_gens,                                       int)                                   \
-  nonstatic_field(GenCollectedHeap,            _gen_specs,                                    GenerationSpec**)                      \
+                                                                                                                                     \
+  nonstatic_field(GenCollectorPolicy,          _young_gen_spec,                               GenerationSpec*)                       \
+  nonstatic_field(GenCollectorPolicy,          _old_gen_spec,                                 GenerationSpec*)                       \
                                                                                                                                      \
   nonstatic_field(HeapWord,                    i,                                             char*)                                 \
                                                                                                                                      \
@@ -1505,6 +1507,7 @@
            declare_type(DefNewGeneration,             Generation)         \
            declare_type(CardGeneration,               Generation)         \
            declare_type(TenuredGeneration,            CardGeneration)     \
+  declare_toplevel_type(GenCollectorPolicy)                               \
   declare_toplevel_type(Space)                                            \
   declare_toplevel_type(BitMap)                                           \
            declare_type(CompactibleSpace,             Space)              \
@@ -2250,9 +2253,9 @@
                                                                           \
   declare_constant(CardTableRS::youngergen_card)                          \
                                                                           \
-  declare_constant(CollectedHeap::Abstract)                               \
-  declare_constant(CollectedHeap::SharedHeap)                             \
   declare_constant(CollectedHeap::GenCollectedHeap)                       \
+  declare_constant(CollectedHeap::ParallelScavengeHeap)                   \
+  declare_constant(CollectedHeap::G1CollectedHeap)                        \
                                                                           \
   declare_constant(GenCollectedHeap::max_gens)                            \
                                                                           \
--- a/hotspot/src/share/vm/services/memoryService.cpp	Thu Apr 09 17:37:46 2015 -0700
+++ b/hotspot/src/share/vm/services/memoryService.cpp	Wed Jul 05 20:28:17 2017 +0200
@@ -130,8 +130,7 @@
 
   GenCollectorPolicy* gen_policy = policy->as_generation_policy();
   if (gen_policy != NULL) {
-    GenerationSpec** specs = gen_policy->generations();
-    Generation::Name kind = specs[0]->name();
+    Generation::Name kind = gen_policy->young_gen_spec()->name();
     switch (kind) {
       case Generation::DefNew:
         _minor_gc_manager = MemoryManager::get_copy_memory_manager();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java	Wed Jul 05 20:28:17 2017 +0200
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test TestDynamicNumberOfGCThreads
+ * @bug 8017462
+ * @summary Ensure that UseDynamicNumberOfGCThreads runs
+ * @requires vm.gc=="null"
+ * @key gc
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class TestDynamicNumberOfGCThreads {
+  public static void main(String[] args) throws Exception {
+
+    testDynamicNumberOfGCThreads("UseConcMarkSweepGC");
+
+    testDynamicNumberOfGCThreads("UseG1GC");
+
+    testDynamicNumberOfGCThreads("UseParallelGC");
+  }
+
+  private static void verifyDynamicNumberOfGCThreads(OutputAnalyzer output) {
+    output.shouldContain("new_active_workers");
+    output.shouldHaveExitValue(0);
+  }
+
+  private static void testDynamicNumberOfGCThreads(String gcFlag) throws Exception {
+    // UseDynamicNumberOfGCThreads and TraceDynamicGCThreads enabled
+    ProcessBuilder pb_enabled =
+      ProcessTools.createJavaProcessBuilder("-XX:+" + gcFlag, "-Xmx10M", "-XX:+PrintGCDetails",  "-XX:+UseDynamicNumberOfGCThreads", "-XX:+TraceDynamicGCThreads", GCTest.class.getName());
+    verifyDynamicNumberOfGCThreads(new OutputAnalyzer(pb_enabled.start()));
+  }
+
+  static class GCTest {
+    private static byte[] garbage;
+    public static void main(String [] args) {
+      System.out.println("Creating garbage");
+      // create 128MB of garbage. This should result in at least one GC
+      for (int i = 0; i < 1024; i++) {
+        garbage = new byte[128 * 1024];
+      }
+      System.out.println("Done");
+    }
+  }
+}
--- a/jaxp/.hgtags	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxp/.hgtags	Wed Jul 05 20:28:17 2017 +0200
@@ -301,3 +301,4 @@
 139092a10dedd32bc1155e40c67a6ef682e39873 jdk9-b56
 2c417f7d7b0dc98e887474884aa39f974894f0c2 jdk9-b57
 270fb9a2dcb5ff3ef95da6d529fa35187026af0a jdk9-b58
+a1a9d943446911a4a0f74f0d082c32094af944ae jdk9-b59
--- a/jaxws/.hgtags	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxws/.hgtags	Wed Jul 05 20:28:17 2017 +0200
@@ -304,3 +304,4 @@
 b4f913b48e699980bd11fe19cce134d0adb4c31c jdk9-b56
 17c4241395e97312bd75e7acd693ffcdd41ae993 jdk9-b57
 1e06b36bb396c0495e0774f1c6b0356d03847659 jdk9-b58
+8a9ebae410bc388668fc203e559b5407bde757eb jdk9-b59
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -30,8 +30,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.ref.WeakReference;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.logging.Level;
@@ -87,25 +85,19 @@
         if(consRef!=null)
             cons = consRef.get();
         if(cons==null) {
-            cons = AccessController.doPrivileged(new PrivilegedAction<Constructor<T>>() {
-                @Override
-                public Constructor<T> run() {
-                    try {
-                        return clazz.getDeclaredConstructor(emptyClass);
-                    } catch (NoSuchMethodException e) {
-                        logger.log(Level.INFO,"No default constructor found on "+clazz,e);
-                        NoSuchMethodError exp;
-                        if(clazz.getDeclaringClass()!=null && !Modifier.isStatic(clazz.getModifiers())) {
-                            exp = new NoSuchMethodError(Messages.NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS
-                                                                .format(clazz.getName()));
-                        } else {
-                            exp = new NoSuchMethodError(e.getMessage());
-                        }
-                        exp.initCause(e);
-                        throw exp;
-                    }
+            try {
+                cons = clazz.getDeclaredConstructor(emptyClass);
+            } catch (NoSuchMethodException e) {
+                logger.log(Level.INFO,"No default constructor found on "+clazz,e);
+                NoSuchMethodError exp;
+                if(clazz.getDeclaringClass()!=null && !Modifier.isStatic(clazz.getModifiers())) {
+                    exp = new NoSuchMethodError(Messages.NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS.format(clazz.getName()));
+                } else {
+                    exp = new NoSuchMethodError(e.getMessage());
                 }
-            });
+                exp.initCause(e);
+                throw exp;
+            }
 
             int classMod = clazz.getModifiers();
 
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,12 +25,18 @@
 
 package com.sun.xml.internal.org.jvnet.mimepull;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -40,19 +46,21 @@
  *
  * @author Jitendra Kotamraju
  */
-public class MIMEMessage {
+public class MIMEMessage implements Closeable {
+
     private static final Logger LOGGER = Logger.getLogger(MIMEMessage.class.getName());
 
     MIMEConfig config;
 
     private final InputStream in;
-    private final List<MIMEPart> partsList;
-    private final Map<String, MIMEPart> partsMap;
     private final Iterator<MIMEEvent> it;
     private boolean parsed;     // true when entire message is parsed
     private MIMEPart currentPart;
     private int currentIndex;
 
+    private final List<MIMEPart> partsList = new ArrayList<MIMEPart>();
+    private final Map<String, MIMEPart> partsMap = new HashMap<String, MIMEPart>();
+
     /**
      * @see MIMEMessage(InputStream, String, MIMEConfig)
      */
@@ -64,9 +72,9 @@
      * Creates a MIME message from the content's stream. The content stream
      * is closed when EOF is reached.
      *
-     * @param in MIME message stream
+     * @param in       MIME message stream
      * @param boundary the separator for parts(pass it without --)
-     * @param config various configuration parameters
+     * @param config   various configuration parameters
      */
     public MIMEMessage(InputStream in, String boundary, MIMEConfig config) {
         this.in = in;
@@ -74,8 +82,6 @@
         MIMEParser parser = new MIMEParser(in, boundary, config);
         it = parser.iterator();
 
-        partsList = new ArrayList<MIMEPart>();
-        partsMap = new HashMap<String, MIMEPart>();
         if (config.isParseEagerly()) {
             parseAll();
         }
@@ -108,14 +114,14 @@
         LOGGER.log(Level.FINE, "index={0}", index);
         MIMEPart part = (index < partsList.size()) ? partsList.get(index) : null;
         if (parsed && part == null) {
-            throw new MIMEParsingException("There is no "+index+" attachment part ");
+            throw new MIMEParsingException("There is no " + index + " attachment part ");
         }
         if (part == null) {
             // Parsing will done lazily and will be driven by reading the part
             part = new MIMEPart(this);
             partsList.add(index, part);
         }
-        LOGGER.log(Level.FINE, "Got attachment at index={0} attachment={1}", new Object[]{index, part});
+        LOGGER.log(Level.FINE, "Got attachment at index={0} attachment={1}", new Object[] {index, part});
         return part;
     }
 
@@ -132,14 +138,14 @@
         LOGGER.log(Level.FINE, "Content-ID={0}", contentId);
         MIMEPart part = getDecodedCidPart(contentId);
         if (parsed && part == null) {
-            throw new MIMEParsingException("There is no attachment part with Content-ID = "+contentId);
+            throw new MIMEParsingException("There is no attachment part with Content-ID = " + contentId);
         }
         if (part == null) {
             // Parsing is done lazily and is driven by reading the part
             part = new MIMEPart(this, contentId);
             partsMap.put(contentId, part);
         }
-        LOGGER.log(Level.FINE, "Got attachment for Content-ID={0} attachment={1}", new Object[]{contentId, part});
+        LOGGER.log(Level.FINE, "Got attachment for Content-ID={0} attachment={1}", new Object[] {contentId, part});
         return part;
     }
 
@@ -151,7 +157,7 @@
                 try {
                     String tempCid = URLDecoder.decode(cid, "utf-8");
                     part = partsMap.get(tempCid);
-                } catch(UnsupportedEncodingException ue) {
+                } catch (UnsupportedEncodingException ue) {
                     // Ignore it
                 }
             }
@@ -159,22 +165,43 @@
         return part;
     }
 
-
     /**
      * Parses the whole MIME message eagerly
      */
     public final void parseAll() {
-        while(makeProgress()) {
+        while (makeProgress()) {
             // Nothing to do
         }
     }
 
+    /**
+     * Closes all parsed {@link com.sun.xml.internal.org.jvnet.mimepull.MIMEPart parts}.
+     * This method is safe to call even if parsing of message failed.
+     * <p/>
+     * Does not throw {@link com.sun.xml.internal.org.jvnet.mimepull.MIMEParsingException} if an
+     * error occurred during closing a MIME part. The exception (if any) is
+     * still logged.
+     */
+    @Override
+    public void close() {
+        close(partsList);
+        close(partsMap.values());
+    }
+
+    private void close(final Collection<MIMEPart> parts) {
+        for (final MIMEPart part : parts) {
+            try {
+                part.close();
+            } catch (final MIMEParsingException closeError) {
+                LOGGER.log(Level.FINE, "Exception during closing MIME part", closeError);
+            }
+        }
+    }
 
     /**
      * Parses the MIME message in a pull fashion.
      *
-     * @return
-     *      false if the parsing is completed.
+     * @return false if the parsing is completed.
      */
     public synchronized boolean makeProgress() {
         if (!it.hasNext()) {
@@ -183,23 +210,23 @@
 
         MIMEEvent event = it.next();
 
-        switch(event.getEventType()) {
-            case START_MESSAGE :
+        switch (event.getEventType()) {
+            case START_MESSAGE:
                 LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.START_MESSAGE);
                 break;
 
-            case START_PART :
+            case START_PART:
                 LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.START_PART);
                 break;
 
-            case HEADERS :
+            case HEADERS:
                 LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.HEADERS);
-                MIMEEvent.Headers headers = (MIMEEvent.Headers)event;
+                MIMEEvent.Headers headers = (MIMEEvent.Headers) event;
                 InternetHeaders ih = headers.getHeaders();
                 List<String> cids = ih.getHeader("content-id");
-                String cid = (cids != null) ? cids.get(0) : currentIndex+"";
-                if (cid.length() > 2 && cid.charAt(0)=='<') {
-                    cid = cid.substring(1,cid.length()-1);
+                String cid = (cids != null) ? cids.get(0) : currentIndex + "";
+                if (cid.length() > 2 && cid.charAt(0) == '<') {
+                    cid = cid.substring(1, cid.length() - 1);
                 }
                 MIMEPart listPart = (currentIndex < partsList.size()) ? partsList.get(currentIndex) : null;
                 MIMEPart mapPart = getDecodedCidPart(cid);
@@ -219,31 +246,31 @@
                 currentPart.setHeaders(ih);
                 break;
 
-            case CONTENT :
+            case CONTENT:
                 LOGGER.log(Level.FINER, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.CONTENT);
-                MIMEEvent.Content content = (MIMEEvent.Content)event;
+                MIMEEvent.Content content = (MIMEEvent.Content) event;
                 ByteBuffer buf = content.getData();
                 currentPart.addBody(buf);
                 break;
 
-            case END_PART :
+            case END_PART:
                 LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.END_PART);
                 currentPart.doneParsing();
                 ++currentIndex;
                 break;
 
-            case END_MESSAGE :
+            case END_MESSAGE:
                 LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.END_MESSAGE);
                 parsed = true;
                 try {
                     in.close();
-                } catch(IOException ioe) {
+                } catch (IOException ioe) {
                     throw new MIMEParsingException(ioe);
                 }
                 break;
 
-            default :
-                throw new MIMEParsingException("Unknown Parser state = "+event.getEventType());
+            default:
+                throw new MIMEParsingException("Unknown Parser state = " + event.getEventType());
         }
         return true;
     }
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -25,6 +25,7 @@
 
 package com.sun.xml.internal.org.jvnet.mimepull;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -42,10 +43,11 @@
  *
  * @author Jitendra Kotamraju, Martin Grebac
  */
-public class MIMEPart {
+public class MIMEPart implements Closeable {
 
     private static final Logger LOGGER = Logger.getLogger(MIMEPart.class.getName());
 
+    private volatile boolean closed;
     private volatile InternetHeaders headers;
     private volatile String contentId;
     private String contentType;
@@ -55,6 +57,8 @@
     final MIMEMessage msg;
     private final DataHead dataHead;
 
+    private final Object lock = new Object();
+
     MIMEPart(MIMEMessage msg) {
         this.msg = msg;
         this.dataHead = new DataHead(this);
@@ -91,8 +95,16 @@
      * the temp file that is used to serve this part's content). After
      * calling this, one shouldn't call {@link #read()} or {@link #readOnce()}
      */
+    @Override
     public void close() {
-        dataHead.close();
+        if (!closed) {
+            synchronized (lock) {
+                if (!closed) {
+                    dataHead.close();
+                    closed = true;
+                }
+            }
+        }
     }
 
     /**
@@ -242,6 +254,15 @@
         this.contentTransferEncoding = cte;
     }
 
+    /**
+     * Return {@code true} if this part has already been closed, {@code false} otherwise.
+     *
+     * @return {@code true} if this part has already been closed, {@code false} otherwise.
+     */
+    public boolean isClosed() {
+        return closed;
+    }
+
     @Override
     public String toString() {
         return "Part="+contentId+":"+contentTransferEncoding;
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -84,9 +84,6 @@
                 if (LOGGER.isLoggable(Level.FINE)) {
                     LOGGER.log(Level.FINE, "Created temp file = {0}", tempFile);
                 }
-                // delete the temp file when VM exits as a last resort for file clean up
-                tempFile.deleteOnExit();
-                if (LOGGER.isLoggable(Level.FINE)) {LOGGER.log(Level.FINE, "Created temp file = {0}", tempFile);}
                 dataHead.dataFile = new DataFile(tempFile);
             } catch (IOException ioe) {
                 throw new MIMEParsingException(ioe);
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java	Thu Apr 09 17:37:46 2015 -0700
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java	Wed Jul 05 20:28:17 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -25,7 +25,6 @@
 
 package javax.xml.bind;
 
-import java.util.Iterator;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,15 +33,13 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.security.AccessController;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.security.AccessController;
-
-import static javax.xml.bind.JAXBContext.JAXB_CONTEXT_FACTORY;
 
 
 /**
@@ -55,7 +52,24 @@
  * @see JAXBContext
  */
 class ContextFinder {
+
+    /**
+     * When JAXB is in J2SE, rt.jar has to have a JAXB implementation.
+     * However, rt.jar cannot have META-INF/services/javax.xml.bind.JAXBContext
+     * because if it has, it will take precedence over any file that applications have
+     * in their jar files.
+     *
+     * <p>
+     * When the user bundles his own JAXB implementation, we'd like to use it, and we
+     * want the platform default to be used only when there's no other JAXB provider.
+     *
+     * <p>
+     * For this reason, we have to hard-code the class name into the API.
+     */
+    private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory";
+
     private static final Logger logger;
+
     static {
         logger = Logger.getLogger("javax.xml.bind");
         try {
@@ -72,7 +86,7 @@
                 // to honor what other frameworks
                 // have done on configurations.
             }
-        } catch(Throwable t) {
+        } catch (Throwable t) {
             // just to be extra safe. in particular System.getProperty may throw
             // SecurityException.
         }
@@ -84,15 +98,15 @@
      */
     private static void handleInvocationTargetException(InvocationTargetException x) throws JAXBException {
         Throwable t = x.getTargetException();
-        if( t != null ) {
-            if( t instanceof JAXBException )
+        if (t != null) {
+            if (t instanceof JAXBException)
                 // one of our exceptions, just re-throw
-                throw (JAXBException)t;
-            if( t instanceof RuntimeException )
+                throw (JAXBException) t;
+            if (t instanceof RuntimeException)
                 // avoid wrapping exceptions unnecessarily
-                throw (RuntimeException)t;
-            if( t instanceof Error )
-                throw (Error)t;
+                throw (RuntimeException) t;
+            if (t instanceof Error)
+                throw (Error) t;
         }
     }
 
@@ -121,18 +135,17 @@
     /**
      * Create an instance of a class using the specified ClassLoader
      */
-    static JAXBContext newInstance( String contextPath,
-                               String className,
-                               ClassLoader classLoader,
-                               Map properties )
-        throws JAXBException {
+    static JAXBContext newInstance(String contextPath,
+                                   String className,
+                                   ClassLoader classLoader,
+                                   Map properties) throws JAXBException {
+
         try {
-            Class spFactory = safeLoadClass(className,classLoader);
+            Class spFactory = ServiceLoaderUtil.safeLoadClass(className, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader);
             return newInstance(contextPath, spFactory, classLoader, properties);
         } catch (ClassNotFoundException x) {
-            throw new JAXBException(
-                Messages.format( Messages.PROVIDER_NOT_FOUND, className ),
-                x);
+            throw new JAXBException(Messages.format(Messages.PROVIDER_NOT_FOUND, className), x);
+
         } catch (RuntimeException x) {
             // avoid wrapping RuntimeException to JAXBException,
             // because it indicates a bug in this code.
@@ -142,18 +155,12 @@
             // reflection.  Root element collisions detected in the call to
             // createContext() are reported as JAXBExceptions - just re-throw it
             // some other type of exception - just wrap it
-            throw new JAXBException(
-                Messages.format( Messages.COULD_NOT_INSTANTIATE, className, x ),
-                x);
+            throw new JAXBException(Messages.format(Messages.COULD_NOT_INSTANTIATE, className, x), x);
         }
     }
 
-    static JAXBContext newInstance( String contextPath,
-                               Class spFactory,
-                               ClassLoader classLoader,
-                               Map properties )
-        throws JAXBException
-    {
+    static JAXBContext newInstance(String contextPath, Class spFactory, ClassLoader classLoader, Map properties) throws JAXBException {
+
         try {
             /*
              * javax.xml.bind.context.factory points to a class which has a
@@ -166,35 +173,35 @@
             // first check the method that takes Map as the third parameter.
             // this is added in 2.0.
             try {
-                Method m = spFactory.getMethod("createContext",String.class,ClassLoader.class,Map.class);
+                Method m = spFactory.getMethod("createContext", String.class, ClassLoader.class, Map.class);
                 // any failure in invoking this method would be considered fatal
-                context = m.invoke(null,contextPath,classLoader,properties);
+                context = m.invoke(null, contextPath, classLoader, properties);
             } catch (NoSuchMethodException e) {
                 // it's not an error for the provider not to have this method.
             }
 
-            if(context==null) {
+            if (context == null) {
                 // try the old method that doesn't take properties. compatible with 1.0.
                 // it is an error for an implementation not to have both forms of the createContext method.
-                Method m = spFactory.getMethod("createContext",String.class,ClassLoader.class);
+                Method m = spFactory.getMethod("createContext", String.class, ClassLoader.class);
                 // any failure in invoking this method would be considered fatal
-                context = m.invoke(null,contextPath,classLoader);
+                context = m.invoke(null, contextPath, classLoader);
             }
 
-            if(!(context instanceof JAXBContext)) {
+            if (!(context instanceof JAXBContext)) {
                 // the cast would fail, so generate an exception with a nice message
                 throw handleClassCastException(context.getClass(), JAXBContext.class);
             }
-            return (JAXBContext)context;
+            return (JAXBContext) context;
         } catch (InvocationTargetException x) {
             handleInvocationTargetException(x);
             // for other exceptions, wrap the internal target exception
             // with a JAXBException
             Throwable e = x;
-            if(x.getTargetException()!=null)
+            if (x.getTargetException() != null)
                 e = x.getTargetException();
 
-            throw new JAXBException( Messages.format( Messages.COULD_NOT_INSTANTIATE, spFactory, e ), e );
+            throw new JAXBException(Messages.format(Messages.COULD_NOT_INSTANTIATE, spFactory, e), e);
         } catch (RuntimeException x) {
             // avoid wrapping RuntimeException to JAXBException,
             // because it indicates a bug in this code.
@@ -204,29 +211,23 @@
             // reflection.  Root element collisions detected in the call to
             // createContext() are reported as JAXBExceptions - just re-throw it
             // some other type of exception - just wrap it
-            throw new JAXBException(
-                Messages.format( Messages.COULD_NOT_INSTANTIATE, spFactory, x ),
-                x);
+            throw new JAXBException(Messages.format(Messages.COULD_NOT_INSTANTIATE, spFactory, x), x);
         }
     }
 
-
     /**
      * Create an instance of a class using the thread context ClassLoader
      */
-    static JAXBContext newInstance(
-                              Class[] classes,
-                              Map properties,
-                              String className) throws JAXBException {
-        ClassLoader cl = getContextClassLoader();
+    static JAXBContext newInstance(Class[] classes, Map properties, String className) throws JAXBException {
+
         Class spi;
         try {
-            spi = safeLoadClass(className,cl);
+            spi = ServiceLoaderUtil.safeLoadClass(className, PLATFORM_DEFAULT_FACTORY_CLASS, getContextClassLoader());
         } catch (ClassNotFoundException e) {
             throw new JAXBException(e);
         }
 
-        if(logger.isLoggable(Level.FINE)) {
+        if (logger.isLoggable(Level.FINE)) {
             // extra check to avoid costly which operation if not logged
             logger.log(Level.FINE, "loaded {0} from {1}", new Object[]{className, which(spi)});
         }
@@ -237,19 +238,16 @@
     static JAXBContext newInstance(Class[] classes,
                                    Map properties,
                                    Class spFactory) throws JAXBException {
-        Method m;
         try {
-            m = spFactory.getMethod("createContext", Class[].class, Map.class);
-        } catch (NoSuchMethodException e) {
-            throw new JAXBException(e);
-        }
-        try {
+            Method m = spFactory.getMethod("createContext", Class[].class, Map.class);
             Object context = m.invoke(null, classes, properties);
-            if(!(context instanceof JAXBContext)) {
+            if (!(context instanceof JAXBContext)) {
                 // the cast would fail, so generate an exception with a nice message
                 throw handleClassCastException(context.getClass(), JAXBContext.class);
             }
-            return (JAXBContext)context;
+            return (JAXBContext) context;
+        } catch (NoSuchMethodException e) {
+            throw new JAXBException(e);
         } catch (IllegalAccessException e) {
             throw new JAXBException(e);
         } catch (InvocationTargetException e) {
@@ -263,241 +261,139 @@
         }
     }
 
-    static JAXBContext find(String factoryId, String contextPath, ClassLoader classLoader, Map properties ) throws JAXBException {
+    static JAXBContext find(String factoryId, String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
 
         // TODO: do we want/need another layer of searching in $java.home/lib/jaxb.properties like JAXP?
 
-        final String jaxbContextFQCN = JAXBContext.class.getName();
-
-        // search context path for jaxb.properties first
-        StringBuilder propFileName;
-        StringTokenizer packages = new StringTokenizer( contextPath, ":" );
-        String factoryClassName;
-
-        if(!packages.hasMoreTokens())
+        StringTokenizer packages = new StringTokenizer(contextPath, ":");
+        if (!packages.hasMoreTokens()) {
             // no context is specified
             throw new JAXBException(Messages.format(Messages.NO_PACKAGE_IN_CONTEXTPATH));
-
-
-        logger.fine("Searching jaxb.properties");
-
-        while( packages.hasMoreTokens() ) {
-            String packageName = packages.nextToken(":").replace('.','/');
-            // com.acme.foo - > com/acme/foo/jaxb.properties
-             propFileName = new StringBuilder().append(packageName).append("/jaxb.properties");
-
-            Properties props = loadJAXBProperties( classLoader, propFileName.toString() );
-            if (props != null) {
-                if (props.containsKey(factoryId)) {
-                    factoryClassName = props.getProperty(factoryId);
-                    return newInstance( contextPath, factoryClassName, classLoader, properties );
-                } else {
-                    throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, factoryId));
-                }
-            }
         }
 
-        logger.fine("Searching the system property");
-
-        // search for a system property second (javax.xml.bind.JAXBContext)
-        factoryClassName = AccessController.doPrivileged(new GetPropertyAction(JAXBContext.JAXB_CONTEXT_FACTORY));
-        if(  factoryClassName != null ) {
-            return newInstance( contextPath, factoryClassName, classLoader, properties );
-        } else { // leave this here to assure compatibility
-            factoryClassName = AccessController.doPrivileged(new GetPropertyAction(jaxbContextFQCN));
-            if(  factoryClassName != null ) {
-                return newInstance( contextPath, factoryClassName, classLoader, properties );
-            }
+        // search for jaxb.properties in the class loader of each class first
+        logger.fine("Searching jaxb.properties");
+        while (packages.hasMoreTokens()) {
+            // com.acme.foo - > com/acme/foo/jaxb.properties
+            String className = classNameFromPackageProperties(factoryId, classLoader, packages.nextToken(":").replace('.', '/'));
+            if (className != null) return newInstance(contextPath, className, classLoader, properties);
         }
 
-        // OSGi search
-        Class jaxbContext = lookupJaxbContextUsingOsgiServiceLoader();
-        if (jaxbContext != null) {
-            logger.fine("OSGi environment detected");
-            return newInstance(contextPath, jaxbContext, classLoader, properties);
+        String factoryName = classNameFromSystemProperties();
+        if (factoryName != null) return newInstance(contextPath, factoryName, classLoader, properties);
+
+        Class ctxFactory = (Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext", logger);
+        if (ctxFactory != null) {
+            return newInstance(contextPath, ctxFactory, classLoader, properties);
         }
 
-        logger.fine("Searching META-INF/services");
-        // search META-INF services next
-        BufferedReader r = null;
-        try {
-            final StringBuilder resource = new StringBuilder().append("META-INF/services/").append(jaxbContextFQCN);
-            final InputStream resourceStream =
-                    classLoader.getResourceAsStream(resource.toString());
+        // TODO: SPEC change required! This is supposed to be!
+        // JAXBContext obj = firstByServiceLoader(JAXBContext.class, EXCEPTION_HANDLER);
+        // if (obj != null) return obj;
 
-            if (resourceStream != null) {
-                r = new BufferedReader(new InputStreamReader(resourceStream, "UTF-8"));
-                factoryClassName = r.readLine();
-                if (factoryClassName != null) {
-                    factoryClassName = factoryClassName.trim();
-                }
-                r.close();
-                return newInstance(contextPath, factoryClassName, classLoader, properties);
-            } else {
-                logger.log(Level.FINE, "Unable to load:{0}", resource.toString());
-            }
-        } catch (UnsupportedEncodingException e) {
-            // should never happen
-            throw new JAXBException(e);
-        } catch (IOException e) {
-            throw new JAXBException(e);
-        } finally {
-            try {
-                if (r != null) {
-                    r.close();
-                }
-            } catch (IOException ex) {
-                Logger.getLogger(ContextFinder.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
+        // TODO: Deprecated - SPEC change required!
+        factoryName = firstByServiceLoaderDeprecated(JAXBContext.class, classLoader);
+        if (factoryName != null) return newInstance(contextPath, factoryName, classLoader, properties);
 
         // else no provider found
         logger.fine("Trying to create the platform default provider");
         return newInstance(contextPath, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader, properties);
     }
 
-    static JAXBContext find( Class[] classes, Map properties ) throws JAXBException {
-
-        final String jaxbContextFQCN = JAXBContext.class.getName();
-        String factoryClassName;
+    static JAXBContext find(Class[] classes, Map properties) throws JAXBException {
 
         // search for jaxb.properties in the class loader of each class first
+        logger.fine("Searching jaxb.properties");
         for (final Class c : classes) {
             // this classloader is used only to load jaxb.properties, so doing this should be safe.
-            ClassLoader classLoader = getClassClassLoader(c);
-            Package pkg = c.getPackage();
-            if(pkg==null)
-                continue;       // this is possible for primitives, arrays, and classes that are loaded by poorly implemented ClassLoaders
-            String packageName = pkg.getName().replace('.', '/');
+            if (c.getPackage() == null) continue;       // this is possible for primitives, arrays, and classes that are loaded by poorly implemented ClassLoaders
 
             // TODO: do we want to optimize away searching the same package?  org.Foo, org.Bar, com.Baz
-            //       classes from the same package might come from different class loades, so it might be a bad idea
-
+            // classes from the same package might come from different class loades, so it might be a bad idea
             // TODO: it's easier to look things up from the class
             // c.getResourceAsStream("jaxb.properties");
 
-            // build the resource name and use the property loader code
-            String resourceName = packageName+"/jaxb.properties";
-            logger.log(Level.FINE, "Trying to locate {0}", resourceName);
-            Properties props = loadJAXBProperties(classLoader, resourceName);
-            if (props == null) {
-                logger.fine("  not found");
-            } else {
-                logger.fine("  found");
-                if (props.containsKey(JAXB_CONTEXT_FACTORY)) {
-                    // trim() seems redundant, but adding to satisfy customer complaint
-                    factoryClassName = props.getProperty(JAXB_CONTEXT_FACTORY).trim();
-                    return newInstance(classes, properties, factoryClassName);
-                } else {
-                    throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, JAXB_CONTEXT_FACTORY));
-                }
-            }
+            String className = classNameFromPackageProperties(JAXBContext.JAXB_CONTEXT_FACTORY, getClassClassLoader(c), c.getPackage().getName().replace('.', '/'));
+            if (className != null) return newInstance(classes, properties, className);
         }
 
-        // search for a system property second (javax.xml.bind.JAXBContext)
-        logger.log(Level.FINE, "Checking system property {0}", JAXBContext.JAXB_CONTEXT_FACTORY);
-        factoryClassName = AccessController.doPrivileged(new GetPropertyAction(JAXBContext.JAXB_CONTEXT_FACTORY));
-        if (factoryClassName != null) {
-            logger.log(Level.FINE, "  found {0}", factoryClassName);
-            return newInstance( classes, properties, factoryClassName );
-        } else { // leave it here for compatibility reasons
-            logger.fine("  not found");
-            logger.log(Level.FINE, "Checking system property {0}", jaxbContextFQCN);
-            factoryClassName = AccessController.doPrivileged(new GetPropertyAction(jaxbContextFQCN));
-            if (factoryClassName != null) {
-                logger.log(Level.FINE, "  found {0}", factoryClassName);
-                return newInstance( classes, properties, factoryClassName );
-            } else {
-                logger.fine("  not found");
-            }
+        String factoryName = classNameFromSystemProperties();
+        if (factoryName != null) return newInstance(classes, properties, factoryName);
+
+        Class ctxFactoryClass = (Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext", logger);
+        if (ctxFactoryClass != null) {
+            return newInstance(classes, properties, ctxFactoryClass);
         }
 
-        // OSGi search
-        Class jaxbContext = lookupJaxbContextUsingOsgiServiceLoader();
-        if (jaxbContext != null) {
-            logger.fine("OSGi environment detected");
-            return newInstance(classes, properties, jaxbContext);
-        }
+        // TODO: to be removed - deprecated!!! Requires SPEC change!!!
+        String className = firstByServiceLoaderDeprecated(JAXBContext.class, getContextClassLoader());
+        if (className != null) return newInstance(classes, properties, className);
 
-        // search META-INF services next
-        logger.fine("Checking META-INF/services");
-        BufferedReader r = null;
-        try {
-            final String resource = new StringBuilder("META-INF/services/").append(jaxbContextFQCN).toString();
-            ClassLoader classLoader = getContextClassLoader();
-            URL resourceURL;
-            if(classLoader==null)
-                resourceURL = ClassLoader.getSystemResource(resource);
-            else
-                resourceURL = classLoader.getResource(resource);
-
-            if (resourceURL != null) {
-                logger.log(Level.FINE, "Reading {0}", resourceURL);
-                r = new BufferedReader(new InputStreamReader(resourceURL.openStream(), "UTF-8"));
-                factoryClassName = r.readLine();
-                if (factoryClassName != null) {
-                    factoryClassName = factoryClassName.trim();
-                }
-                return newInstance(classes, properties, factoryClassName);
-            } else {
-                logger.log(Level.FINE, "Unable to find: {0}", resource);
-            }
-        } catch (UnsupportedEncodingException e) {
-            // should never happen
-            throw new JAXBException(e);
-        } catch (IOException e) {
-            throw new JAXBException(e);
-        } finally {
-            if (r != null) {
-                try {
-                    r.close();
-                } catch (IOException ex) {
-                    logger.log(Level.FINE, "Unable to close stream", ex);
-                }
-            }
-        }
+        //    // TODO: supposed to be:
+        //    obj = firstByServiceLoader(JAXBContext.class, EXCEPTION_HANDLER);
+        //    if (obj != null) return obj;
 
         // else no provider found
         logger.fine("Trying to create the platform default provider");
         return newInstance(classes, properties, PLATFORM_DEFAULT_FACTORY_CLASS);
     }
 
-    private static Class lookupJaxbContextUsingOsgiServiceLoader() {
-        try {
-            // Use reflection to avoid having any dependency on ServiceLoader class
-            Class target = Class.forName("com.sun.org.glassfish.hk2.osgiresourcelocator.ServiceLoader");
-            Method m = target.getMethod("lookupProviderClasses", Class.class);
-            Iterator iter = ((Iterable) m.invoke(null, JAXBContext.class)).iterator();
-            return iter.hasNext() ? (Class)iter.next() : null;
-        } catch(Exception e) {
-            logger.log(Level.FINE, "Unable to find from OSGi: javax.xml.bind.JAXBContext");
-            return null;
+
+    private static String classNameFromPackageProperties(String factoryId, ClassLoader classLoader, String packageName) throws JAXBException {
+        String resourceName = packageName + "/jaxb.properties";
+        logger.log(Level.FINE, "Trying to locate {0}", resourceName);
+        Properties props = loadJAXBProperties(classLoader, resourceName);
+        if (props != null) {
+            if (props.containsKey(factoryId)) {
+                return props.getProperty(factoryId);
+            } else {
+                throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, factoryId));
+            }
         }
+        return null;
     }
 
-    private static Properties loadJAXBProperties( ClassLoader classLoader,
-                                                  String propFileName )
-        throws JAXBException {
+    private static String classNameFromSystemProperties() throws JAXBException {
+        logger.log(Level.FINE, "Checking system property {0}", JAXBContext.JAXB_CONTEXT_FACTORY);
+        // search for a system property second (javax.xml.bind.JAXBContext)
+        String factoryClassName = AccessController.doPrivileged(new GetPropertyAction(JAXBContext.JAXB_CONTEXT_FACTORY));
+        if (factoryClassName != null) {
+            logger.log(Level.FINE, "  found {0}", factoryClassName);
+            return factoryClassName;
+        } else { // leave this here to assure compatibility
+            logger.fine("  not found");
+            logger.log(Level.FINE, "Checking system property {0}", JAXBContext.class.getName());
+            factoryClassName = AccessController.doPrivileged(new GetPropertyAction(JAXBContext.class.getName()));
+            if (factoryClassName != null) {
+                logger.log(Level.FINE, "  found {0}", factoryClassName);
+                return factoryClassName;
+            } else {
+                logger.fine("  not found");
+            }
+        }
+        return null;
+    }
+
+    private static Properties loadJAXBProperties(ClassLoader classLoader, String propFileName) throws JAXBException {
 
         Properties props = null;
-
         try {
             URL url;
-            if(classLoader==null)
+            if (classLoader == null)
                 url = ClassLoader.getSystemResource(propFileName);
             else
-                url = classLoader.getResource( propFileName );
+                url = classLoader.getResource(propFileName);
 
-            if( url != null ) {
+            if (url != null) {
                 logger.log(Level.FINE, "loading props from {0}", url);
                 props = new Properties();
                 InputStream is = url.openStream();
-                props.load( is );
+                props.load(is);
                 is.close();
             }
-        } catch( IOException ioe ) {
-            logger.log(Level.FINE,"Unable to load "+propFileName,ioe);
-            throw new JAXBException( ioe.toString(), ioe );
+        } catch (IOException ioe) {
+            logger.log(Level.FINE, "Unable to load " + propFileName, ioe);
+            throw new JAXBException(ioe.toString(), ioe);
         }
 
         return props;
@@ -520,7 +416,7 @@
 
         String classnameAsResource = clazz.getName().replace('.', '/') + ".class";
 
-        if(loader == null) {
+        if (loader == null) {
             loader = getSystemClassLoader();
         }
 
@@ -543,50 +439,7 @@
         return which(clazz, getClassClassLoader(clazz));
     }
 
-    /**
-     * When JAXB is in J2SE, rt.jar has to have a JAXB implementation.
-     * However, rt.jar cannot have META-INF/services/javax.xml.bind.JAXBContext
-     * because if it has, it will take precedence over any file that applications have
-     * in their jar files.
-     *
-     * <p>
-     * When the user bundles his own JAXB implementation, we'd like to use it, and we
-     * want the platform default to be used only when there's no other JAXB provider.
-     *
-     * <p>
-     * For this reason, we have to hard-code the class name into the API.
-     */
-    private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory";
-
-    /**
-     * Loads the class, provided that the calling thread has an access to the class being loaded.
-     */
-    private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
-       logger.log(Level.FINE, "Trying to load {0}", className);
-       try {
-          // make sure that the current thread has an access to the package of the given name.
-          SecurityManager s = System.getSecurityManager();
-          if (s != null) {
-              int i = className.lastIndexOf('.');
-              if (i != -1) {
-                  s.checkPackageAccess(className.substring(0,i));
-              }
-          }
-
-          if (classLoader == null) {
-              return Class.forName(className);
-          } else {
-              return classLoader.loadClass(className);
-          }
-       } catch (SecurityException se) {
-           // anyone can access the platform default factory class without permission
-           if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className)) {
-              return Class.forName(className);
-           }
-           throw se;
-       }
-    }
-
+    @SuppressWarnings("unchecked")
     private static ClassLoader getContextClassLoader() {
         if (System.getSecurityManager() == null) {
             return Thread.currentThread().getContextClassLoader();
@@ -600,6 +453,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     private static ClassLoader getClassClassLoader(final Class c) {
         if (System.getSecurityManager() == null) {
             return c.getClassLoader();
@@ -626,4 +480,50 @@
         }
     }
 
+    // TODO: to be removed - SPEC change required
+    //    ServiceLoaderUtil.firstByServiceLoaderD