8293879: Remove unnecessary castings in jdk.hotspot.agent

Reviewed-by: lmesnik, cjplummer

Author: Andrey Turbanov

src/jdk.hotspot.agent/share/classes/com/sun/java/swing/action/ActionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -60,7 +60,7 @@ protected void addAction(String cmdname, Action action)
 
     public Action getAction(String key)
     {
-        return (Action)actions.get(key);
+        return actions.get(key);
     }
 
     public DelegateAction getDelegateAction(String name)

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java

@@ -197,7 +197,7 @@ void add(String s, ArrayList<String> t) {
                     add(w[i], t);
                 }
             }
-            tokens = (String[])t.toArray(new String[0]);
+            tokens = t.toArray(new String[0]);
             i = 0;
             length = tokens.length;
 
@@ -768,7 +768,7 @@ public int compare(Object o1, Object o2) {
                           });
                     for (int i = 0; i < keys.length; i++) {
                         out.print("  ");
-                        out.println(((Command)commands.get(keys[i])).usage);
+                        out.println(commands.get(keys[i]).usage);
                     }
                 }
             }
@@ -1085,7 +1085,7 @@ public void doit(Tokens t) {
                         n = n.getSuperclass();
                     }
                     while (!pending.isEmpty()) {
-                        n = (Type)pending.pop();
+                        n = pending.pop();
                         dumpType(n);
                         emitted.add(n.getName());
                     }
@@ -1481,7 +1481,7 @@ public void doit(Tokens t) {
                             n = n.getSuperclass();
                         }
                         while (!pending.isEmpty()) {
-                            n = (Type)pending.pop();
+                            n = pending.pop();
                             dumpType(n);
                             emitted.add(n.getName());
                         }
