cleanup as follow up of pr 1284

src/org/mozilla/javascript/FunctionObject.java

@@ -283,21 +283,39 @@ static Method[] getMethodList(Class<?> clazz) {
      * @see org.mozilla.javascript.Scriptable#getClassName
      */
     public void addAsConstructor(Scriptable scope, Scriptable prototype) {
-        initAsConstructor(scope, prototype);
+        initAsConstructor(
+                scope,
+                prototype,
+                ScriptableObject.DONTENUM | ScriptableObject.PERMANENT | ScriptableObject.READONLY);
+        defineProperty(scope, prototype.getClassName(), this, ScriptableObject.DONTENUM);
+    }
+
+    /**
+     * Define this function as a JavaScript constructor.
+     *
+     * <p>Sets up the "prototype" and "constructor" properties. Also calls setParent and
+     * setPrototype with appropriate values. Then adds the function object as a property of the
+     * given scope, using <code>prototype.getClassName()</code> as the name of the property.
+     *
+     * @param scope the scope in which to define the constructor (typically the global object)
+     * @param prototype the prototype object
+     * @param attributes the attributes of the constructor property
+     * @see org.mozilla.javascript.Scriptable#setParentScope
+     * @see org.mozilla.javascript.Scriptable#setPrototype
+     * @see org.mozilla.javascript.Scriptable#getClassName
+     */
+    public void addAsConstructor(Scriptable scope, Scriptable prototype, int attributes) {
+        initAsConstructor(scope, prototype, attributes);
         defineProperty(scope, prototype.getClassName(), this, ScriptableObject.DONTENUM);
     }
 
-    void initAsConstructor(Scriptable scope, Scriptable prototype) {
-        ScriptRuntime.setFunctionProtoAndParent(this, scope);
+    void initAsConstructor(Scriptable scope, Scriptable prototype, int attributes) {
+        ScriptRuntime.setFunctionProtoAndParent(this, Context.getCurrentContext(), scope);
         setImmunePrototypeProperty(prototype);
 
         prototype.setParentScope(this);
 
-        defineProperty(
-                prototype,
-                "constructor",
-                this,
-                ScriptableObject.DONTENUM | ScriptableObject.PERMANENT | ScriptableObject.READONLY);
+        defineProperty(prototype, "constructor", this, attributes);
         setParentScope(scope);
     }
 

src/org/mozilla/javascript/LambdaFunction.java

@@ -34,7 +34,7 @@ public LambdaFunction(Scriptable scope, String name, int length, Callable target
         this.target = target;
         this.name = name;
         this.length = length;
-        ScriptRuntime.setFunctionProtoAndParent(this, scope);
+        ScriptRuntime.setFunctionProtoAndParent(this, Context.getCurrentContext(), scope);
         setupDefaultPrototype();
     }
 
@@ -43,7 +43,7 @@ public LambdaFunction(Scriptable scope, int length, Callable target) {
         this.target = target;
         this.length = length;
         this.name = "";
-        ScriptRuntime.setFunctionProtoAndParent(this, scope);
+        ScriptRuntime.setFunctionProtoAndParent(this, Context.getCurrentContext(), scope);
     }
 
     @Override

src/org/mozilla/javascript/NativePromise.java

@@ -35,7 +35,6 @@ public static void init(Context cx, Scriptable scope, boolean sealed) {
                         1,
                         LambdaConstructor.CONSTRUCTOR_NEW,
                         NativePromise::constructor);
-        constructor.setStandardPropertyAttributes(DONTENUM | READONLY);
         constructor.setPrototypePropertyAttributes(DONTENUM | READONLY | PERMANENT);
 
         constructor.defineConstructorMethod(
@@ -541,7 +540,6 @@ private static class ResolvingFunctions {
                                             scope,
                                             promise,
                                             (args.length > 0 ? args[0] : Undefined.instance)));
-            resolve.setStandardPropertyAttributes(DONTENUM | READONLY);
             reject =
                     new LambdaFunction(
                             topScope,
@@ -552,7 +550,6 @@ private static class ResolvingFunctions {
                                             scope,
                                             promise,
                                             (args.length > 0 ? args[0] : Undefined.instance)));
-            reject.setStandardPropertyAttributes(DONTENUM | READONLY);
         }
 
         private Object reject(Context cx, Scriptable scope, NativePromise promise, Object reason) {
@@ -664,7 +661,6 @@ private static class Capability {
                             2,
                             (Context cx, Scriptable scope, Scriptable thisObj, Object[] args) ->
                                     executor(args));
-            executorFunc.setStandardPropertyAttributes(DONTENUM | READONLY);
 
             promise = promiseConstructor.construct(topCx, topScope, new Object[] {executorFunc});
 
@@ -777,7 +773,6 @@ Object resolve(Context topCx, Scriptable topScope) {
                                     }
                                     return eltResolver.resolve(cx, scope, value, this);
                                 });
