From 26048ea21e0da6505d8452bd33a4d37b1bd5ce74 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Thu, 2 Jun 2022 19:28:20 +0000
Subject: [PATCH] 8287695: Use String.contains() instead of String.indexOf() in
jdk.hotspot.agent
Reviewed-by: cjplummer
---
.../classes/sun/jvm/hotspot/CommandProcessor.java | 4 ++--
.../jvm/hotspot/tools/jcore/ByteCodeRewriter.java | 14 +++++---------
.../sun/jvm/hotspot/utilities/StreamMonitor.java | 6 +++---
.../hotspot/utilities/SystemDictionaryHelper.java | 7 ++-----
4 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
index 2676802865e..57a5bc03f1b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -279,7 +279,7 @@ public class CommandProcessor {
}
void quote(String s) {
- if (s.indexOf(" ") == -1) {
+ if (!s.contains(" ")) {
out.print(s);
} else {
out.print("\"");
@@ -342,7 +342,7 @@ public class CommandProcessor {
Address lookup(String symbol) {
- if (symbol.indexOf("::") != -1) {
+ if (symbol.contains("::")) {
String[] parts = symbol.split("::");
StringBuilder mangled = new StringBuilder("__1c");
for (int i = 0; i < parts.length; i++) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
index ca7f78eecc8..549b5455a75 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -27,13 +27,9 @@ package sun.jvm.hotspot.tools.jcore;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.runtime.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.AccessControlContext;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
public class ByteCodeRewriter
{
@@ -92,7 +88,7 @@ public class ByteCodeRewriter
case 2: cpCacheIndex = method.getBytecodeByteArg(bci); break;
case 3: cpCacheIndex = method.getBytecodeShortArg(bci); break;
case 5:
- if (fmt.indexOf("__") >= 0)
+ if (fmt.contains("__"))
cpCacheIndex = method.getBytecodeShortArg(bci);
else
cpCacheIndex = method.getBytecodeIntArg(bci);
@@ -102,15 +98,15 @@ public class ByteCodeRewriter
if (cpCache == null) {
return (short) cpCacheIndex;
- } else if (fmt.indexOf("JJJJ") >= 0) {
+ } else if (fmt.contains("JJJJ")) {
// Invokedynamic require special handling
cpCacheIndex = ~cpCacheIndex;
cpCacheIndex = bytes.swapInt(cpCacheIndex);
return (short) cpCache.getEntryAt(cpCacheIndex).getConstantPoolIndex();
- } else if (fmt.indexOf("JJ") >= 0) {
+ } else if (fmt.contains("JJ")) {
// change byte-ordering and go via cache
return (short) cpCache.getEntryAt((int) (0xFFFF & bytes.swapShort((short)cpCacheIndex))).getConstantPoolIndex();
- } else if (fmt.indexOf("j") >= 0) {
+ } else if (fmt.contains("j")) {
// go via cache
return (short) cpCache.getEntryAt((int) (0xFF & cpCacheIndex)).getConstantPoolIndex();
} else {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java
index 92355487c34..28cc2f950a5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.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
@@ -63,7 +63,7 @@ public class StreamMonitor implements Runnable {
boolean matches(String str) {
for (int i = 0; i < triggerStrings.length; i++) {
- if (str.indexOf(triggerStrings[i]) == -1) {
+ if (!str.contains(triggerStrings[i])) {
return false;
}
}
@@ -198,7 +198,7 @@ public class StreamMonitor implements Runnable {
// Check wait string
if ((waitString != null) &&
- (str.indexOf(waitString) != -1)) {
+ str.contains(waitString)) {
waitStringSeen = true;
notifyAll();
}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java
index 3f9936536a7..6222d83707b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -27,10 +27,7 @@ package sun.jvm.hotspot.utilities;
import java.util.*;
import sun.jvm.hotspot.classfile.*;
import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
public class SystemDictionaryHelper {
static {
@@ -84,7 +81,7 @@ public class SystemDictionaryHelper {
Vector<InstanceKlass> tmp = new Vector<>();
for (int i = 0; i < tmpKlasses.length; i++) {
String name = tmpKlasses[i].getName().asString();
- if (name.indexOf(namePart) != -1) {
+ if (name.contains(namePart)) {
tmp.add(tmpKlasses[i]);
}
}