Merge remote-tracking branch 'upstream/master'

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -1247,14 +1247,16 @@ def generate_debug_info(self, image_config):
         return self.is_debug_supported() and _generate_debuginfo(image_config)
 
     def generate_separate_debug_info(self, image_config):
-        return self.generate_debug_info(image_config) and self._separate_debuginfo_ext
+        return self.generate_debug_info(image_config) and not mx.get_opts().disable_debuginfo_stripping and self._separate_debuginfo_ext
 
     def separate_debuginfo_ext(self):
         return self._separate_debuginfo_ext
 
     def get_debug_flags(self, image_config):
         assert self.is_debug_supported()
         flags = ['-g']
+        if not self.generate_separate_debug_info(image_config):
+            flags += svm_experimental_options(['-H:-StripDebugInfo'])
         return flags
 
 
@@ -4441,6 +4443,7 @@ def graalvm_vendor_version():
 mx.add_argument('--sources', action='store', help='Comma-separated list of projects and distributions of open-source components for which source file archives must be included' + (' (all by default).' if _debuginfo_default else '.'), default=None)
 mx.add_argument('--debuginfo-dists', action='store_true', help='Generate debuginfo distributions.')
 mx.add_argument('--generate-debuginfo', action='store', help='Comma-separated list of launchers and libraries (syntax: lib:polyglot) for which to generate debug information (`native-image -g`) (all by default)', default=None)
+mx.add_argument('--disable-debuginfo-stripping', action='store_true', help='Disable the stripping of debug symbols from the native image.')
 mx.add_argument('--snapshot-catalog', action='store', help='Change the default URL of the component catalog for snapshots.', default=None)
 mx.add_argument('--gds-snapshot-catalog', action='store', help='Change the default appended URL of the component catalog for snapshots.', default=None)
 mx.add_argument('--release-catalog', action='store', help='Change the default URL of the component catalog for releases.', default=None)

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

@@ -251,7 +251,8 @@ UnalignedHeader produceUnalignedChunk(UnsignedWord objectSize) {
         UnalignedHeapChunk.initialize(result, chunkSize);
         assert objectSize.belowOrEqual(HeapChunk.availableObjectMemory(result)) : "UnalignedHeapChunk insufficient for requested object";
 
-        if (HeapParameters.getZapProducedHeapChunks()) {
+        /* Avoid zapping if unaligned chunks are pre-zeroed. */
+        if (!CommittedMemoryProvider.get().areUnalignedChunksZeroed() && HeapParameters.getZapProducedHeapChunks()) {
             zap(result, HeapParameters.getProducedHeapChunkZapWord());
         }
         return result;

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

@@ -163,7 +163,7 @@ public int getCodeAreaSize() {
         return codeAreaSize;
     }
 
-    protected void setCodeAreaSize(int codeAreaSize) {
+    public void setCodeAreaSize(int codeAreaSize) {
         this.codeAreaSize = codeAreaSize;
     }