Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java	Mon Sep 15 17:51:11 2014 +0200
     1.2 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java	Tue Sep 16 18:11:59 2014 +0530
     1.3 @@ -131,11 +131,16 @@
     1.4              }
     1.5              return getInvocation(EMPTY_ELEM_GETTER, self, linkerServices, desc);
     1.6          case "setProp":
     1.7 -        case "setElem":
     1.8 +        case "setElem": {
     1.9 +            final boolean strict = NashornCallSiteDescriptor.isStrict(desc);
    1.10 +            if (strict) {
    1.11 +                throw typeError("cant.set.property", getArgument(linkRequest), ScriptRuntime.safeToString(self));
    1.12 +            }
    1.13              if (desc.getOperand() != null) {
    1.14                  return getInvocation(EMPTY_PROP_SETTER, self, linkerServices, desc);
    1.15              }
    1.16              return getInvocation(EMPTY_ELEM_SETTER, self, linkerServices, desc);
    1.17 +        }
    1.18          default:
    1.19              break;
    1.20          }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8058545.js	Tue Sep 16 18:11:59 2014 +0530
     2.3 @@ -0,0 +1,41 @@
     2.4 +/*
     2.5 + * Copyright (c) 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-8058545: With strict mode, bean property assignment of a non-existent property should result in TypeError
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +'use strict';
    2.35 +var File = Java.type("java.io.File");
    2.36 +var f = new File(".");
    2.37 +try {
    2.38 +    f.foo = 33;
    2.39 +    fail("Should have thrown TypeError");
    2.40 +} catch (e) {
    2.41 +    if (! (e instanceof TypeError)) {
    2.42 +        fail("Expected TypeError, got " + e);
    2.43 +    }
    2.44 +}