@@ -1986,7 +1986,7 @@ public void visit(Klass k) {
     private boolean doEcho = false;
 
     private Command findCommand(String key) {
-        return (Command)commands.get(key);
+        return commands.get(key);
     }
 
     public void printPrompt() {
@@ -2082,17 +2082,17 @@ public void executeCommand(String ln, boolean putInHistory) {
 
                     String cmd = m.group(2);
                     if (cmd.equals("!!")) {
-                        result.append((String)history.get(history.size() - 1));
+                        result.append(history.get(history.size() - 1));
                     } else if (cmd.equals("!!-")) {
-                        Tokens item = new Tokens((String)history.get(history.size() - 1));
+                        Tokens item = new Tokens(history.get(history.size() - 1));
                         item.trim(1);
                         result.append(item.join(" "));
                     } else if (cmd.equals("!*")) {
-                        Tokens item = new Tokens((String)history.get(history.size() - 1));
+                        Tokens item = new Tokens(history.get(history.size() - 1));
                         item.nextToken();
                         result.append(item.join(" "));
                     } else if (cmd.equals("!$")) {
-                        Tokens item = new Tokens((String)history.get(history.size() - 1));
+                        Tokens item = new Tokens(history.get(history.size() - 1));
                         result.append(item.at(item.countTokens() - 1));
                     } else {
                         String tail = cmd.substring(1);
@@ -2115,13 +2115,13 @@ public void executeCommand(String ln, boolean putInHistory) {
                             if (index > size) {
                                 err.println("No such history item");
                             } else {
-                                result.append((String)history.get(index));
+                                result.append(history.get(index));
                             }
                             break;
                         }
                         default: {
                             for (int i = history.size() - 1; i >= 0; i--) {
-                                String s = (String)history.get(i);
+                                String s = history.get(i);
                                 if (s.startsWith(tail)) {
                                     result.append(s);
                                     break; // only capture the most recent match in the history

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java

@@ -956,7 +956,7 @@ public void run() {
             }
 
             // Add signal information to annotation if necessary
-            SignalInfo sigInfo = (SignalInfo) interruptedFrameMap.get(curFrame);
+            SignalInfo sigInfo = interruptedFrameMap.get(curFrame);
             if (sigInfo != null) {
               // This frame took a signal and we need to report it.
               anno = anno + "\n*** INTERRUPTED BY SIGNAL " + sigInfo.sigNum +
@@ -1778,7 +1778,7 @@ private static JavaVFrame getLastJavaVFrame(JavaThread cur) {
     if (vf.isJavaFrame()) {
       return (JavaVFrame) vf;
     }
-    return (JavaVFrame) vf.javaSender();
+    return vf.javaSender();
   }
 
   // Internal routine for debugging

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java

@@ -488,7 +488,7 @@ private void connectRemoteDebugger() throws DebuggerException {
         RemoteDebugger remote =
         (RemoteDebugger) RMIHelper.lookup(debugServerID);
         debugger = new RemoteDebuggerClient(remote);
-        machDesc = ((RemoteDebuggerClient) debugger).getMachineDescription();
+        machDesc = debugger.getMachineDescription();
         os = debugger.getOS();
         setupJVMLibNames(os);
         cpu = debugger.getCPU();

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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
@@ -96,7 +96,7 @@ public void dumpReplayData(PrintStream out) {
       sub = sub.getNextSiblingKlass();
     }
 
-    final int length = (int) cp.getLength();
+    final int length = cp.getLength();
     out.print("ciInstanceKlass " + name() + " " + (isLinked() ? 1 : 0) + " " + (isInitialized() ? 1 : 0) + " " + length);
     for (int index = 1; index < length; index++) {
       out.print(" " + cp.getTags().at(index));

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java

@@ -229,7 +229,7 @@ public int getOSREntryBCI() {
   }
 
   public NMethod getOSRLink() {
-    return (NMethod) VMObjectFactory.newObject(NMethod.class, osrLinkField.getValue(addr));
+    return VMObjectFactory.newObject(NMethod.class, osrLinkField.getValue(addr));
   }
 
   // MethodHandle
@@ -463,9 +463,9 @@ public void dumpReplayData(PrintStream out) {
       if (h.get(meta) != null) continue;
       h.put(meta, meta);
       if (meta instanceof InstanceKlass) {
-        ((InstanceKlass)meta).dumpReplayData(out);
+        meta.dumpReplayData(out);
       } else if (meta instanceof Method) {
-        ((Method)meta).dumpReplayData(out);
+        meta.dumpReplayData(out);
         MethodData mdo = ((Method)meta).getMethodData();
         if (mdo != null) {
           mdo.dumpReplayData(out);
@@ -481,7 +481,7 @@ public void dumpReplayData(PrintStream out) {
       }
     }
     if (h.get(method.getMethodHolder()) == null) {
-      ((InstanceKlass)method.getMethodHolder()).dumpReplayData(out);
+      method.getMethodHolder().dumpReplayData(out);
     }
     Klass holder = method.getMethodHolder();
     out.println("compile " + holder.getName().asString() + " " +

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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
@@ -50,7 +50,7 @@ public ObjectValue(int id) {
   public int id() { return id; }
   public ScopeValue getKlass() { return klass; }
   public List<ScopeValue> getFieldsValue() { return fieldsValue; }
-  public ScopeValue getFieldAt(int i) { return (ScopeValue)fieldsValue.get(i); }
+  public ScopeValue getFieldAt(int i) { return fieldsValue.get(i); }
   public int fieldsSize() { return fieldsValue.size(); }
 
   // Field "value" is always NULL here since it is used
@@ -82,11 +82,11 @@ public void printOn(PrintStream tty) {
 
   void printFieldsOn(PrintStream tty) {
     if (fieldsValue.size() > 0) {
-      ((ScopeValue)fieldsValue.get(0)).printOn(tty);
+      fieldsValue.get(0).printOn(tty);
     }
     for (int i = 1; i < fieldsValue.size(); i++) {
       tty.print(", ");
-      ((ScopeValue)fieldsValue.get(i)).printOn(tty);
+      fieldsValue.get(i).printOn(tty);
     }
   }
 

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VMRegImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, 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
@@ -53,7 +53,7 @@ private static void initialize(TypeDataBase db) {
     Type type = db.lookupType("VMRegImpl");
     AddressField stack0Field = type.getAddressField("stack0");
     stack0Addr = stack0Field.getValue();
-    stack0Val = (int) stack0Addr.hashCode();
+    stack0Val = stack0Addr.hashCode();
     stack0 = new VMReg(stack0Val);
     regNameField = type.getAddressField("regName[0]");
     stackSlotSize = db.lookupIntConstant("VMRegImpl::stack_slot_size");

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -92,8 +92,8 @@ private static void initialize(TypeDataBase db) {
     if (!VM.getVM().isCore()) {
       REG_COUNT = db.lookupIntConstant("REG_COUNT").intValue();
       if (VM.getVM().isServerCompiler()) {
-        SAVED_ON_ENTRY_REG_COUNT = (int) db.lookupIntConstant("SAVED_ON_ENTRY_REG_COUNT").intValue();
-        C_SAVED_ON_ENTRY_REG_COUNT = (int) db.lookupIntConstant("C_SAVED_ON_ENTRY_REG_COUNT").intValue();
+        SAVED_ON_ENTRY_REG_COUNT = db.lookupIntConstant("SAVED_ON_ENTRY_REG_COUNT").intValue();
+        C_SAVED_ON_ENTRY_REG_COUNT = db.lookupIntConstant("C_SAVED_ON_ENTRY_REG_COUNT").intValue();
       }
     }
   }

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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
@@ -59,7 +59,7 @@ public int getNumLocals() {
   }
 
   public LocalSym getLocal(int i) {
-    return (LocalSym) locals.get(i);
+    return locals.get(i);
   }
 
   public void addLocal(LocalSym local) {