Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/codegen/Attr.java	Fri Jul 05 15:10:47 2013 +0200
     1.2 +++ b/src/jdk/nashorn/internal/codegen/Attr.java	Fri Jul 05 19:35:39 2013 +0200
     1.3 @@ -749,6 +749,7 @@
     1.4      @Override
     1.5      public Node leaveReturnNode(final ReturnNode returnNode) {
     1.6          final Node expr = returnNode.getExpression();
     1.7 +        final Type returnType;
     1.8  
     1.9          if (expr != null) {
    1.10              //we can't do parameter specialization if we return something that hasn't been typed yet
    1.11 @@ -757,10 +758,12 @@
    1.12                  symbol.setType(Type.OBJECT);
    1.13              }
    1.14  
    1.15 -            final Type returnType = Type.widest(returnTypes.pop(), symbol.getSymbolType());
    1.16 -            returnTypes.push(returnType);
    1.17 -            LOG.info("Returntype is now ", returnType);
    1.18 +            returnType = Type.widest(returnTypes.pop(), symbol.getSymbolType());
    1.19 +        } else {
    1.20 +            returnType = Type.OBJECT; //undefined
    1.21          }
    1.22 +        LOG.info("Returntype is now ", returnType);
    1.23 +        returnTypes.push(returnType);
    1.24  
    1.25          end(returnNode);
    1.26  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8019983.js	Fri Jul 05 19:35:39 2013 +0200
     2.3 @@ -0,0 +1,42 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, 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-8019983.js return without expression combined with return with expression should produce object
    2.29 + * return type (undefined)
    2.30 + * 
    2.31 + * @test
    2.32 + * @run
    2.33 + */
    2.34 +
    2.35 +
    2.36 +function g() { 
    2.37 +    switch(1) { 
    2.38 +    case 0: 
    2.39 +    case '': 
    2.40 +    default:
    2.41 +	return;
    2.42 +    }
    2.43 +    return 10;
    2.44 +}
    2.45 +print(g());

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8019983.js.EXPECTED	Fri Jul 05 19:35:39 2013 +0200
     3.3 @@ -0,0 +1,1 @@
     3.4 +undefined