[GR-59521] Tag stack trace with method layer information.

PullRequest: graal/21846

Author: dominikmascherbauer

substratevm/debug/gdbpy/gdb-debughelpers.py

@@ -1736,8 +1736,17 @@ def function(self) -> str:
         else:
             eclipse_filename = ''
 
+        sal = frame.find_sal()
+        objfile_filename = ''
+        if sal and sal.symtab and sal.symtab.objfile:
+            objfile = sal.symtab.objfile
+            if objfile.owner:
+                # avoid showing the '.debug' file
+                objfile = objfile.owner
+            objfile_filename = ' in ' + os.path.basename(objfile.filename)
+
         prefix = '[LAZY DEOPT FRAME] ' if self.__lazy_deopt else ''
-        return prefix + func_name + eclipse_filename
+        return prefix + func_name + eclipse_filename + objfile_filename
 
 
 class SymValueWrapper:

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

@@ -74,6 +74,7 @@
 import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.LayoutEncoding;
+import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.jdk.UninterruptibleUtils;
 import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicWord;
 import com.oracle.svm.core.locks.VMLockSupport;
@@ -941,12 +942,18 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
             }
 
             CodeInfo info = CodeInfoTable.getFirstImageCodeInfo();
+            int layerNumber = 0;
             do {
                 Pointer codeStart = (Pointer) CodeInfoAccess.getCodeStart(info);
                 UnsignedWord codeSize = CodeInfoAccess.getCodeSize(info);
                 Pointer codeEnd = codeStart.add(codeSize).subtract(1);
-                log.string("AOT compiled code: ").zhex(codeStart).string(" - ").zhex(codeEnd).newline();
+                log.string("AOT compiled code");
+                if (ImageLayerBuildingSupport.buildingImageLayer()) {
+                    log.string(" - Layer ").unsigned(layerNumber);
+                }
+                log.string(": ").zhex(codeStart).string(" - ").zhex(codeEnd).newline();
                 info = CodeInfoAccess.getNextImageCodeInfo(info);
+                layerNumber++;
             } while (info.isNonNull());
 
             log.indent(false);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java

@@ -40,6 +40,7 @@
 import com.oracle.svm.core.deopt.DeoptimizationSupport;
 import com.oracle.svm.core.deopt.DeoptimizedFrame;
 import com.oracle.svm.core.heap.RestrictHeapAccess;
+import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.log.Log;
 
 import jdk.graal.compiler.word.Word;
@@ -224,6 +225,7 @@ private void logFrameRaw(Log log, Pointer sp, CodePointer ip, CodeInfo codeInfo)
         }
 
         private void logFrameRaw(Log log, Pointer sp, CodePointer ip, long frameSize) {
+            logLayer(log, ip);
             logSPAndIP(log, sp, ip);
             log.string(" size=");
             if (frameSize >= 0) {
@@ -237,6 +239,23 @@ private void logFrameRaw(Log log, Pointer sp, CodePointer ip, long frameSize) {
             printedFrames++;
         }
 
+        private static void logLayer(Log log, CodePointer ip) {
+            if (ImageLayerBuildingSupport.buildingImageLayer()) {
+                CodeInfo info = CodeInfoTable.getFirstImageCodeInfo();
+                int layerNumber = 0;
+                while (info.isNonNull()) {
+                    if (CodeInfoAccess.contains(info, ip)) {
+                        log.string("L").unsigned(layerNumber).spaces(2);
+                        return;
+                    }
+                    info = CodeInfoAccess.getNextImageCodeInfo(info);
+                    layerNumber++;
+                }
+                // No layer information found, print spaces for alignment.
+                log.spaces(4);
+            }
+        }
+
         private static void logSPAndIP(Log log, Pointer sp, CodePointer ip) {
             log.string("SP ").zhex(sp).spaces(1);
             log.string("IP ").zhex(ip);