Fix tests

soot-oss · Oct 24, 2024 · bb2a3ff · bb2a3ff
1 parent 8154e49
commit bb2a3ff
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 69 deletions.
diff --git a/src/main/java/soot/jimple/toolkits/typing/fast/PartialConstantTyping.java b/src/main/java/soot/jimple/toolkits/typing/fast/PartialConstantTyping.java
@@ -1,4 +1,27 @@
 package soot.jimple.toolkits.typing.fast;
+/*-
+ * #%L
+ * Soot - a J*va Optimization Framework
+ * %%
+ * Copyright (C) 2008 Ben Bellamy 
+ * 
+ * All rights reserved.
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
 
 import com.google.common.collect.Iterables;
 

diff --git a/src/main/java/soot/jimple/toolkits/typing/fast/TypeResolver.java b/src/main/java/soot/jimple/toolkits/typing/fast/TypeResolver.java
@@ -182,8 +182,8 @@ public void inferTypes() {
     ITypingStrategy typingStrategy = getTypingStrategy();
     AugEvalFunction ef = createAugEvalFunction(this.jb);
     BytecodeHierarchy bh = createBytecodeHierarchy();
-    Collection<ITyping> sigma = this
-        .applyAssignmentConstraints(new PartialConstantTyping(typingStrategy.createEmptyTyping(this.jb.getLocals())), ef, bh);
+    PartialConstantTyping constantTyping = new PartialConstantTyping(typingStrategy.createEmptyTyping(this.jb.getLocals()));
+    Collection<ITyping> sigma = this.applyAssignmentConstraints(constantTyping, ef, bh);
 
     // If there is nothing to type, we can quit
     if (sigma.isEmpty()) {

diff --git a/src/test/java/soot/jimple/toolkits/typing/DefaultTypingStrategyMinimizeParallelTest.java b/src/test/java/soot/jimple/toolkits/typing/DefaultTypingStrategyMinimizeParallelTest.java
@@ -26,7 +26,7 @@
 
 import soot.jimple.toolkits.typing.fast.BytecodeHierarchy;
 import soot.jimple.toolkits.typing.fast.DefaultTypingStrategy;
-import soot.jimple.toolkits.typing.fast.Typing;
+import soot.jimple.toolkits.typing.fast.ITyping;
 
 /**
  * JUnit-Tests for the {@link DefaultTypingStrategy#minimizeParallel(List, soot.jimple.toolkits.typing.fast.IHierarchy)}
@@ -40,7 +40,7 @@
 public class DefaultTypingStrategyMinimizeParallelTest extends DefaultTypingStrategyMinimizeSequentialTest {
 
   @Override
-  protected void executeMinimize(List<Typing> typingList) {
+  protected void executeMinimize(List<ITyping> typingList) {
     new DefaultTypingStrategy().minimizeParallel(typingList, new BytecodeHierarchy());
   }