soot-oss · jkraft-pjr · Nov 17, 2023
diff --git a/src/main/generated/jastadd/soot/JastAddJ/ClassDecl.java b/src/main/generated/jastadd/soot/JastAddJ/ClassDecl.java
@@ -419,7 +419,7 @@ public void jimplify1phase2() {
     }
     for(Iterator iter = interfacesIterator(); iter.hasNext(); ) {
       TypeDecl typeDecl = (TypeDecl)iter.next();
-      if(!sc.implementsInterface(typeDecl.getSootClassDecl().getName()))
+      if(!sc.implementsInterface(typeDecl.getSootClassDecl().getPathPlusClassName()))
         sc.addInterface(typeDecl.getSootClassDecl());
     }
     if(isNestedType())

diff --git a/src/main/generated/jastadd/soot/JastAddJ/InterfaceDecl.java b/src/main/generated/jastadd/soot/JastAddJ/InterfaceDecl.java
@@ -332,7 +332,7 @@ public void jimplify1phase2() {
     sc.setSuperclass(typeObject().getSootClassDecl());
     for(Iterator iter = superinterfacesIterator(); iter.hasNext(); ) {
       TypeDecl typeDecl = (TypeDecl)iter.next();
-      if(typeDecl != typeObject() && !sc.implementsInterface(typeDecl.getSootClassDecl().getName()))
+      if(typeDecl != typeObject() && !sc.implementsInterface(typeDecl.getSootClassDecl().getPathPlusClassName()))
         sc.addInterface(typeDecl.getSootClassDecl());
     }
     if(isNestedType())

diff --git a/src/main/java/soot/AbstractASMBackend.java b/src/main/java/soot/AbstractASMBackend.java
@@ -325,7 +325,7 @@ protected void generateMethods() {
         exceptions = new String[exceptionList.size()];
         int i = 0;
         for (SootClass exc : exceptionList) {
-          exceptions[i] = slashify(exc.getName());
+          exceptions[i] = slashify(exc.getPathPlusClassName());
           ++i;
         }
       } else {
@@ -611,7 +611,7 @@ protected void generateAnnotationElems(AnnotationVisitor av, Collection<Annotati
    * Emits the bytecode for a reference to an outer class if necessary
    */
   protected void generateOuterClassReference() {
-    String outerClassName = slashify(sc.getOuterClass().getName());
+    String outerClassName = slashify(sc.getOuterClass().getPathPlusClassName());
     String enclosingMethod = null;
     String enclosingMethodSig = null;
     EnclosingMethodTag emTag = (EnclosingMethodTag) sc.getTag(EnclosingMethodTag.NAME);
@@ -641,7 +641,7 @@ protected void generateClassHeader() {
     int modifier = getModifiers(sc.getModifiers(), sc);
 
     // Retrieve class-name
-    String className = slashify(sc.getName());
+    String className = slashify(sc.getPathPlusClassName());
     // Retrieve generics
     SignatureTag sigTag = (SignatureTag) sc.getTag(SignatureTag.NAME);
     String sig = sigTag == null ? null : sigTag.getSignature();
@@ -653,14 +653,14 @@ protected void generateClassHeader() {
     String superClass = "java/lang/Object".equals(className) ? null : "java/lang/Object";
     SootClass csuperClass = sc.getSuperclassUnsafe();
     if (csuperClass != null) {
-      superClass = slashify(csuperClass.getName());
+      superClass = slashify(csuperClass.getPathPlusClassName());
     }
 
     // Retrieve directly implemented interfaces
     String[] interfaces = new String[sc.getInterfaceCount()];
     int i = 0;
     for (SootClass interf : sc.getInterfaces()) {
-      interfaces[i] = slashify(interf.getName());
+      interfaces[i] = slashify(interf.getPathPlusClassName());
       ++i;
     }
 

diff --git a/src/main/java/soot/AbstractJasminClass.java b/src/main/java/soot/AbstractJasminClass.java
@@ -411,7 +411,7 @@ public AbstractJasminClass(SootClass sootClass) {
     }
 
     if (Options.v().verbose()) {
-      logger.debug("[" + sootClass.getName() + "] Constructing baf.JasminClass...");
+      logger.debug("[" + sootClass.getPathPlusClassName() + "] Constructing baf.JasminClass...");
     }
 
     code = new LinkedList<String>();
@@ -450,13 +450,13 @@ public AbstractJasminClass(SootClass sootClass) {
       }
       if (Modifier.isInterface(modifiers)) {
         modifiers -= Modifier.INTERFACE;
-        emit(".interface " + Modifier.toString(modifiers) + " " + slashify(sootClass.getName()));
+        emit(".interface " + Modifier.toString(modifiers) + " " + slashify(sootClass.getPathPlusClassName()));
       } else {
-        emit(".class " + Modifier.toString(modifiers) + " " + slashify(sootClass.getName()));
+        emit(".class " + Modifier.toString(modifiers) + " " + slashify(sootClass.getPathPlusClassName()));
       }
 
       if (sootClass.hasSuperclass()) {
-        emit(".super " + slashify(sootClass.getSuperclass().getName()));
+        emit(".super " + slashify(sootClass.getSuperclass().getPathPlusClassName()));
       } else {
         emit(".no_super");
       }
@@ -466,7 +466,7 @@ public AbstractJasminClass(SootClass sootClass) {
 
     // Emit the interfaces
     for (SootClass inter : sootClass.getInterfaces()) {
-      emit(".implements " + slashify(inter.getName()));
+      emit(".implements " + slashify(inter.getPathPlusClassName()));
     }
     /*
      * why do this???? if(sootClass.getInterfaceCount() != 0) emit("");
@@ -663,7 +663,7 @@ protected void emitMethod(SootMethod method) {
         + jasminDescriptorOf(method.makeRef()));
 
     for (SootClass exceptClass : method.getExceptions()) {
-      emit(".throws " + exceptClass.getName());
+      emit(".throws " + exceptClass.getPathPlusClassName());
     }
     if (method.hasTag(SyntheticTag.NAME) || Modifier.isSynthetic(method.getModifiers())) {
       emit(".synthetic");

diff --git a/src/main/java/soot/AbstractTrap.java b/src/main/java/soot/AbstractTrap.java
@@ -151,6 +151,6 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 
   private void writeObject(ObjectOutputStream out) throws IOException {
     out.defaultWriteObject();
-    out.writeObject(exception.getName());
+    out.writeObject(exception.getPathPlusClassName());
   }
 }
diff --git a/src/main/java/soot/BriefUnitPrinter.java b/src/main/java/soot/BriefUnitPrinter.java
@@ -50,7 +50,7 @@ public void startUnit(Unit u) {
   public void methodRef(SootMethodRef m) {
     handleIndent();
     if (!baf && m.resolve().isStatic()) {
-      output.append(m.getDeclaringClass().getName());
+      output.append(m.getDeclaringClass().getPathPlusClassName());
       literal(".");
     }
     output.append(m.name());
@@ -60,7 +60,7 @@ public void methodRef(SootMethodRef m) {
   public void fieldRef(SootFieldRef f) {
     handleIndent();
     if (baf || f.resolve().isStatic()) {
-      output.append(f.declaringClass().getName());
+      output.append(f.declaringClass().getPathPlusClassName());
       literal(".");
     }
     output.append(f.name());

diff --git a/src/main/java/soot/Hierarchy.java b/src/main/java/soot/Hierarchy.java
@@ -254,7 +254,7 @@ public List<SootClass> getSuperclassesOfIncluding(SootClass sootClass) {
   public List<SootClass> getSuperclassesOf(SootClass sootClass) {
     sootClass.checkLevel(SootClass.HIERARCHY);
     if (sootClass.isInterface()) {
-      throw new IllegalArgumentException(sootClass.getName() + " is an interface, but class is expected");
+      throw new IllegalArgumentException(sootClass.getPathPlusClassName() + " is an interface, but class is expected");
     }
 
     checkState();
@@ -303,7 +303,7 @@ public List<SootClass> getSubinterfacesOfIncluding(SootClass sootClass) {
   public List<SootClass> getSubinterfacesOf(SootClass sootClass) {
     sootClass.checkLevel(SootClass.HIERARCHY);
     if (!sootClass.isInterface()) {
-      throw new IllegalArgumentException(sootClass.getName() + " is a class, but interface is expected");
+      throw new IllegalArgumentException(sootClass.getPathPlusClassName() + " is a class, but interface is expected");
     }
 
     checkState();

diff --git a/src/main/java/soot/JastAddInitialResolver.java b/src/main/java/soot/JastAddInitialResolver.java
@@ -84,7 +84,7 @@ public void formAst(String fullPath, List<String> locations, String className) {
         classNameToCU.put(className, u);
       } else {
         for (SootClass sc : types) {
-          classNameToCU.put(sc.getName(), u);
+          classNameToCU.put(sc.getPathPlusClassName(), u);
         }
       }
     }
@@ -113,10 +113,11 @@ private TypeDecl findNestedTypeDecl(TypeDecl typeDecl, SootClass sc) {
   }
 
   public Dependencies resolveFromJavaFile(SootClass sootclass) {
-    CompilationUnit u = classNameToCU.get(sootclass.getName());
+    CompilationUnit u = classNameToCU.get(sootclass.getPathPlusClassName());
 
     if (u == null) {
-      throw new RuntimeException("Error: couldn't find class: " + sootclass.getName() + " are the packages set properly?");
+      throw new RuntimeException("Error: couldn't find class: " + sootclass.getPathPlusClassName()
+              + " are the packages set properly?");
     }
 
     HashSet<SootClass> types = new HashSet<SootClass>();
@@ -132,7 +133,7 @@ public Dependencies resolveFromJavaFile(SootClass sootclass) {
         m.setSource(new MethodSource() {
           public Body getBody(SootMethod m, String phaseName) {
             SootClass sc = m.getDeclaringClass();
-            CompilationUnit u = classNameToCU.get(sc.getName());
+            CompilationUnit u = classNameToCU.get(sc.getPathPlusClassName());
             for (TypeDecl typeDecl : u.getTypeDecls()) {
               typeDecl = findNestedTypeDecl(typeDecl, sc);
               if (typeDecl != null) {
@@ -159,7 +160,7 @@ public Body getBody(SootMethod m, String phaseName) {
               }
             }
             throw new RuntimeException(
-                "Could not find body for " + m.getSignature() + " in " + m.getDeclaringClass().getName());
+                "Could not find body for " + m.getSignature() + " in " + m.getDeclaringClass().getPathPlusClassName());
           }
         });
       }

diff --git a/src/main/java/soot/JimpleClassSource.java b/src/main/java/soot/JimpleClassSource.java
@@ -74,7 +74,7 @@ public Dependencies resolve(SootClass sc) {
       // set outer class if not set (which it should not be) and class name contains outer class indicator
       String outerClassName = null;
       if (!sc.hasOuterClass()) {
-        String className = sc.getName();
+        String className = sc.getPathPlusClassName();
         if (className.contains("$")) {
           if (className.contains("$-")) {
             /*

diff --git a/src/main/java/soot/LambdaMetaFactory.java b/src/main/java/soot/LambdaMetaFactory.java
@@ -154,7 +154,7 @@ public SootMethodRef makeLambdaHelper(List<? extends Value> bootstrapArgs, int t
     // Our thunk class implements the functional interface
     SootClass functionalInterfaceToImplement = ((RefType) invokedType[invokedType.length - 1]).getSootClass();
 
-    final String enclosingClassname = enclosingClass.getName();
+    final String enclosingClassname = enclosingClass.getPathPlusClassName();
 
     String className;
     final boolean readableClassnames = true;
@@ -201,7 +201,7 @@ public SootMethodRef makeLambdaHelper(List<? extends Value> bootstrapArgs, int t
     // it can be invoked from the thunk class
     if (MethodHandle.Kind.REF_INVOKE_STATIC.getValue() == implMethod.getKind()) {
       SootClass declClass = implMethod.getMethodRef().getDeclaringClass();
-      if (declClass.getName().equals(enclosingClassname)) {
+      if (declClass.getPathPlusClassName().equals(enclosingClassname)) {
         SootMethod method = implMethod.getMethodRef().resolve();
         method.setModifiers((method.getModifiers() & ~Modifier.PRIVATE) | Modifier.PUBLIC);
       }
@@ -268,11 +268,11 @@ private synchronized void resolveHandle(MethodHandle implMethod) {
     Scene scene = Scene.v();
 
     SootMethodRef methodRef = implMethod.getMethodRef();
-    scene.forceResolve(methodRef.getDeclaringClass().getName(), SootClass.HIERARCHY);
+    scene.forceResolve(methodRef.getDeclaringClass().getPathPlusClassName(), SootClass.HIERARCHY);
 
     Stream.concat(Stream.of(methodRef.getReturnType()), methodRef.getParameterTypes().stream())
         .filter(t -> t instanceof RefType)
-        .forEach(t -> scene.forceResolve(((RefType) t).getSootClass().getName(), SootClass.HIERARCHY));
+        .forEach(t -> scene.forceResolve(((RefType) t).getSootClass().getPathPlusClassName(), SootClass.HIERARCHY));
   }
 
   private void addDispatch(String name, SootClass tclass, MethodType implMethodType, MethodType instantiatedMethodType,

diff --git a/src/main/java/soot/ModulePathSourceLocator.java b/src/main/java/soot/ModulePathSourceLocator.java
@@ -92,7 +92,7 @@ public ClassSource getClassSource(String className, Optional<String> moduleName)
       if (classesToLoad == null) {
         classesToLoad = new HashSet<String>(ModuleScene.v().getBasicClasses());
         for (SootClass c : ModuleScene.v().getApplicationClasses()) {
-          classesToLoad.add(c.getName());
+          classesToLoad.add(c.getPathPlusClassName());
         }
         this.classesToLoad = classesToLoad;
       }

diff --git a/src/main/java/soot/ModuleScene.java b/src/main/java/soot/ModuleScene.java
@@ -163,10 +163,10 @@ private String defaultJavaModulePath() {
   @Override
   protected void addClassSilent(SootClass c) {
     if (c.isInScene()) {
-      throw new RuntimeException("already managed: " + c.getName());
+      throw new RuntimeException("already managed: " + c.getPathPlusClassName());
     }
 
-    final String className = c.getName();
+    final String className = c.getPathPlusClassName();
     if (containsClass(className, Optional.fromNullable(c.moduleName))) {
       throw new RuntimeException("duplicate class: " + className);
     }
@@ -532,7 +532,8 @@ public void loadDynamicClasses() {
       SootClass c = iterator.next();
       if (!c.isConcrete()) {
         if (opts.verbose()) {
-          logger.warn("dynamic class " + c.getName() + " is abstract or an interface, and it will not be considered.");
+          logger.warn("dynamic class " + c.getPathPlusClassName()
+                  + " is abstract or an interface, and it will not be considered.");
         }
         iterator.remove();
       }
@@ -562,7 +563,7 @@ protected void prepareClasses() {
         if (Options.v().app()) {
           s.setApplicationClass();
         }
-        if (optionsClasses.contains(s.getName())) {
+        if (optionsClasses.contains(s.getPathPlusClassName())) {
           s.setApplicationClass();
           continue;
         }
@@ -574,7 +575,7 @@ protected void prepareClasses() {
         }
         if (s.isApplicationClass()) {
           // make sure we have the support
-          loadClassAndSupport(s.getName(), Optional.fromNullable(s.moduleName));
+          loadClassAndSupport(s.getPathPlusClassName(), Optional.fromNullable(s.moduleName));
         }
       }
     }
@@ -593,7 +594,7 @@ public void setMainClassFromOptions() {
         for (String s : Options.v().classes()) {
           SootClass c = getSootClass(s, null);
           if (c.declaresMethod("main", mainArgs, VoidType.v())) {
-            logger.debug("No main class given. Inferred '" + c.getName() + "' as main class.");
+            logger.debug("No main class given. Inferred '" + c.getPathPlusClassName() + "' as main class.");
             setMainClass(c);
             return;
           }
@@ -602,7 +603,7 @@ public void setMainClassFromOptions() {
         // try to infer a main class from the usual classpath if none is given
         for (SootClass c : getApplicationClasses()) {
           if (c.declaresMethod("main", mainArgs, VoidType.v())) {
-            logger.debug("No main class given. Inferred '" + c.getName() + "' as main class.");
+            logger.debug("No main class given. Inferred '" + c.getPathPlusClassName() + "' as main class.");
             setMainClass(c);
             return;
           }

diff --git a/src/main/java/soot/PackManager.java b/src/main/java/soot/PackManager.java
@@ -882,13 +882,13 @@ private void outputDava() {
   private void runBodyPacks(SootClass c) {
     final int format = Options.v().output_format();
     if (format == Options.output_format_dava) {
-      logger.debug("Decompiling {}...", c.getName());
+      logger.debug("Decompiling {}...", c.getPathPlusClassName());
 
       // January 13th, 2006 SootMethodAddedByDava is set to false for
       // SuperFirstStmtHandler
       G.v().SootMethodAddedByDava = false;
     } else {
-      logger.debug("Transforming {}...", c.getName());
+      logger.debug("Transforming {}...", c.getPathPlusClassName());
     }
 
     boolean produceBaf = false, produceGrimp = false, produceDava = false, produceJimple = true, produceShimple = false;

diff --git a/src/main/java/soot/PolymorphicMethodRef.java b/src/main/java/soot/PolymorphicMethodRef.java
@@ -54,7 +54,7 @@ public class PolymorphicMethodRef extends SootMethodRefImpl {
    * @return if the class is allowed according to the JVM Spec
    */
   public static boolean handlesClass(SootClass declaringClass) {
-    return handlesClass(declaringClass.getName());
+    return handlesClass(declaringClass.getPathPlusClassName());
   }
 
   public static boolean handlesClass(String declaringClassName) {

diff --git a/src/main/java/soot/Printer.java b/src/main/java/soot/Printer.java
@@ -265,7 +265,7 @@ private String printSignature(SootClass sootClass) {
     if (customClassSignaturePrinter != null) {
       return customClassSignaturePrinter.apply(sootClass);
     } else {
-      return Scene.v().quotedNameOf(sootClass.getName());
+      return Scene.v().quotedNameOf(sootClass.getPathPlusClassName());
     }
   }
 

diff --git a/src/main/java/soot/RefType.java b/src/main/java/soot/RefType.java
@@ -95,9 +95,9 @@ public static RefType v(String className) {
    */
   public static RefType v(SootClass c) {
     if (ModuleUtil.module_mode()) {
-      return ModuleRefType.v(c.getName(), Optional.fromNullable(c.moduleName));
+      return ModuleRefType.v(c.getPathPlusClassName(), Optional.fromNullable(c.moduleName));
     } else {
-      return v(c.getName());
+      return v(c.getPathPlusClassName());
     }
   }