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

Merge branch 'master' of github.com:wala/WALA

This commit is contained in:
Julian Dolby 2018-09-11 13:57:32 -04:00
parent 7f47c7200a d13a38fbe1
commit b32704b8a3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
com.ibm.wala.cast/source/c/include/cast_constants.h
View File

@ -87,6 +87,13 @@ _CAstNodeType(IS_DEFINED_EXPR);
_CAstNodeType(INCLUDE)
_CAstNodeType(NAMED_ENTITY_REF);
_CAstNodeType(MACRO_VAR);
_CAstNodeType(COMPREHENSION_EXPR);
_CAstNodeType(NEW_ENCLOSING);
_CAstNodeType(NARY_EXPR);
_CAstNodeType(SPECIAL_PARENT_SCOPE);
_CAstNodeType(YIELD_STMT);
_CAstNodeType(FORIN_LOOP);
_CAstNodeType(TYPE_LITERAL_EXPR);
#undef _CODE_CONSTANTS
#undef _CPP_CONSTANTS

2
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java
View File

@ -37,7 +37,7 @@ public final class ConstantKey<T> implements InstanceKey {
public boolean equals(Object obj) {
if (obj instanceof ConstantKey) {
ConstantKey other = (ConstantKey) obj;
return value == null ? other.value == null : value.equals(other.value);
return valueClass.equals(other.valueClass) ? (value == null ? other.value == null : value.equals(other.value)) : false;
} else {
return false;
}