From 47427bce58552e0451f28cf3a96d06848d0ee3da Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sun, 22 Sep 2024 11:51:02 -0400 Subject: [PATCH] Remove unnecessary calls to `toString` --- .../analysis/reflection/AbstractReflectionInterpreter.java | 4 ++-- core/src/main/java/com/ibm/wala/cfg/ShrikeCFG.java | 2 +- .../main/java/com/ibm/wala/classLoader/BytecodeClass.java | 2 +- .../com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java | 2 +- .../main/java/com/ibm/wala/classLoader/ClassLoaderImpl.java | 4 ++-- .../main/java/com/ibm/wala/core/util/shrike/Exceptions.java | 2 +- .../com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java | 2 +- .../com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java | 2 +- .../callgraph/propagation/PropagationCallGraphBuilder.java | 4 ++-- .../propagation/SSAPropagationCallGraphBuilder.java | 4 ++-- core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchy.java | 2 +- .../java/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java | 2 +- core/src/main/java/com/ibm/wala/ssa/SSACFG.java | 2 +- .../main/java/com/ibm/wala/dalvik/classLoader/DexCFG.java | 2 +- .../ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java | 4 ++-- .../dalvik/ipa/callgraph/androidModel/AndroidModel.java | 4 ++-- .../ipa/callgraph/androidModel/AndroidModelClass.java | 2 +- .../com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java | 6 +++--- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/core/src/main/java/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java b/core/src/main/java/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java index 326b3dcd8d..d2a162024a 100644 --- a/core/src/main/java/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java +++ b/core/src/main/java/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java @@ -112,7 +112,7 @@ protected static class ManySubtypesWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + T + ' ' + nImplementors; + return getClass() + " : " + T + ' ' + nImplementors; } public static ManySubtypesWarning create(TypeAbstraction T, int n) { @@ -132,7 +132,7 @@ protected static class NoSubtypesWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + T; + return getClass() + " : " + T; } public static NoSubtypesWarning create(TypeAbstraction T) { diff --git a/core/src/main/java/com/ibm/wala/cfg/ShrikeCFG.java b/core/src/main/java/com/ibm/wala/cfg/ShrikeCFG.java index 6f1c9fe885..402221b5ce 100644 --- a/core/src/main/java/com/ibm/wala/cfg/ShrikeCFG.java +++ b/core/src/main/java/com/ibm/wala/cfg/ShrikeCFG.java @@ -550,7 +550,7 @@ private static class FailedExceptionResolutionWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + T; + return getClass() + " : " + T; } public static FailedExceptionResolutionWarning create(TypeReference T) { diff --git a/core/src/main/java/com/ibm/wala/classLoader/BytecodeClass.java b/core/src/main/java/com/ibm/wala/classLoader/BytecodeClass.java index ba0b66a88c..d5aaa33b22 100644 --- a/core/src/main/java/com/ibm/wala/classLoader/BytecodeClass.java +++ b/core/src/main/java/com/ibm/wala/classLoader/BytecodeClass.java @@ -113,7 +113,7 @@ private static class ClassNotFoundWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + className; + return getClass() + " : " + className; } public static ClassNotFoundWarning create(ImmutableByteArray className) { diff --git a/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java b/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java index e91fa3057a..8fb9300a83 100644 --- a/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java +++ b/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java @@ -146,7 +146,7 @@ private static class InvalidClassLoaderImplementation extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + impl; + return getClass() + " : " + impl; } public static InvalidClassLoaderImplementation create(String impl) { diff --git a/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderImpl.java b/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderImpl.java index 12c8e60610..4c992a69e6 100644 --- a/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderImpl.java +++ b/core/src/main/java/com/ibm/wala/classLoader/ClassLoaderImpl.java @@ -350,7 +350,7 @@ private static class MultipleImplementationsWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + className; + return getClass() + " : " + className; } public static MultipleImplementationsWarning create(String className) { @@ -370,7 +370,7 @@ private static class InvalidClassFile extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + className; + return getClass() + " : " + className; } public static InvalidClassFile create(String className) { diff --git a/core/src/main/java/com/ibm/wala/core/util/shrike/Exceptions.java b/core/src/main/java/com/ibm/wala/core/util/shrike/Exceptions.java index 2ae5509aca..cc121ef712 100644 --- a/core/src/main/java/com/ibm/wala/core/util/shrike/Exceptions.java +++ b/core/src/main/java/com/ibm/wala/core/util/shrike/Exceptions.java @@ -28,7 +28,7 @@ public static class MethodResolutionFailure extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + method; + return getClass() + " : " + method; } public static MethodResolutionFailure moderate(MemberReference method) { diff --git a/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java b/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java index 43e1c83f80..73398b6c3e 100644 --- a/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java +++ b/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java @@ -316,7 +316,7 @@ private static class AllocationFailure extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + t; + return getClass() + " : " + t; } public static AllocationFailure create(TypeReference t) { diff --git a/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java b/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java index a5bf8b76c8..839b1842ac 100644 --- a/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java +++ b/core/src/main/java/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java @@ -354,7 +354,7 @@ public void summarizeByPackage() { .append('/') .append(n.getMethod().getName()) .append('/') - .append(n.getContext().getClass().toString()); + .append(n.getContext().getClass()); if (n.getContext().isA(ReceiverInstanceContext.class)) { nmBuilder diff --git a/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java b/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java index 7022ba324b..f4062763eb 100644 --- a/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java +++ b/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java @@ -276,7 +276,7 @@ private static class EntrypointResolutionWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + entrypoint; + return getClass() + " : " + entrypoint; } public static EntrypointResolutionWarning create(Entrypoint entrypoint) { @@ -467,7 +467,7 @@ private static class ExceptionLookupFailure extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + t; + return getClass() + " : " + t; } public static ExceptionLookupFailure create(TypeReference t) { diff --git a/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java b/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java index 83e3eef634..923a1e4dcb 100644 --- a/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java +++ b/core/src/main/java/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java @@ -2417,7 +2417,7 @@ private static class CheckcastFailure extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + type; + return getClass() + " : " + type; } public static CheckcastFailure create(TypeReference type) { @@ -2440,7 +2440,7 @@ private static class FieldResolutionFailure extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + field; + return getClass() + " : " + field; } public static FieldResolutionFailure create(FieldReference field) { diff --git a/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchy.java b/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchy.java index d5dca66fc8..aec30ca02e 100644 --- a/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchy.java +++ b/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchy.java @@ -1259,7 +1259,7 @@ private static class ClassExclusion extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + klass + ' ' + message; + return getClass() + " : " + klass + ' ' + message; } public static ClassExclusion create(TypeReference klass, String message) { diff --git a/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java b/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java index 842f0cf08b..f1d982884f 100644 --- a/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java +++ b/core/src/main/java/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java @@ -24,7 +24,7 @@ public class ClassHierarchyWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + message; + return getClass() + " : " + message; } public static ClassHierarchyWarning create(String message) { diff --git a/core/src/main/java/com/ibm/wala/ssa/SSACFG.java b/core/src/main/java/com/ibm/wala/ssa/SSACFG.java index 100d9f1d01..6301c08b12 100644 --- a/core/src/main/java/com/ibm/wala/ssa/SSACFG.java +++ b/core/src/main/java/com/ibm/wala/ssa/SSACFG.java @@ -1117,7 +1117,7 @@ private static class ExceptionLoadFailure extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + type + ' ' + method; + return getClass() + " : " + type + ' ' + method; } public static ExceptionLoadFailure create(TypeReference type, IMethod method) { diff --git a/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/DexCFG.java b/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/DexCFG.java index 27d7390267..ff4a55cefb 100644 --- a/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/DexCFG.java +++ b/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/DexCFG.java @@ -690,7 +690,7 @@ private static class FailedExceptionResolutionWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + T; + return getClass() + " : " + T; } public static FailedExceptionResolutionWarning create(TypeReference T) { diff --git a/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java b/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java index 751ec74c42..41bd091cd7 100644 --- a/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java +++ b/dalvik/src/main/java/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java @@ -194,7 +194,7 @@ private static class MultipleDexImplementationsWarning extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + className; + return getClass() + " : " + className; } public static MultipleDexImplementationsWarning create(String className) { @@ -214,7 +214,7 @@ private static class InvalidDexFile extends Warning { @Override public String getMsg() { - return getClass().toString() + " : " + className; + return getClass() + " : " + className; } public static InvalidDexFile create(String className) { diff --git a/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java b/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java index 308781fe82..5a2afaa206 100644 --- a/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java +++ b/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java @@ -915,7 +915,7 @@ public SummarizedMethod getMethodAs( System.err.println("\tcaller=\t" + caller); System.err.println("\tinfo=\t" + info); System.err.println("\tcallerND=\t" + callerNd); - System.err.println("\tthis=\t" + this.getClass().toString()); + System.err.println("\tthis=\t" + this.getClass()); System.err.println("\tthis.name=\t" + this.name); throw new IllegalStateException(e); @@ -954,7 +954,7 @@ public IMethod getMethodEncap() throws CancelException { new TypeSafeInstructionFactory(getClassHierarchy()); final ParameterAccessor acc = new ParameterAccessor(asMethod, /* hasImplicitThis: */ false); final SSAValueManager pm = new SSAValueManager(acc); - pm.breadCrumb = "Encap: " + this.getClass().toString(); + pm.breadCrumb = "Encap: " + this.getClass(); final SummarizedMethod model = getMethod(); diff --git a/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java b/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java index 676bf16d96..f77292ec7e 100644 --- a/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java +++ b/dalvik/src/main/java/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java @@ -104,7 +104,7 @@ public static AndroidModelClass getInstance(IClassHierarchy cha) { throw new IllegalArgumentException( String.format( "android model class does not have expected type %s, but %s!", - AndroidModelClass.class, android.getClass().toString())); + AndroidModelClass.class, android.getClass())); } else { mClass = (AndroidModelClass) android; } diff --git a/dalvik/src/main/java/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java b/dalvik/src/main/java/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java index 855294a2b1..6c623210f0 100644 --- a/dalvik/src/main/java/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java +++ b/dalvik/src/main/java/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java @@ -587,7 +587,7 @@ public void leave() { names.add((String) oName); } else { throw new IllegalStateException( - "Unexpected Attribute type for name: " + oName.getClass().toString()); + "Unexpected Attribute type for name: " + oName.getClass()); } } else if (current == Tag.DATA) { Object oUrl = attributesHistory.get(Attr.SCHEME).peek(); @@ -597,7 +597,7 @@ public void leave() { urls.add((String) oUrl); } else { throw new IllegalStateException( - "Unexpected Attribute type for name: " + oUrl.getClass().toString()); + "Unexpected Attribute type for name: " + oUrl.getClass()); } } else { throw new IllegalStateException("Error in parser implementation"); @@ -671,7 +671,7 @@ public void leave() { overrideTargets.add((Intent) oIntent); } else { throw new IllegalStateException( - "Unexpected Attribute type for Intent: " + oIntent.getClass().toString()); + "Unexpected Attribute type for Intent: " + oIntent.getClass()); } } else { throw new IllegalStateException("Error in parser implementation");