--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java 2017-11-03 23:57:45.884106865 -0700 +++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java 2017-11-03 23:57:45.558092276 -0700 @@ -34,9 +34,18 @@ private final GraphBlocks blocks; private final GraphElements elements; - ProtocolImpl(GraphStructure structure, GraphTypes enums, GraphBlocks blocks, + ProtocolImpl(int major, int minor, GraphStructure structure, GraphTypes enums, GraphBlocks blocks, GraphElements elements, WritableByteChannel channel) throws IOException { - super(channel); + super(channel, major, minor); + this.structure = structure; + this.types = enums; + this.blocks = blocks; + this.elements = elements; + } + + ProtocolImpl(GraphProtocol parent, GraphStructure structure, GraphTypes enums, GraphBlocks blocks, + GraphElements elements) { + super(parent); this.structure = structure; this.types = enums; this.blocks = blocks; @@ -49,11 +58,21 @@ } @Override + protected Node findNode(Object obj) { + return structure.node(obj); + } + + @Override protected NodeClass findNodeClass(Object obj) { return structure.nodeClass(obj); } @Override + protected NodeClass findClassForNode(Node obj) { + return structure.classForNode(obj); + } + + @Override protected String findNameTemplate(NodeClass clazz) { return structure.nameTemplate(clazz); }