Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/ScriptObject.java	Wed Dec 10 18:28:41 2014 +0100
     1.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java	Thu Dec 11 14:32:26 2014 +0100
     1.3 @@ -2333,8 +2333,9 @@
     1.4          }
     1.5  
     1.6          final ScriptFunction func = (ScriptFunction)value;
     1.7 -        final Object         thiz = scopeCall && func.isStrict() ? ScriptRuntime.UNDEFINED : this;
     1.8 +        final Object         thiz = scopeCall && func.isStrict() ? UNDEFINED : this;
     1.9          // TODO: It'd be awesome if we could bind "name" without binding "this".
    1.10 +        // Since we're binding this we must use an identity guard here.
    1.11          return new GuardedInvocation(
    1.12                  MH.dropArguments(
    1.13                          MH.constant(
    1.14 @@ -2342,9 +2343,9 @@
    1.15                                  func.makeBoundFunction(thiz, new Object[] { name })),
    1.16                          0,
    1.17                          Object.class),
    1.18 -                NashornGuards.getMapGuard(getMap(), explicitInstanceOfCheck),
    1.19 -                (SwitchPoint)null,
    1.20 -                explicitInstanceOfCheck ? null : ClassCastException.class);
    1.21 +                NashornGuards.combineGuards(
    1.22 +                        NashornGuards.getIdentityGuard(this),
    1.23 +                        NashornGuards.getMapGuard(getMap(), true)));
    1.24      }
    1.25  
    1.26      /**

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8066932.js	Thu Dec 11 14:32:26 2014 +0100
     2.3 @@ -0,0 +1,48 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8066932: __noSuchMethod__ binds to this-object without proper guard
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +function C(id) {
    2.35 +    this.id = id;
    2.36 +}
    2.37 +
    2.38 +C.prototype.__noSuchMethod__ = function(name, args) {
    2.39 +    return this.id;
    2.40 +};
    2.41 +
    2.42 +function test(id) {
    2.43 +    var c = new C(id);
    2.44 +    return c.nonExistingMethod();
    2.45 +}
    2.46 +
    2.47 +for (var i = 0; i < 30; i++) {
    2.48 +    if (test(i) !== i) {
    2.49 +        throw new Error("Wrong result from noSuchMethod in iteration " + i);
    2.50 +    }
    2.51 +}