Improve Native Image fatal error diagnostics.

Author: christianhaeubl

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java

@@ -179,7 +179,7 @@ interface LINUX extends InternalPlatform.PLATFORM_JNI, InternalPlatform.NATIVE_O
          * @since 21.0
          */
         default String getOS() {
-            return LINUX.class.getSimpleName().toLowerCase();
+            return "linux";
         }
     }
 
@@ -196,7 +196,7 @@ interface ANDROID extends LINUX {
          * @since 21.0
          */
         default String getOS() {
-            return ANDROID.class.getSimpleName().toLowerCase();
+            return "android";
         }
     }
 
@@ -221,7 +221,7 @@ interface IOS extends DARWIN {
          * @since 21.0
          */
         default String getOS() {
-            return IOS.class.getSimpleName().toLowerCase();
+            return "ios";
         }
     }
 
@@ -255,7 +255,7 @@ interface WINDOWS extends InternalPlatform.PLATFORM_JNI, InternalPlatform.NATIVE
          * @since 21.0
          */
         default String getOS() {
-            return WINDOWS.class.getSimpleName().toLowerCase();
+            return "windows";
         }
     }
 

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java

@@ -28,6 +28,7 @@
 import org.graalvm.nativeimage.c.function.CEntryPoint.Publish;
 import org.graalvm.nativeimage.c.function.CEntryPointLiteral;
 import org.graalvm.nativeimage.c.struct.SizeOf;
+import org.graalvm.nativeimage.c.type.VoidPointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordFactory;
 
@@ -77,7 +78,10 @@ protected void printSignalInfo(Log log, PointerBase signalInfo) {
             if (sigInfo.si_errno() != 0) {
                 log.string(", si_errno: ").signed(sigInfo.si_errno());
             }
-            log.string(", si_addr: ").zhex(sigInfo.si_addr());
+
+            VoidPointer addr = sigInfo.si_addr();
+            log.string(", si_addr: ");
+            printSegfaultAddressInfo(log, addr.rawValue());
             log.newline();
         }
     }

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java

@@ -119,7 +119,8 @@ protected void printSignalInfo(Log log, PointerBase signalInfo) {
             } else {
                 log.string(", ExceptionInformation=").zhex(operation);
             }
-            log.string(" ").zhex(exInfo.addressOf(1).read());
+            log.string(" ");
+            printSegfaultAddressInfo(log, exInfo.addressOf(1).read());
         } else {
             if (numParameters > 0) {
                 log.string(", ExceptionInformation=");

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccess.java

@@ -26,9 +26,17 @@
 
 import java.util.EnumSet;
 
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.nativeimage.ImageSingletons;
+
 import jdk.vm.ci.code.Architecture;
 
 public interface CPUFeatureAccess {
+    @Fold
+    static CPUFeatureAccess singleton() {
+        return ImageSingletons.lookup(CPUFeatureAccess.class);
+    }
+
     int verifyHostSupportsArchitectureEarly();
 
     void verifyHostSupportsArchitectureEarlyOrExit();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java

@@ -73,7 +73,7 @@
 import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.thread.ThreadListenerSupport;
 import com.oracle.svm.core.thread.VMThreads;
-import com.oracle.svm.core.util.Counter;
+import com.oracle.svm.core.util.CounterSupport;
 import com.oracle.svm.core.util.VMError;
 
 @InternalVMMethod
@@ -206,7 +206,7 @@ private static void runShutdown0() {
          */
         RuntimeSupport.getRuntimeSupport().shutdown();
 
-        Counter.logValues(Log.log());
+        CounterSupport.singleton().logValues(Log.log());
     }
 
     @Uninterruptible(reason = "Thread state not set up yet.")