Fix inner class fields in Soot and SootUp

Author: smeyer198

boomerangPDS/src/test/java/test/options/OptionsTestingFramework.java

@@ -22,7 +22,9 @@
 import boomerang.results.BackwardBoomerangResults;
 import boomerang.scope.AllocVal;
 import boomerang.scope.DataFlowScope;
+import boomerang.scope.DeclaredMethod;
 import boomerang.scope.FrameworkScope;
+import boomerang.scope.Method;
 import boomerang.scope.Val;
 import boomerang.utils.MethodWrapper;
 import java.util.Arrays;
@@ -45,11 +47,7 @@ public void analyze(
       BoomerangOptions options,
       String[] expectedAllocSites) {
     analyze(
-        targetClassName,
-        targetMethodName,
-        options,
-        DataFlowScope.EXCLUDE_PHANTOM_CLASSES,
-        expectedAllocSites);
+        targetClassName, targetMethodName, options, new OptionsDataFlowScope(), expectedAllocSites);
   }
 
   public void analyze(
@@ -87,8 +85,8 @@ public void analyze(
 
       if (allocVal.isStringConstant()) {
         actualAllocSiteStrings.add(allocVal.getStringValue());
-      } else {
-        actualAllocSiteStrings.add(allocVal.toString());
+      } else if (allocVal.isIntConstant()) {
+        actualAllocSiteStrings.add(String.valueOf(allocVal.getIntValue()));
       }
     }
 
@@ -118,4 +116,27 @@ private Collection<AllocVal> computeAllocSites(
 
     return allocSites;
   }
+
+  /**
+   * For some reason, Soot does not consider the Object and String class as phantom, i.e. the
+   * analysis tries to find data flows within these classes. Hence, we have to exclude them
+   * manually.
+   */
+  private static class OptionsDataFlowScope implements DataFlowScope {
+
+    private final Collection<String> excludedClasses =
+        Set.of(Object.class.getName(), String.class.getName());
+
+    @Override
+    public boolean isExcluded(DeclaredMethod method) {
+      return method.getDeclaringClass().isPhantom()
+          || excludedClasses.contains(method.getDeclaringClass().getFullyQualifiedName());
+    }
+
+    @Override
+    public boolean isExcluded(Method method) {
+      return method.getDeclaringClass().isPhantom()
+          || excludedClasses.contains(method.getDeclaringClass().getFullyQualifiedName());
+    }
+  }
 }

boomerangPDS/src/test/java/test/options/boomerang/ArrayStrategyTest.java

@@ -35,7 +35,7 @@ public void indexSensitiveTest() {
 
   @Test
   @TestOptions(
-      expectedAllocSites = {"new java.lang.String[]", "Hello", "there"},
+      expectedAllocSites = {"Hello", "there"},
       arrayStrategy = Strategies.ArrayStrategy.INDEX_INSENSITIVE)
   public void indexInsensitiveTest() {
     String[] s = new String[] {"Hello", "there"};

boomerangScope-Soot/src/main/java/boomerang/scope/soot/jimple/JimpleField.java

@@ -37,7 +37,7 @@ public String getName() {
 
   @Override
   public boolean isInnerClassField() {
-    return this.delegate.name().contains("$");
+    return delegate.declaringClass().getName().contains("$");
   }
 
   @Override

boomerangScope-SootUp/src/main/java/boomerang/scope/sootup/jimple/JimpleUpField.java

@@ -37,7 +37,7 @@ public String getName() {
 
   @Override
   public boolean isInnerClassField() {
-    return delegate.getName().contains("$");
+    return delegate.getDeclClassType().getFullyQualifiedName().contains("$");
   }
 
   @Override

testCore/src/main/java/test/TestingFramework.java

@@ -36,7 +36,7 @@ public class TestingFramework {
   private static final String OPAL = "opal";
 
   /** This variable may be changed to run the tests locally */
-  private static final String DEFAULT_FRAMEWORK = OPAL;
+  private static final String DEFAULT_FRAMEWORK = SOOT;
 
   private final TestSetup testSetup;
   private final Collection<String> includedClasses;