Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/CompiledFunction.java	Mon Jan 22 11:20:31 2018 -0800
     1.2 +++ b/src/jdk/nashorn/internal/runtime/CompiledFunction.java	Wed Feb 07 10:44:48 2018 -0800
     1.3 @@ -525,6 +525,9 @@
     1.4  
     1.5          final int csParamCount = getParamCount(other);
     1.6          final boolean csIsVarArg = csParamCount == Integer.MAX_VALUE;
     1.7 +        if (csIsVarArg && isApplyToCall()) {
     1.8 +            return false; // apply2call function must be called with exact number of parameters
     1.9 +        }
    1.10          final int thisThisIndex = needsCallee() ? 1 : 0; // Index of "this" parameter in this function's type
    1.11  
    1.12          final int fnParamCountNoCallee = fnParamCount - thisThisIndex;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8186646.js	Wed Feb 07 10:44:48 2018 -0800
     2.3 @@ -0,0 +1,39 @@
     2.4 +/*
     2.5 + * Copyright (c) 2017, 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-8186646: Nashorn: "duplicate code" assertion when binding a vararg function that just passes arguments along
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var fn2 = function () {};
    2.35 +
    2.36 +var fn = function () {
    2.37 +    fn2.apply(null, arguments);
    2.38 +};
    2.39 +
    2.40 +fn();
    2.41 +fn.bind();
    2.42 +