8305490: CommandProcessor command "dumpclass" produces classes with i…

…nvalid field descriptors Reviewed-by: cjplummer, fparain
openjdk · Apr 5, 2023 · 78ff454 · 78ff454 · openjdk-notifier · Apr 5, 2023
1 parent 9f587d2
commit 78ff454
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
@@ -300,7 +300,7 @@ public Symbol getSymbolFromIndex(int cpIndex, boolean injected) {
 
   public int getFieldSignatureIndex(int index) {
     if (index >= getJavaFieldsCount()) throw new IndexOutOfBoundsException("not a Java field;");
-    return getField(index).getGenericSignatureIndex();
+    return getField(index).getSignatureIndex();
   }
 
   public Symbol getFieldSignature(int index) {

diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,6 +81,7 @@ public static void main(String[] args) throws Exception {
             System.err.println(out.getStderr());
             out.shouldHaveExitValue(0);
             out.shouldMatch("public class " + APP_DOT_CLASSNAME);
+            out.shouldNotContain("Error:");
         } catch (SkippedException se) {
             throw se;
         } catch (Exception ex) {