[GR-58485] ensure libgraal has symbols

PullRequest: graal/18890

Author: tkrodriguez

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.hosted.image;
 
+import static com.oracle.svm.core.SubstrateOptions.DeleteLocalSymbols;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -127,7 +129,7 @@ private static void stripLinux(AfterImageWriteAccessImpl accessImpl) {
 
     private static Path createKeepSymbolsListFile(AfterImageWriteAccessImpl accessImpl) throws IOException {
         Path exportedSymbolsPath = accessImpl.getTempDirectory().resolve("keep-symbols.list").toAbsolutePath();
-        Files.write(exportedSymbolsPath, accessImpl.getImageSymbols(true));
+        Files.write(exportedSymbolsPath, accessImpl.getImageSymbols(DeleteLocalSymbols.getValue()));
         return exportedSymbolsPath;
     }
 }

vm/mx.vm/mx_vm_gate.py

@@ -274,6 +274,15 @@ def _test_libgraal_fatal_error_handling(extra_vm_arguments):
                         pass
                     else:
                         mx.abort('Expected "Fatal error in JVMCI" to be in contents of ' + hs_err + ':' + linesep + contents)
+                # check that the hs_err contains libgraal symbols on supported platforms
+                symbol_patterns = {
+                    'linux' : 'com.oracle.svm.core.jdk.VMErrorSubstitutions::doShutdown',
+                    'darwin' : 'VMErrorSubstitutions_doShutdown',
+                    'windows' : None
+                }
+                pattern = symbol_patterns[mx.get_os()]
+                if pattern and pattern not in contents:
+                    mx.abort('Expected "' + pattern + '" to be in contents of ' + hs_err + ':' + linesep + contents)
 
         if 'JVMCINativeLibraryErrorFile' in out.data and not seen_libjvmci_log:
             mx.abort('Expected a file matching "hs_err_pid*_libjvmci.log" in test directory. Entries found=' + str(listdir(scratch_dir)))