-                resolveFunc.setStandardPropertyAttributes(DONTENUM | READONLY);
 
                 Callable rejectFunc = capability.reject;
                 if (!failFast) {

src/org/mozilla/javascript/ScriptRuntime.java

@@ -4249,23 +4249,36 @@ public static Scriptable leaveDotQuery(Scriptable scope) {
         return nw.getParentScope();
     }
 
+    /**
+     * @deprecated Use {@link #setFunctionProtoAndParent(BaseFunction, Context, Scriptable)} instead
+     */
+    @Deprecated
     public static void setFunctionProtoAndParent(BaseFunction fn, Scriptable scope) {
-        setFunctionProtoAndParent(fn, scope, false);
+        setFunctionProtoAndParent(fn, Context.getCurrentContext(), scope, false);
+    }
+
+    public static void setFunctionProtoAndParent(BaseFunction fn, Context cx, Scriptable scope) {
+        setFunctionProtoAndParent(fn, cx, scope, false);
     }
 
+    /**
+     * @deprecated Use {@link #setFunctionProtoAndParent(BaseFunction, Context, Scriptable,
+     *     boolean)} instead
+     */
+    @Deprecated
     public static void setFunctionProtoAndParent(
             BaseFunction fn, Scriptable scope, boolean es6GeneratorFunction) {
+        setFunctionProtoAndParent(fn, Context.getCurrentContext(), scope, es6GeneratorFunction);
+    }
+
+    public static void setFunctionProtoAndParent(
+            BaseFunction fn, Context cx, Scriptable scope, boolean es6GeneratorFunction) {
         fn.setParentScope(scope);
         if (es6GeneratorFunction) {
             fn.setPrototype(ScriptableObject.getGeneratorFunctionPrototype(scope));
         } else {
             fn.setPrototype(ScriptableObject.getFunctionPrototype(scope));
         }
-    }
-
-    public static void setFunctionProtoAndParent(
-            BaseFunction fn, Context cx, Scriptable scope, boolean es6GeneratorFunction) {
-        setFunctionProtoAndParent(fn, scope, es6GeneratorFunction);
 
         if (cx != null && cx.getLanguageVersion() >= Context.VERSION_ES6) {
             fn.setStandardPropertyAttributes(ScriptableObject.READONLY | ScriptableObject.DONTENUM);

src/org/mozilla/javascript/ScriptableObject.java

@@ -1108,7 +1108,10 @@ static <T extends Scriptable> BaseFunction buildClassCtor(
         if (ctor.isVarArgsMethod()) {
             throw Context.reportRuntimeErrorById("msg.varargs.ctor", ctorMember.getName());
         }
-        ctor.initAsConstructor(scope, proto);
+        ctor.initAsConstructor(
+                scope,
+                proto,
+                ScriptableObject.DONTENUM | ScriptableObject.PERMANENT | ScriptableObject.READONLY);
 
         Method finishInit = null;
         HashSet<String> staticNames = new HashSet<String>(), instanceNames = new HashSet<String>();

src/org/mozilla/javascript/regexp/NativeRegExp.java

@@ -122,7 +122,7 @@ public static void init(Context cx, Scriptable scope, boolean sealed) {
         // RegExp.prototype.constructor is the builtin RegExp constructor."
         proto.defineProperty("constructor", ctor, ScriptableObject.DONTENUM);
 
-        ScriptRuntime.setFunctionProtoAndParent(ctor, scope);
+        ScriptRuntime.setFunctionProtoAndParent(ctor, cx, scope);
 
         ctor.setImmunePrototypeProperty(proto);
 

testsrc/test262.properties

@@ -3542,8 +3542,7 @@ language/expressions/conditional 3/22 (13.64%)
     tco-cond.js {unsupported: [tail-call-optimization]}
     tco-pos.js {unsupported: [tail-call-optimization]}
 
-language/expressions/delete 4/61 (6.56%)
-    11.4.1-5-a-28-s.js strict
+language/expressions/delete 3/61 (4.92%)
     identifier-strict.js strict
     super-property.js {unsupported: [class]}
     super-property-method.js {unsupported: [class]}