Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > nashorn
changeset 1056:1dd26718dbaa
8061113: Boolean used as optimistic call return type
Reviewed-by: hannesw, sundar
| author | attila |
|---|---|
| date | Thu, 16 Oct 2014 11:34:31 +0200 |
| parents | 2bf4c14345aa |
| children | 6de46794603c |
| files | src/jdk/nashorn/internal/codegen/TypeEvaluator.java test/script/basic/JDK-8061113.js test/script/basic/JDK-8061113.js.EXPECTED |
| diffstat | 3 files changed, 44 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/TypeEvaluator.java Wed Oct 15 19:50:03 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/TypeEvaluator.java Thu Oct 16 11:34:31 2014 +0200 @@ -232,7 +232,14 @@ if (callExpr.getArgs().isEmpty()) { final RecompilableScriptFunctionData data = compiler.getScriptFunctionData(fn.getId()); if (data != null) { - return Type.typeFor(data.getReturnType(EMPTY_INVOCATION_TYPE, runtimeScope)); + final Type returnType = Type.typeFor(data.getReturnType(EMPTY_INVOCATION_TYPE, runtimeScope)); + if (returnType == Type.BOOLEAN) { + // We don't have optimistic booleans. In fact, optimistic call sites getting back boolean + // currently deoptimize all the way to Object. + return Type.OBJECT; + } + assert returnType == Type.INT || returnType == Type.LONG || returnType == Type.NUMBER || returnType == Type.OBJECT; + return returnType; } } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8061113.js Thu Oct 16 11:34:31 2014 +0200 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8061113: Boolean used as optimistic call return type + * + * @test + * @run + */ + +function testcase() { + var a = {x:0}; + return (function () {return a.x === 0})(); +} +print(testcase());