Merge pull request #465 from alibaba/wip_dragonwell_extended_squash_branch

Merge remote-tracking branch 'upstream/master' into dragonwell

Author: yuleil

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk8u
 jbs=JDK
-version=openjdk8u352
+version=openjdk8u362
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace

common/autoconf/version-numbers

@@ -26,7 +26,7 @@
 JDK_MAJOR_VERSION=1
 JDK_MINOR_VERSION=8
 JDK_MICRO_VERSION=0
-JDK_UPDATE_VERSION=352
+JDK_UPDATE_VERSION=362
 LAUNCHER_NAME=openjdk
 PRODUCT_NAME=OpenJDK
 PRODUCT_SUFFIX="Runtime Environment"

corba/.jcheck/conf

@@ -317,6 +317,8 @@ public static int makePersistent( int scid )
     public static final String DYNAMIC_STUB_FACTORY_FACTORY_CLASS =
         SUN_PREFIX + "ORBDynamicStubFactoryFactoryClass" ;
 
+    public static final String ALLOW_DESERIALIZE_OBJECT = SUN_PREFIX + "ORBAllowDeserializeObject" ;
+
     // Constants for NameService properties ************************************
 
     public static final int DEFAULT_INITIAL_PORT                 = 900;

corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java

@@ -342,6 +342,11 @@ protected void writeSerializationMethods ()
     stream.println ("  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException");
     stream.println ("  {");
     stream.println ("     String str = s.readUTF ();");
+    if ("DynAnyFactory".equals (i.name ())) {
+      stream.println ("     if (!str.startsWith(com.sun.corba.se.impl.orbutil.ORBConstants.STRINGIFY_PREFIX) &&");
+      stream.println ("         !Boolean.getBoolean(com.sun.corba.se.impl.orbutil.ORBConstants.ALLOW_DESERIALIZE_OBJECT))");
+      stream.println ("       throw new java.io.InvalidObjectException(\"IOR: expected\");");
+    }
     stream.println ("     String[] args = null;");
     stream.println ("     java.util.Properties props = null;");
     stream.println ("     org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init (args, props);");

corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java

@@ -1816,9 +1816,13 @@ void os::win32::print_windows_version(outputStream* st) {
     }
     break;
 
-  case 6004:
+  case 10000:
     if (is_workstation) {
-      st->print("10");
+      if (build_number >= 22000) {
+        st->print("11");
+      } else {
+        st->print("10");
+      }
     } else {
       // distinguish Windows Server by build number
       // - 2016 GA 10/2016 build: 14393

hotspot/.jcheck/conf

@@ -214,7 +214,7 @@ JVM_handle_aix_signal(int sig, siginfo_t* info, void* ucVoid, int abort_if_unrec
   // SafeFetch 32 handling:
   // - make it work if _thread is null
   // - make it use the standard os::...::ucontext_get/set_pc APIs
-  if (uc) {
+  if ((sig == SIGSEGV || sig == SIGBUS) && uc) {
     address const pc = os::Aix::ucontext_get_pc(uc);
     if (pc && StubRoutines::is_safefetch_fault(pc)) {
       os::Aix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc));

hotspot/src/os/windows/vm/os_windows.cpp

@@ -462,13 +462,13 @@ JVM_handle_bsd_signal(int sig,
   if (info != NULL && uc != NULL && thread != NULL) {
     pc = (address) os::Bsd::ucontext_get_pc(uc);
 
-    if (StubRoutines::is_safefetch_fault(pc)) {
-      uc->context_pc = intptr_t(StubRoutines::continuation_for_safefetch_fault(pc));
-      return 1;
-    }
-
-    // Handle ALL stack overflow variations here
     if (sig == SIGSEGV || sig == SIGBUS) {
+      if (StubRoutines::is_safefetch_fault(pc)) {
+        uc->context_pc = intptr_t(StubRoutines::continuation_for_safefetch_fault(pc));
+        return 1;
+      }
+
+      // Handle ALL stack overflow variations here
       address addr = (address) info->si_addr;
 
       // check if fault address is within thread stack

hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp

@@ -251,7 +251,7 @@ JVM_handle_linux_signal(int sig,
   if (info != NULL && uc != NULL && thread != NULL) {
     pc = (address) os::Linux::ucontext_get_pc(uc);
 
-    if (StubRoutines::is_safefetch_fault(pc)) {
+    if ((sig == SIGSEGV || sig == SIGBUS) && StubRoutines::is_safefetch_fault(pc)) {
       uc->uc_mcontext.pc = intptr_t(StubRoutines::continuation_for_safefetch_fault(pc));
       return 1;
     }