--- old/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java 2016-04-26 11:37:25.155842457 +0200 +++ new/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java 2016-04-26 11:37:25.027842459 +0200 @@ -278,7 +278,12 @@ return new NodeIterator<>(ParserContextFunctionNode.class); } - private class NodeIterator implements Iterator { + public ParserContextModuleNode getCurrentModule() { + final Iterator iter = new NodeIterator<>(ParserContextModuleNode.class, getCurrentFunction()); + return iter.hasNext() ? iter.next() : null; + } + + private class NodeIterator implements Iterator { private int index; private T next; private final Class clazz;