Work on match

core/com.ibm.wala.cast.python.test/.settings/org.eclipse.jdt.core.prefs

@@ -10,15 +10,15 @@ org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
-org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=21
+org.eclipse.jdt.core.compiler.source=25
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error

core/com.ibm.wala.cast.python.test/data/match1.py

@@ -26,20 +26,25 @@ def sunday():
     print("Sunday")
 
 
-day = 4
-
-match day:
-    case 1:
-        monday()
-    case 2:
-        tuesday()
-    case 3:
-        wednesday()
-    case 4:
-        thursday()
-    case 5:
-        friday()
-    case 6:
-        saturday()
-    case 7:
-        sunday()
+def otherDay():
+    print("other day??")
+
+
+for day in [1, 2, 3, 4, 5, 6, 7, otherDay]:
+    match day:
+        case 1:
+            monday()
+        case 2:
+            tuesday()
+        case 3:
+            wednesday()
+        case 4:
+            thursday()
+        case 5:
+            friday()
+        case 6:
+            saturday()
+        case 7:
+            sunday()
+        case x:
+            x()

core/com.ibm.wala.cast.python.test/data/match2.py

@@ -0,0 +1,55 @@
+def monday():
+    print("Monday")
+
+
+def tuesday():
+    print("Tuesday")
+
+
+def wednesday():
+    print("Wednesday")
+
+
+def thursday():
+    print("Thursday")
+
+
+def friday():
+    print("Friday")
+
+
+def saturday():
+    print("Saturday")
+
+
+def sunday():
+    print("Sunday")
+
+
+def otherDay():
+    print("other day??")
+
+
+def doit(month):
+    for day in [1, 2, 3, 4, 5, 6, 7, otherDay]:
+        match day:
+            case 1 if 1 <= month <= 12:
+                monday()
+            case 2 if 1 <= month <= 12:
+                tuesday()
+            case 3 if 1 <= month <= 12:
+                wednesday()
+            case 4 if 1 <= month <= 12:
+                thursday()
+            case 5 if 1 <= month <= 12:
+                friday()
+            case 6 if 1 <= month <= 12:
+                saturday()
+            case 7 if 1 <= month <= 12:
+                sunday()
+            case x if callable(x):
+                x()
+
+
+doit(4)
+doit(0)

core/com.ibm.wala.cast.python.test/data/match3.py

@@ -0,0 +1,31 @@
+def weekday(day):
+    print("week day " + str(day))
+
+
+def weekend(day):
+    print("week end " + str(day))
+
+
+def otherDay():
+    print("other day??")
+
+
+def somethingElse():
+    print("something else")
+
+
+def doit(month):
+    for day in [1, 2, 3, 4, 5, 6, 7, otherDay]:
+        match day:
+            case 1 | 2 | 3 | 4 | 5 as day if 1 <= month <= 12:
+                weekday(day)
+            case 6 | 7 as day if 1 <= month <= 12:
+                weekend(day)
+            case x if callable(x):
+                x()
+            case _:
+                somethingElse()
+
+
+doit(4)
+doit(0)

core/com.ibm.wala.cast.python.test/data/match4.py

@@ -0,0 +1,41 @@
+def weekday(day):
+    print("week day " + str(day))
+
+
+def weekend(day):
+    print("week end " + str(day))
+
+
+def otherDay():
+    print("other day??")
+
+
+def somethingElse():
+    print("something else")
+
+
+def mten():
+    return 10
+
+
+def mseven():
+    return 10
+
+
+def doit(dmf):
+    match dmf:
+        case [1 | 2 | 3 | 4 | 5 as day, month] if 1 <= month() <= 12:
+            weekday(day)
+        case [6 | 7 as day, month] if 1 <= month() <= 12:
+            weekend(day)
+        case x if callable(x):
+            x()
+        case _:
+            somethingElse()
+
+
+doit((3, mseven))
+doit([7, mten])
+doit([8, mten])
+doit(otherDay)
+doit(0)

core/com.ibm.wala.cast.python.test/data/match5.py

@@ -0,0 +1,37 @@
+class Nothing:
+    def act(self):
+        print("Nothing")
+
+
+def id(x):
+    return x
+
+
+class Something:
+    a = 0
+    b = 0
+
+    def __init__(self, a, b):
+        self.a = id(a)
+        self.b = id(b)
+
+    def act(self):
+        print(self.a + self.b)
+
+
+def doit(x):
+    match x:
+        case Nothing():
+            x.act()
+        case Something(a=5, b=7):
+            x.act()
+        case Something():
+            print("unexpected something")
+        case _:
+            print("unexpected value")
+
+
+doit(Nothing())
+doit(Something(5, 7))
+doit(Something(3, 4))
+doit(10)

core/com.ibm.wala.cast.python.test/source/com/ibm/wala/cast/python/test/TestPythonCallGraphShape.java

