Merge with default before merge with jdk8u60

--HG--
branch : 8u40-verified-fixes

1 files changed, 13 insertions, 1 deletions

diff --git a/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
index bbbddf94..1cfb7575 100644
--- a/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
+++ b/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
@@ -85,9 +85,10 @@ interface BytecodeOps {
      * first to the second, pushing the result on the stack
      *
      * @param method  method visitor
+     * @param programPoint program point id
      * @return result type
      */
-    Type add(MethodVisitor method);
+    Type add(MethodVisitor method, int programPoint);
 
     /**
      * Load a variable from a local slot to the stack
@@ -129,6 +130,17 @@ interface BytecodeOps {
     Type loadUndefined(MethodVisitor method);
 
     /**
+     * Load the "forced initializer" value to the stack, used to ensure that a local variable has a value when it is
+     * read by the unwarranted optimism catch block.
+     *
+     * @param  method  method visitor.
+     *
+     * @return the forced initialization type at the top of the stack
+     */
+    Type loadForcedInitializer(MethodVisitor method);
+
+
+    /**
      * Load the "empty" value to the stack.
      *
      * @param  method  method visitor.