DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove 'Custom Change' markers

This commit is contained in:
Martin Mohr 2015-06-25 09:05:49 +02:00
parent 0b92907149
commit 8d143dbf20
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java
View File

@ -319,14 +319,14 @@ public class ZeroXInstanceKeys implements InstanceKeyFactory {
return c.getClassHierarchy().isSubclassOf(c, c.getClassHierarchy().lookupClass(TypeReference.JavaLangThrowable));
}
/** BEGIN Custom Change: make this method static (like isThrowable) */
public static boolean isStackTraceElement(IClass c) {
if (c == null) {
throw new IllegalArgumentException("C is null");
}
return c.getReference().equals(TypeReference.JavaLangStackTraceElement);
}
/** END Custom Change: make this method static (like isThrowable) */
private boolean allFieldsArePrimitive(IClass c) {
if (c.isArrayClass()) {

4
com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java
View File

@ -60,12 +60,12 @@ public class SSAConditionalBranchInstruction extends SSAInstruction {
return operator;
}
/** BEGIN custom change: include jump target in string representation */
@Override
public String toString(SymbolTable symbolTable) {
return "conditional branch(" + operator + ", to iindex=" + target + ") " + getValueString(symbolTable, val1) + "," + getValueString(symbolTable, val2);
}
/** END custom change: include jump target in string representation */
/**
* @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
* @throws IllegalArgumentException if v is null

4
com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java
View File

@ -389,7 +389,7 @@ public class DexSSABuilder extends AbstractIntRegisterMachine {
* If we've already created the current instruction, return the value number def'ed by the current instruction. Else, create a
* new symbol.
*/
/** BEGIN custom change: Bugfix for the case that the instruction does not have a def */
private int reuseOrCreateDef() {
if (getCurrentInstruction() == null || !getCurrentInstruction().hasDef()) {
return symbolTable.newSymbol();
@ -397,7 +397,7 @@ public class DexSSABuilder extends AbstractIntRegisterMachine {
return getCurrentInstruction().getDef();
}
}
/** END custom change: Bugfix for the case that the instruction does not have a def */
/**
* If we've already created the current instruction, return the value number representing the exception the instruction may
* throw. Else, create a new symbol

4
com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java
View File

@ -43,9 +43,9 @@ public class FileOfClasses extends SetOfClasses implements Serializable {
StringBuffer regex = null;
String line;
while ((line = is.readLine()) != null) {
/** BEGIN Custom Change: allow comment lines in exclusion files */
if (line.startsWith("#")) continue;
/** END Custom Change: allow comment lines in exclusion files */
if (regex == null) {
regex = new StringBuffer("(" + line + ")");
} else {