@@ -13,6 +13,7 @@
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
@@ -24,6 +25,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -83,7 +85,8 @@ public String getName() {
 
   protected PythonAnalysisEngine<?> createEngine(List<File> pythonPath)
       throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
-    return new PythonAnalysisEngine<Void>(pythonPath) {
+    return new PythonAnalysisEngine<Void>(
+        pythonPath, PythonAnalysisEngine.makeSSAOptions(SSAOptions.defaultOptions())) {
       @Override
       public Void performAnalysis(PropagationCallGraphBuilder builder) throws CancelException {
         assert false;
@@ -130,4 +133,12 @@ StringBuffer dump(CallGraph CG) {
     }
     return sb;
   }
+
+  protected void verifyGraphAssertions(CallGraph CG, Object[][] data) {
+    List<GraphAssertion> asserts = new ArrayList<>();
+    for (int i = 0; i < data.length; i++) {
+      asserts.add(new GraphAssertion(data[i][0], (String[]) data[i][1]));
+    }
+    verifyGraphAssertions(CG, asserts);
+  }
 }

core/com.ibm.wala.cast.python/.settings/org.eclipse.jdt.core.prefs

@@ -11,9 +11,9 @@ org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.compliance=25
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,6 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=21
+org.eclipse.jdt.core.compiler.source=25
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error

core/com.ibm.wala.cast.python/source/com/ibm/wala/cast/python/client/PythonAnalysisEngine.java

@@ -18,6 +18,7 @@
 import com.ibm.wala.cast.python.ipa.summaries.PythonSuper;
 import com.ibm.wala.cast.python.ir.PythonLanguage;
 import com.ibm.wala.cast.python.loader.PythonLoaderFactory;
+import com.ibm.wala.cast.python.ssa.IsInstancePiPolicy;
 import com.ibm.wala.cast.python.types.PythonTypes;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.cast.util.Util;
@@ -52,7 +53,9 @@
 import com.ibm.wala.ipa.summaries.BypassSyntheticClassLoader;
 import com.ibm.wala.ipa.summaries.XMLMethodSummaryReader;
 import com.ibm.wala.shrike.shrikeBT.Constants;
+import com.ibm.wala.ssa.CompoundPiPolicy;
 import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.InstanceOfPiPolicy;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.ssa.SSAOptions.DefaultValues;
 import com.ibm.wala.ssa.SymbolTable;
@@ -135,10 +138,13 @@ public static void setLoaderFactory(Class<? extends PythonLoaderFactory> lf) {
 
   private final IRFactory<IMethod> irs = AstIRFactory.makeDefaultFactory();
 
-  public PythonAnalysisEngine(List<File> pythonPath) {
+  public PythonAnalysisEngine(List<File> pythonPath, SSAOptions ssaOptions) {
     PythonLoaderFactory f;
     try {
-      f = loaders.getConstructor(java.util.List.class).newInstance(pythonPath);
+      f =
+          loaders
+              .getConstructor(java.util.List.class, SSAOptions.class)
+              .newInstance(pythonPath, ssaOptions);
     } catch (InstantiationException
         | IllegalAccessException
         | InvocationTargetException
@@ -150,7 +156,7 @@ public PythonAnalysisEngine(List<File> pythonPath) {
   }
 
   public PythonAnalysisEngine() {
-    this(emptyList());
+    this(emptyList(), makeSSAOptions(SSAOptions.defaultOptions()));
   }
 
   @Override
@@ -363,16 +369,7 @@ protected PythonSSAPropagationCallGraphBuilder getCallGraphBuilder(
     addBypassLogic(cha, options);
 
     options.setUseConstantSpecificKeys(true);
-
-    SSAOptions ssaOptions = options.getSSAOptions();
-    ssaOptions.setDefaultValues(
-        new DefaultValues() {
-          @Override
-          public int getDefaultValue(SymbolTable symtab, int valueNumber) {
-            return symtab.getNullConstant();
-          }
-        });
-    options.setSSAOptions(ssaOptions);
+    options.setSSAOptions(makeSSAOptions(options));
 
     PythonSSAPropagationCallGraphBuilder builder = makeBuilder(cha, options, cache);
 
@@ -392,6 +389,24 @@ public int getDefaultValue(SymbolTable symtab, int valueNumber) {
     return this.builder = builder;
   }
 
+  public static SSAOptions makeSSAOptions(AnalysisOptions options) {
+    return makeSSAOptions(options.getSSAOptions());
+  }
+
+  public static SSAOptions makeSSAOptions(SSAOptions ssaOptions) {
+    ssaOptions.setDefaultValues(
+        new DefaultValues() {
+          @Override
+          public int getDefaultValue(SymbolTable symtab, int valueNumber) {
+            return symtab.getNullConstant();
+          }
+        });
+    ssaOptions.setPiNodePolicy(
+        CompoundPiPolicy.createCompoundPiPolicy(
+            InstanceOfPiPolicy.createInstanceOfPiPolicy(), new IsInstancePiPolicy()));
+    return ssaOptions;
+  }
+
   public PythonSSAPropagationCallGraphBuilder getCachedCallGraphBuilder() {
     return this.builder;
   }