Skip to content

Commit

Permalink
Remove debug
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcMil committed Oct 21, 2024
1 parent a5b2ed4 commit 48ab3de
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 23 deletions.
13 changes: 0 additions & 13 deletions src/main/java/soot/jimple/toolkits/typing/fast/TypeResolver.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import soot.IntegerType;
import soot.Local;
import soot.LocalGenerator;
import soot.LongType;
import soot.PatchingChain;
import soot.PrimType;
import soot.RefType;
Expand Down Expand Up @@ -603,11 +602,6 @@ protected Collection<Typing> applyAssignmentConstraints(Typing tg, IEvalFunction

boolean isFirstType = true;
for (Type t_ : ef.eval(tg, stmt.getRightOp(), stmt)) {
if (t_ instanceof LongType)
DebugPoint.Break();
if (t_ instanceof BooleanType) {
ef.eval(tg, stmt.getRightOp(), stmt);
}
if (lhs instanceof ArrayRef) {
/*
* We only need to consider array references on the LHS of assignments where there is supertyping between array
Expand Down Expand Up @@ -688,13 +682,6 @@ protected Collection<Typing> applyAssignmentConstraints(Typing tg, IEvalFunction
}
}

for (Typing p : r) {
for (Entry<Local, Type> x : p.map.entrySet()) {
if (x.getValue() instanceof Integer1Type) {
DebugPoint.Break();
}
}
}
typingStrategy.minimize(r, h);
return r;
}
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/soot/jimple/toolkits/typing/fast/Typing.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.util.HashMap;
import java.util.Map;

import soot.BooleanType;
import soot.Local;
import soot.NullType;
import soot.Type;
Expand Down Expand Up @@ -58,8 +57,6 @@ public Type get(Local v) {
}

public Type set(Local v, Type t) {
if (t instanceof BooleanType || t instanceof Integer1Type)
DebugPoint.Break();
return (t instanceof BottomType || t instanceof NullType) ? null : this.map.put(v, t);
}

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/soot/toDex/StmtVisitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -659,8 +659,6 @@ private Insn buildArrayGetInsn(Register destinationReg, ArrayRef sourceRef) {
Register indexReg = regAlloc.asImmediate(index, constantV);
Local array = (Local) sourceRef.getBase();
Register arrayReg = regAlloc.asLocal(array);
if (!(array.getType() instanceof ArrayType))
System.out.println();
String arrayTypeDescriptor = SootToDexUtils.getArrayTypeDescriptor((ArrayType) array.getType());
Opcode opc = getPutGetOpcodeWithTypeSuffix(AGET_OPCODE, arrayTypeDescriptor);
return new Insn23x(opc, destinationReg, arrayReg, indexReg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@
*/

// @formatter:on
/**
*
*/
public class SharedInitializationLocalSplitter extends BodyTransformer {
private static final Logger logger = LoggerFactory.getLogger(SharedInitializationLocalSplitter.class);

Expand Down Expand Up @@ -215,8 +212,9 @@ public void transformOnly(Body body) {
continue;
}

//the idea is: When there is an overlap in any non-constant definition units, we need to merge them, since two different usages have overlapping definitions, i.e. we
//can only change all these uses
//the idea is: When there is an overlap in any non-constant definition units,
//we need to merge them, since two different usages have overlapping definitions,
//i.e. we can only change all these uses
if (existing.nonConstantDefs.intersects(nonConstantDefs)) {
//we have an overlap
useset.or(existing.uses);
Expand Down

0 comments on commit 48ab3de

Please sign in to comment.