Further minor fixes.

Author: christianhaeubl

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java

@@ -1065,7 +1065,7 @@ UnsignedWord possibleCollectionPrologue() {
     }
 
     /**
-     * Do whatever is necessary if a collection occurred since the a call to
+     * Do whatever is necessary if a collection occurred since the call to
      * {@link #possibleCollectionPrologue()}. Note that this method may get called by several
      * threads for the same collection.
      */

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

@@ -34,6 +34,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.oracle.svm.core.log.Log;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
@@ -170,7 +171,7 @@ public static int runCore() {
              */
             RuntimeSupport.getRuntimeSupport().shutdown();
 
-            Counter.logValues();
+            Counter.logValues(Log.log());
         }
         return exitCode;
     }

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

@@ -130,10 +130,8 @@ public static void printInformation(Log log, Pointer sp, CodePointer ip) {
     }
 
     /**
-     * This method prints diagnostic information. This method prints less information than
-     * {@link #printFatalError} as it only uses reasonably safe operations and memory accesses. So,
-     * as long as all parts of Native Image are fully functional, calling this method will never
-     * cause a crash.
+     * Prints less detailed information than {@link #printFatalError} but this method guarantees
+     * that it won't cause a crash if all parts of Native Image are fully functional.
      */
     public static void printInformation(Log log, Pointer sp, CodePointer ip, RegisterDumper.Context registerContext, boolean frameHasCalleeSavedRegisters) {
         // Stack allocate an error context.
@@ -162,18 +160,17 @@ public static boolean printFatalError(Log log, Pointer sp, CodePointer ip) {
     }
 
     /**
-     * This method prints extensive diagnostic information and is only called for fatal errors. This
-     * method may use operations and memory accesses that are not necessarily 100% safe. So, even if
-     * all parts of Native Image are fully functional, this method may cause crashes.
+     * Used to print extensive diagnostic information in case of a fatal error. This method may use
+     * operations and memory accesses that are not necessarily 100% safe. So, even if all parts of
+     * Native Image are fully functional, this method may cause crashes.
      * <p>
-     * If a segfault handler is present, then this method will be called recursively multiple times
+     * If a segfault handler is present, then this method may be called recursively multiple times
      * if further errors happen while printing diagnostics. On each recursive invocation, the level
-     * of detail of the diagnostic output will be reduced gradually. This recursion will terminate
-     * once the maximum amount of information is printed.
+     * of detail of the diagnostic output will be reduced gradually.
      * <p>
      * In scenarios without a segfault handler, it can happen that this method reliably causes a
      * subsequent error that crashes Native Image. In such a case, try to reduce the level of detail
-     * of the diagnostic output (see {@link SubstrateOptions#DiagnosticDetails} to get a reasonably
+     * of the diagnostic output (see {@link SubstrateOptions#DiagnosticDetails}) to get a reasonably
      * complete diagnostic output.
      */
     public static boolean printFatalError(Log log, Pointer sp, CodePointer ip, RegisterDumper.Context registerContext, boolean frameHasCalleeSavedRegisters) {
@@ -346,6 +343,7 @@ private static int parseInvocationCount(String entry, int pos) {
         try {
             initialInvocationCount = Integer.parseInt(entry.substring(pos + 1));
         } catch (NumberFormatException e) {
+            // handled below
         }
 
         if (initialInvocationCount < 1) {
@@ -514,25 +512,29 @@ public int maxInvocationCount() {
         @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate while printing diagnostics.")
         public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLevel, int invocationCount) {
             Pointer sp = context.getStackPointer();
+            UnsignedWord stackBase = VMThreads.StackBase.get();
             log.string("Top of stack (sp=").zhex(sp).string("):").indent(true);
 
-            UnsignedWord stackBase = VMThreads.StackBase.get();
+            int bytesToPrint = computeBytesToPrint(sp, stackBase);
+            log.hexdump(sp, 8, bytesToPrint / 8);
+            log.indent(false).newline();
+        }
+
+        private static int computeBytesToPrint(Pointer sp, UnsignedWord stackBase) {
             if (stackBase.equal(0)) {
                 /*
                  * We have to be careful here and not dump too much of the stack: if there are not
                  * many frames on the stack, we segfault when going past the beginning of the stack.
                  */
-                log.hexdump(sp, 8, 16);
-            } else {
-                int bytesToPrint = 512;
-                UnsignedWord availableBytes = stackBase.subtract(sp);
-                if (availableBytes.belowThan(bytesToPrint)) {
-                    bytesToPrint = NumUtil.safeToInt(availableBytes.rawValue());
-                }
+                return 128;
+            }
 
-                log.hexdump(sp, 8, bytesToPrint / 8);
+            int bytesToPrint = 512;
+            UnsignedWord availableBytes = stackBase.subtract(sp);
+            if (availableBytes.belowThan(bytesToPrint)) {
+                bytesToPrint = NumUtil.safeToInt(availableBytes.rawValue());
             }
-            log.indent(false).newline();
+            return bytesToPrint;
         }
     }
 

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

@@ -606,8 +606,8 @@ private static int getHostPageSize() {
         }
     }
 
-    @Option(help = "Allows to specify how many details should be printed for certain diagnostic thunk, e.g.: 'DumpThreads:1,DumpRegisters:2'. " +
-                    "A value of 1 will result in the maximum amount of information, higher values will result in less information. " +
+    @Option(help = "Specifies how many details are printed for certain diagnostic thunks, e.g.: 'DumpThreads:1,DumpRegisters:2'. " +
+                    "A value of 1 will result in the maximum amount of information, higher values will print less information. " +
                     "By default, the most detailed output is enabled for all diagnostic thunks. Wildcards (*) are supported in the name of the diagnostic thunk.", type = Expert)//
     public static final RuntimeOptionKey<String> DiagnosticDetails = new RuntimeOptionKey<String>("") {
         @Override

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

@@ -252,7 +252,7 @@ public interface Thunk {
         void invoke();
     }
 
-    /** Prints extensive diagnostic information to the given Log. */
+    /** Prints extensive diagnostic information for a fatal error to the given log. */
     public static boolean printDiagnostics(Log log, Pointer sp, CodePointer ip) {
         return SubstrateDiagnostics.printFatalError(log, sp, ip, WordFactory.nullPointer(), false);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java

@@ -582,7 +582,7 @@ public static boolean printLocationInfo(Log log, UnsignedWord value, boolean all
 
             if (allowUnsafeOperations || VMOperation.isInProgressAtSafepoint()) {
                 // If we are not at a safepoint, then it is unsafe to access thread locals of
-                // another thread is unsafe as the IsolateThread could be freed at any time.
+                // another thread as the IsolateThread could be freed at any time.
                 UnsignedWord stackBase = StackBase.get(thread);
                 UnsignedWord stackEnd = StackEnd.get(thread);
                 if (value.belowThan(stackBase) && value.aboveOrEqual(stackEnd)) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateDiagnosticFeature.java

@@ -26,14 +26,12 @@
 
 import java.lang.reflect.Field;
 
-import com.oracle.svm.core.SubstrateDiagnostics;
-import com.oracle.svm.core.SubstrateDiagnostics.FatalErrorState;
-import com.sun.tools.javac.util.FatalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegister;
+import com.oracle.svm.core.SubstrateDiagnostics.FatalErrorState;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.util.VMError;