Merge hermetic-java-runtime branch with JDK mainline up to openjdk/jdk@1ca7644.

Author: jianglizhou

src/hotspot/share/prims/jvmtiAgent.cpp

@@ -320,7 +320,7 @@ extern "C" {
 }
 
 // Find the OnLoad entry point for -agentlib:  -agentpath:   -Xrun agents.
-static OnLoadEntry_t lookup_On_Load_entry_point(JvmtiAgent* agent, const char* on_load_symbol, bool ignore_errors) {) {
+static OnLoadEntry_t lookup_On_Load_entry_point(JvmtiAgent* agent, const char* on_load_symbol, bool ignore_errors) {
   assert(agent != nullptr, "invariant");
   if (!agent->is_loaded()) {
     if (!load_agent_from_executable(agent, on_load_symbol)) {

src/hotspot/share/utilities/zipLibrary.cpp

@@ -74,27 +74,18 @@ static void* dll_lookup(const char* name, const char* path, bool vm_exit_on_fail
   return func;
 }
 
-static void store_function_pointers(bool is_static, const char* path, bool vm_exit_on_failure) {
+static void store_function_pointers(const char* path, bool vm_exit_on_failure) {
   assert(_zip_handle != nullptr, "invariant");
-  if (!is_static) {
-    ZIP_Open = CAST_TO_FN_PTR(ZIP_Open_t, dll_lookup("ZIP_Open", path, vm_exit_on_failure));
-    ZIP_Close = CAST_TO_FN_PTR(ZIP_Close_t, dll_lookup("ZIP_Close", path, vm_exit_on_failure));
-    ZIP_FindEntry = CAST_TO_FN_PTR(ZIP_FindEntry_t, dll_lookup("ZIP_FindEntry", path, vm_exit_on_failure));
-    ZIP_ReadEntry = CAST_TO_FN_PTR(ZIP_ReadEntry_t, dll_lookup("ZIP_ReadEntry", path, vm_exit_on_failure));
-    ZIP_CRC32 = CAST_TO_FN_PTR(ZIP_CRC32_t, dll_lookup("ZIP_CRC32", path, vm_exit_on_failure));
-    // The following entry points are most likely optional from a zip library implementation perspective.
-    // Hence no vm_exit on a resolution failure. Further refactorings should investigate this,
-    // and if possible, streamline setting all entry points consistently.
-    ZIP_GZip_InitParams = CAST_TO_FN_PTR(ZIP_GZip_InitParams_t, dll_lookup("ZIP_GZip_InitParams", path, false));
-    ZIP_GZip_Fully = CAST_TO_FN_PTR(ZIP_GZip_Fully_t, dll_lookup("ZIP_GZip_Fully", path, false));
-  } else {
-    ZIP_Open = CAST_TO_FN_PTR(ZIP_Open_t, os::lookup_function("ZIP_Open"));
-    ZIP_Close = CAST_TO_FN_PTR(ZIP_Close_t, os::lookup_function("ZIP_Close"));
-    ZIP_FindEntry = CAST_TO_FN_PTR(ZIP_FindEntry_t, os::lookup_function("ZIP_FindEntry"));
-    ZIP_ReadEntry = CAST_TO_FN_PTR(ZIP_ReadEntry_t, os::lookup_function("ZIP_ReadEntry"));
-    ZIP_CRC32 = CAST_TO_FN_PTR(ZIP_CRC32_t, os::lookup_function("ZIP_CRC32"));
-    ZIP_GZip_InitParams = CAST_TO_FN_PTR(ZIP_GZip_InitParams_t, os::lookup_function("ZIP_GZip_InitParams"));    ZIP_GZip_Fully = CAST_TO_FN_PTR(ZIP_GZip_Fully_t, os::lookup_function("ZIP_GZip_Fully"));
-  }
+  ZIP_Open = CAST_TO_FN_PTR(ZIP_Open_t, dll_lookup("ZIP_Open", path, vm_exit_on_failure));
+  ZIP_Close = CAST_TO_FN_PTR(ZIP_Close_t, dll_lookup("ZIP_Close", path, vm_exit_on_failure));
+  ZIP_FindEntry = CAST_TO_FN_PTR(ZIP_FindEntry_t, dll_lookup("ZIP_FindEntry", path, vm_exit_on_failure));
+  ZIP_ReadEntry = CAST_TO_FN_PTR(ZIP_ReadEntry_t, dll_lookup("ZIP_ReadEntry", path, vm_exit_on_failure));
+  ZIP_CRC32 = CAST_TO_FN_PTR(ZIP_CRC32_t, dll_lookup("ZIP_CRC32", path, vm_exit_on_failure));
+  // The following entry points are most likely optional from a zip library implementation perspective.
+  // Hence no vm_exit on a resolution failure. Further refactorings should investigate this,
+  // and if possible, streamline setting all entry points consistently.
+  ZIP_GZip_InitParams = CAST_TO_FN_PTR(ZIP_GZip_InitParams_t, dll_lookup("ZIP_GZip_InitParams", path, false));
+  ZIP_GZip_Fully = CAST_TO_FN_PTR(ZIP_GZip_Fully_t, dll_lookup("ZIP_GZip_Fully", path, false));
 }
 
 static void load_zip_library(bool vm_exit_on_failure) {

src/java.base/share/classes/sun/net/NetProperties.java

@@ -56,7 +56,7 @@ private static Properties loadDefaultProperties(Properties props) {
             } catch (IOException e) {
                 // Do nothing. Same as below.
             }
-            return;
+            return props;
         }
 
         String fname = StaticProperty.javaHome();

src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java

@@ -121,7 +121,7 @@ private TrustStoreDescriptor(String storeName, String storeType,
         static TrustStoreDescriptor createInstance() {
             // Get the system properties for trust store.
             String storePropName = System.getProperty(
-                    "javax.net.ssl.trustStore", jsseDefaultStore);
+                    "javax.net.ssl.trustStore", jsseDefaultStoreName);
             String storePropType = System.getProperty(
                     "javax.net.ssl.trustStoreType",
                     KeyStore.getDefaultType());
@@ -177,7 +177,7 @@ static TrustStoreDescriptor createInstance() {
                         if (FilePaths.class.getResource(fileName) != null) {
                             // Keep temporaryFile as null in hermetic case.
                             temporaryName = fileName;
-                            temporaryTime = JavaHome.hermeticImageFile().lastModified();
+                            temporaryTime = JavaHome.hermeticExecutableFile().lastModified();
                             break;
                         }
                     }

src/java.base/share/native/libjimage/jimage.cpp

@@ -42,6 +42,7 @@
  */
 extern "C" {
 DEF_STATIC_JNI_OnLoad
+}
 
 /*
  * JImageOpen - Given the supplied full path file name, open an image file. This

src/java.desktop/share/classes/sun/font/SunFontManager.java

@@ -314,33 +314,34 @@ protected SunFontManager() {
                         String name = br.readLine();
                         if (name == null) {
                             break;
-                    } else {
-                        if (FontUtilities.debugFonts()) {
-                            FontUtilities.logWarning("read bad font: " + name);
+                        } else {
+                            if (FontUtilities.debugFonts()) {
+                                FontUtilities.logWarning("read bad font: " + name);
+                            }
+                            badFonts.add(name);
                         }
-                        badFonts.add(name);
                     }
+                } catch (IOException e) {
                 }
-            } catch (IOException e) {
             }
-        }
 
-        /* Here we get the fonts in jre/lib/fonts and register
-         * them so they are always available and preferred over
-         * other fonts. This needs to be registered before the
-         * composite fonts as otherwise some native font that
-         * corresponds may be found as we don't have a way to
-         * handle two fonts of the same name, so the JRE one
-         * must be the first one registered. Pass "true" to
-         * registerFonts method as on-screen these JRE fonts
-         * always go through the JDK rasteriser.
-         */
-        if (FontUtilities.isLinux) {
-            /* Linux font configuration uses these fonts */
-            registerFontDir(jreFontDirName);
-        }
-        registerFontsInDir(jreFontDirName, true, Font2D.JRE_RANK,
+            /* Here we get the fonts in jre/lib/fonts and register
+             * them so they are always available and preferred over
+             * other fonts. This needs to be registered before the
+             * composite fonts as otherwise some native font that
+             * corresponds may be found as we don't have a way to
+             * handle two fonts of the same name, so the JRE one
+             * must be the first one registered. Pass "true" to
+             * registerFonts method as on-screen these JRE fonts
+             * always go through the JDK rasteriser.
+             */
+            if (FontUtilities.isLinux) {
+                /* Linux font configuration uses these fonts */
+                registerFontDir(jreFontDirPath.toString());
+            } 
+            registerFontsInDir(jreFontDirPath.toString(), true, Font2D.JRE_RANK,
                            true, false);
+        }
 
         /* Create the font configuration and get any font path
          * that might be specified.
@@ -399,7 +400,7 @@ protected SunFontManager() {
         }
 
         if (FontUtilities.debugFonts()) {
-            FontUtilities.logInfo("JRE font directory: " + jreFontDirName);
+            FontUtilities.logInfo("JRE font directory: " + jreFontDirPath);
             FontUtilities.logInfo("Extra font path: " + extraFontPath);
             FontUtilities.logInfo("Debug font path: " + dbgFontPath);
         }

src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c

@@ -151,9 +151,6 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
                                    jbuf);
 
         awtHandle = dlopen(buf, RTLD_LAZY | RTLD_GLOBAL);
-    } else {
-        // FIXME: This should be integrated into mainline.
-        awtHandle = dlopen(NULL, RTLD_LAZY);
     }
 
     return JNI_VERSION_1_2;

src/java.logging/share/classes/java/util/logging/LogManager.java

@@ -1264,13 +1264,7 @@ InputStream getConfigurationInputStream() throws IOException {
         if (fname == null) {
             String config = "logging.properties";
             if (JavaHome.isHermetic()) {
-                PrivilegedAction<InputStream> getResourceAsStreamAction =
-                    () -> LogManager.class.getResourceAsStream(config);
-                RuntimePermission perm =
-                    new RuntimePermission("accessSystemModules");
-                try (@SuppressWarnings("removal") InputStream is =
-                    AccessController.doPrivileged(
-                        getResourceAsStreamAction, null, perm)) {
+                try (InputStream is = LogManager.class.getResourceAsStream(config)) {
                     if (is != null) {
                         return is;
                     } else {