Undoing some of the dead code removal, since it caused a problem with Interpreter subclasses

js/rhino/src/org/mozilla/javascript/Context.java

@@ -2286,9 +2286,9 @@ public class Context
 
         Object result;
         if (returnFunction) {
-            result = compiler.createFunctionObject(this, scope, securityDomain);
+            result = compiler.createFunctionObject(this, scope, bytecode, securityDomain);
         } else {
-            result = compiler.createScriptObject(securityDomain);
+            result = compiler.createScriptObject(bytecode, securityDomain);
         }
 
         return result;

js/rhino/src/org/mozilla/javascript/Interpreter.java

@@ -461,15 +461,23 @@ public class Interpreter
         return itsData;
     }
 
-    public Script createScriptObject(Object staticSecurityDomain)
+    public Script createScriptObject(Object bytecode, Object staticSecurityDomain)
     {
+        if(bytecode != itsData)
+        {
+            Kit.codeBug();
+        }
         return InterpretedFunction.createScript(itsData,
                                                 staticSecurityDomain);
     }
 
     public Function createFunctionObject(Context cx, Scriptable scope, 
-            Object staticSecurityDomain)
+            Object bytecode, Object staticSecurityDomain)
     {
+        if(bytecode != itsData)
+        {
+            Kit.codeBug();
+        }
         return InterpretedFunction.createFunction(cx, scope, itsData,
                                                   staticSecurityDomain);
     }