Commit 9ba011a1 authored by Carlos Galindo's avatar Carlos Galindo
Browse files

Fix propagation of object trees through calls

parent 29127391

sdg-core/src/main/java/es/upv/mist/slicing/graphs/ExpressionObjectTreeFinder.java

+10 −1
Original line number Diff line number Diff line
@@ -296,11 +296,20 @@ public class ExpressionObjectTreeFinder { 
        if (targetAction.hasObjectTree()) {

            boolean sourceTypesInClassGraph = sourceAction.getDynamicTypes().stream()

                    .anyMatch(ClassGraph.getInstance()::containsType);

            if (sourceTypesInClassGraph && !sourceAction.hasObjectTree())

            if (sourceTypesInClassGraph && !hasObjectTreeAt(sourceAction, sourceMember))

                ObjectTree.copyTargetTreeToSource(sourceAction.getObjectTree(), targetAction.getObjectTree(), sourceMember, targetMember);

            sourceAction.setPDGTreeConnectionTo(targetAction, sourceMember, targetMember);

        } else {

            sourceAction.setPDGValueConnection(sourceMember);

        }

    }



    protected boolean hasObjectTreeAt(VariableAction action, String prefix) {

        if (!action.hasObjectTree())

            return false;

        ObjectTree ot = action.getObjectTree();

        if (!prefix.isEmpty())

            prefix = "." + prefix;

        return ot.hasChildrenPoly(ObjectTree.ROOT_NAME + prefix);

    }

}

sdg-core/src/main/java/es/upv/mist/slicing/nodes/ObjectTree.java

+19 −4
Original line number Diff line number Diff line
@@ -78,17 +78,32 @@ public class ObjectTree implements Cloneable { 
        String member = removeRoot(memberWithRoot);

        if (member.isEmpty())

            return hasChildren();

        return hasChildrenInternal(member);

        return hasChildrenInternal(member, false);

    }



    protected boolean hasChildrenInternal(String members) {

    /** Same as {@link #hasChildren(String)}, but considering the optional presence of polymorphic nodes. */

    public boolean hasChildrenPoly(String memberWithRoot) {

        String member = removeRoot(memberWithRoot);

        if (member.isEmpty())

            return hasChildren();

        return hasChildrenInternal(member, true);

    }



    protected boolean hasChildrenInternal(String members, boolean polymorphic) {

        if (members.contains(".")) {

            int firstDot = members.indexOf('.');

            String first = members.substring(0, firstDot);

            String rest = members.substring(firstDot + 1);

            childrenMap.computeIfAbsent(first, f -> new ObjectTree(f, this));

            return childrenMap.get(first).hasChildrenInternal(rest);

            if (polymorphic && !childrenMap.containsKey(first) && !childrenMap.isEmpty())

                return childrenMap.values().stream()

                        .filter(ot -> ot.getMemberNode() instanceof PolyMemberNode)

                        .anyMatch(ot -> ot.hasChildrenInternal(members, true));

            return childrenMap.containsKey(first) && childrenMap.get(first).hasChildrenInternal(rest, polymorphic);

        } else {

            if (polymorphic && !childrenMap.containsKey(members) && !childrenMap.isEmpty())

                return childrenMap.values().stream()

                        .filter(ot -> ot.getMemberNode() instanceof PolyMemberNode)

                        .anyMatch(ot -> ot.hasChildrenInternal(members, true));

            return childrenMap.get(members).hasChildren();

        }

    }