8369994: Mixed mode jhsdb jstack cannot resolve symbol in function ending in call

Reviewed-by: kevinw, cjplummer

Author: YaSuenag

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java

@@ -63,18 +63,24 @@ private LinuxAMD64CFrame(LinuxDebugger dbg, Address cfa, Address rip, DwarfParse
    }
 
    private LinuxAMD64CFrame(LinuxDebugger dbg, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame) {
+      this(dbg, cfa, rip, dwarf, finalFrame, false);
+   }
+
+   private LinuxAMD64CFrame(LinuxDebugger dbg, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame, boolean use1ByteBeforeToLookup) {
       super(dbg.getCDebugger());
       this.cfa = cfa;
       this.rip = rip;
       this.dbg = dbg;
       this.dwarf = dwarf;
       this.finalFrame = finalFrame;
+      this.use1ByteBeforeToLookup = use1ByteBeforeToLookup;
    }
 
    // override base class impl to avoid ELF parsing
    public ClosestSymbol closestSymbolToPC() {
+      Address symAddr = use1ByteBeforeToLookup ? pc().addOffsetTo(-1) : pc();
       // try native lookup in debugger.
-      return dbg.lookup(dbg.getAddressValue(pc()));
+      return dbg.lookup(dbg.getAddressValue(symAddr));
    }
 
    public Address pc() {
@@ -145,19 +151,16 @@ public CFrame sender(ThreadProxy thread) {
      }
 
      DwarfParser nextDwarf = null;
-     Address libptr = dbg.findLibPtrByAddress(nextPC);
-     if (libptr != null) {
-       try {
-         nextDwarf = new DwarfParser(libptr);
-       } catch (DebuggerException e) {
-         // Bail out to Java frame
-       }
-     }
-
-     if (nextDwarf != null) {
+     boolean fallback = false;
+     try {
+       nextDwarf = createDwarfParser(nextPC);
+     } catch (DebuggerException _) {
+       // Try again with RIP-1 in case RIP is just outside function bounds,
+       // due to function ending with a `call` instruction.
        try {
-         nextDwarf.processDwarf(nextPC);
-       } catch (DebuggerException e) {
+         nextDwarf = createDwarfParser(nextPC.addOffsetTo(-1));
+         fallback = true;
+       } catch (DebuggerException _) {
          // DWARF processing should succeed when the frame is native
          // but it might fail if Common Information Entry (CIE) has language
          // personality routine and/or Language Specific Data Area (LSDA).
@@ -166,15 +169,34 @@ public CFrame sender(ThreadProxy thread) {
      }
 
      Address nextCFA = getNextCFA(nextDwarf, context);
-     return isValidFrame(nextCFA, context) ? new LinuxAMD64CFrame(dbg, nextCFA, nextPC, nextDwarf)
+     return isValidFrame(nextCFA, context) ? new LinuxAMD64CFrame(dbg, nextCFA, nextPC, nextDwarf, false, fallback)
                                            : null;
    }
 
+   private DwarfParser createDwarfParser(Address pc) throws DebuggerException {
+     DwarfParser nextDwarf = null;
+     Address libptr = dbg.findLibPtrByAddress(pc);
+     if (libptr != null) {
+       try {
+         nextDwarf = new DwarfParser(libptr);
+       } catch (DebuggerException _) {
+         // Bail out to Java frame
+       }
+     }
+
+     if (nextDwarf != null) {
+       nextDwarf.processDwarf(pc);
+     }
+
+     return nextDwarf;
+   }
+
    // package/class internals only
    private static final int ADDRESS_SIZE = 8;
    private Address rip;
    private Address cfa;
    private LinuxDebugger dbg;
    private DwarfParser dwarf;
    private boolean finalFrame;
+   private boolean use1ByteBeforeToLookup;
 }