Please approve.

Bug: https://bugs.openjdk.java.net/browse/JDK-8130663
jdk9 review thread: http://mail.openjdk.java.net/pipermail/nashorn-dev/2015-July/004882.html
jdk8u webrev: http://cr.openjdk.java.net/~sundar/8130663/8u/webrev.00/

The patch can not be applied 'as is' because of a java compiler difference w.r.t type inference.

File: CompiledFunction.java

This diff:

- this.invalidatedProgramPoints = invalidatedProgramPoints == null ? new TreeMap<Integer, Type>() : invalidatedProgramPoints; + this.invalidatedProgramPoints = invalidatedProgramPoints == null ? new TreeMap<>() : invalidatedProgramPoints;

can not be backported as jdk8u nashorn build uses -source 7 option for compilation. Rest of the changes are backported 'as is' except for the modular source layout difference. CC'ing nashorn team for additional review of 8u webrev.

Thanks,
-Sundar

Reply via email to