hg: jdk9/dev/nashorn: 8048079: Persistent code store is broken after optimistic types merge

[hannes.wallnoefer at oracle.com]

Changeset: 0489dcbb882b
Author:    hannesw
Date:      2014-06-25 14:36 +0200
URL:       http://hg.openjdk.java.net/jdk9/dev/nashorn/rev/0489dcbb882b

8048079: Persistent code store is broken after optimistic types merge
Reviewed-by: sundar, jlaskey, attila

! src/jdk/nashorn/internal/codegen/CompilationPhase.java
! src/jdk/nashorn/internal/runtime/Context.java
! src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
+ test/script/basic/JDK-8048079_1.js
+ test/script/basic/JDK-8048079_1.js.EXPECTED
+ test/script/basic/JDK-8048079_2.js
+ test/script/basic/JDK-8048079_2.js.EXPECTED
! test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java