stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Athijegannathan Sundararajan 2013-10-11 14:13:00 +02:00
commit 2cb1e4ed46
9 changed files with 195 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
View File

@ -1793,7 +1793,7 @@ public class MethodEmitter implements Emitter {
debug("dynamic_set", name, peekType());
Type type = peekType();
if (type.isObject()) { //promote strings to objects etc
if (type.isObject() || type.isBoolean()) { //promote strings to objects etc
type = Type.OBJECT;
convert(Type.OBJECT); //TODO bad- until we specialize boolean setters,
}

2
nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
View File

@ -81,7 +81,7 @@ public class Namespace {
final int count = counter + 1;
namespaceDirectory.put(base, count);
return base + "$" + count;
return base + '-' + count;
}
}

2
nashorn/src/jdk/nashorn/internal/parser/Parser.java
View File

@ -2107,7 +2107,7 @@ loop:
final String ident = (String)expectValue(IDENT);
if (type != COLON) {
final long getSetToken = token;
final long getSetToken = propertyToken;
switch (ident) {
case "get":

65
nashorn/test/script/basic/JDK-8026292.js Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright (c) 2010, 2013, 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-8026292: Megamorphic setter fails with boolean value
*
* @test
* @run
*/
function megamorphic(o) {
o.w = true;
if (!o.w)
throw new Error();
}
// Calls below must exceed megamorphic callsite threshhold
for (var i = 0; i < 10; i++) {
megamorphic({a: 1});
megamorphic({b: 1});
megamorphic({c: 1});
megamorphic({d: 1});
megamorphic({e: 1});
megamorphic({f: 1});
megamorphic({g: 1});
megamorphic({h: 1});
megamorphic({i: 1});
megamorphic({j: 1});
megamorphic({k: 1});
megamorphic({l: 1});
megamorphic({m: 1});
megamorphic({n: 1});
megamorphic({o: 1});
megamorphic({p: 1});
megamorphic({q: 1});
megamorphic({r: 1});
megamorphic({s: 1});
megamorphic({t: 1});
megamorphic({u: 1});
megamorphic({v: 1});
megamorphic({w: 1});
megamorphic({x: 1});
megamorphic({y: 1});
megamorphic({z: 1});
}

48
nashorn/test/script/basic/JDK-8026302.js Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2010, 2013, 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-8026302: source representation of getter and setter methods is wrong
*
* @test
* @run
*/
var obj = {
get "foo"() {},
set "foo"(x) {},
get bar() {},
set bar(x) {},
get ":"() {},
set ":"(x) {},
get 12() {},
set 12(x) {},
get 1.8e-8() {},
set 1.8e-8(x) {}
}
for (var prop in obj) {
var desc = Object.getOwnPropertyDescriptor(obj, prop);
print(desc.get);
print(desc.set);
}

10
nashorn/test/script/basic/JDK-8026302.js.EXPECTED Normal file
View File

@ -0,0 +1,10 @@
get "foo"() {}
set "foo"(x) {}
get bar() {}
set bar(x) {}
get ":"() {}
set ":"(x) {}
get 12() {}
set 12(x) {}
get 1.8e-8() {}
set 1.8e-8(x) {}

63
nashorn/test/script/basic/JDK-8026317.js Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright (c) 2010, 2013, 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-8026317: $ in the function name results in wrong function being invoked
*
* @test
* @run
*/
function case1() {
function g() {
return 0
}
function g() {
return 1
}
function g$1() {
return 2
}
return g$1()
}
print(case1());
function case2() {
function g() {
return 0
}
var h = function g() {
return 1
}
function g$1() {
return 2
}
return h()
}
print(case2());

2
nashorn/test/script/basic/JDK-8026317.js.EXPECTED Normal file
View File

@ -0,0 +1,2 @@
2
1

8
nashorn/test/script/basic/objects.js.EXPECTED
View File

@ -29,18 +29,18 @@ abc is writable? undefined
abc is configurable? true
abc is enumerable? true
abc's value = undefined
abc's get = abc() { return "abc"; }
abc's get = get abc() { return "abc"; }
abc's set = undefined
xyz is writable? undefined
xyz is configurable? true
xyz is enumerable? true
xyz's value = undefined
xyz's get = undefined
xyz's set = xyz(val) { print(val); }
xyz's set = set xyz(val) { print(val); }
hey is writable? undefined
hey is configurable? true
hey is enumerable? true
hey's value = undefined
hey's get = hey() { return "hey"; }
hey's set = hey(val) { print(val); }
hey's get = get hey() { return "hey"; }
hey's set = set hey(val) { print(val); }
undefined