Issue #442 Decompilation regression since nightly ffdec_1.7.4_db2388c37836: fixed

This commit is contained in:
Honfika
2013-12-26 21:50:40 +01:00
parent dfcc7cbc5c
commit f5e205cf85
4 changed files with 13 additions and 9 deletions

View File

@@ -175,10 +175,12 @@ public class DirectValueActionItem extends ActionItem {
@Override
public boolean isCompileTime(Set<GraphTargetItem> dependencies) {
if (dependencies.contains(computedRegValue)) {
return false;
if (computedRegValue != null) {
if (dependencies.contains(computedRegValue)) {
return false;
}
dependencies.add(computedRegValue);
}
dependencies.add(computedRegValue);
return (value instanceof Double) || (value instanceof Float) || (value instanceof Boolean) || (value instanceof Long) || (value instanceof Null) || (computedRegValue != null && computedRegValue.isCompileTime(dependencies)) || (value instanceof String) || (value instanceof ConstantIndex);
}