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:
Lana Steuck 2015-05-21 16:19:37 -07:00
commit fb82a9eeb8
22 changed files with 936 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/make/build.xml
View File

@ -469,7 +469,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" {
</testng>
</target>
<target name="test" depends="test-pessimistic, test-optimistic"/>
<target name="test" depends="javadoc, test-pessimistic, test-optimistic"/>
<target name="test-optimistic" depends="jar, -test-classes-all,-test-classes-single, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
<echo message="Running test suite in OPTIMISTIC mode..."/>

134
nashorn/samples/console.js Normal file
View File

@ -0,0 +1,134 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* Simple Web Console-like support for Nashorn. In addition to
* Web console object methods, this console add methods of
* java.io.Console as well. Note:not all web console methods are
* implemented but useful subset is implemented.
*
* See also: https://developer.mozilla.org/en/docs/Web/API/console
*/
if (typeof console == 'undefined') {
(function() {
var LocalDateTime = Java.type("java.time.LocalDateTime");
var System = Java.type("java.lang.System");
var jconsole = System.console();
// add a new global variable called "console"
this.console = {
};
function addConsoleMethods() {
// expose methods of java.io.Console as an extension
var placeholder = "-*-";
// put a placeholder for each name from java.lang.Object
var objMethods = Object.bindProperties({}, new java.lang.Object());
for (var m in objMethods) {
console[m] = placeholder;
}
// bind only the methods of java.io.Console
// This bind will skip java.lang.Object methods as console
// has properties of same name.
Object.bindProperties(console, jconsole);
// Now, delete java.lang.Object methods
for (var m in console) {
if (console[m] == placeholder) {
delete console[m];
}
}
}
addConsoleMethods();
function consoleLog(type, msg) {
// print type of message, then time.
jconsole.format("%s [%s] ", type, LocalDateTime.now().toString());
if (typeof msg == 'string') {
jconsole.format(msg + "\n", Array.prototype.slice.call(arguments, 2));
} else {
// simple space separated values and newline at the end
var arr = Array.prototype.slice.call(arguments, 1);
jconsole.format("%s\n", arr.join(" "));
}
}
console.toString = function() "[object Console]";
// web console functions
console.assert = function(expr) {
if (! expr) {
arguments[0] = "Assertion Failed:";
consoleLog.apply(console, arguments);
// now, stack trace at the end
jconsole.format("%s\n", new Error().stack);
}
};
// dummy clear to avoid error!
console.clear = function() {};
var counter = {
get: function(label) {
if (! this[label]) {
return this[label] = 1;
} else {
return ++this[label];
}
}
};
// counter
console.count = function(label) {
label = label? String(label) : "<no label>";
jconsole.format("%s: %d\n",label, counter.get(label).intValue());
}
// logging
console.error = consoleLog.bind(jconsole, "ERROR");
console.info = consoleLog.bind(jconsole, "INFO");
console.log = console.info;
console.debug = console.log;
console.warn = consoleLog.bind(jconsole, "WARNING");
// print stack trace
console.trace = function() {
jconsole.format("%s\n", new Error().stack);
};
})();
}

55
nashorn/samples/consoleuse.js Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
load(__DIR__ + "console.js");
console.log("consoleuse.js started!");
function func() {
console.count("func");
}
func();
func();
func();
func();
// java.io.Console method
console.readPassword("passworld please: ");
console.error("Big error: %s!", "you revealed your password!");
console.warn("You've done this %d times", 345);
console.assert(arguments.length != 0, "no arguments!");
// java.io.Console methods
var str = console.readLine("enter something: ");
console.printf("you entered: %s\n", str);

48
nashorn/samples/undefined_call.js Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// Nashorn extension: __noSuchMethod__
// See also: https://wiki.openjdk.java.net/display/Nashorn/Nashorn+extensions#Nashornextensions-__noSuchMethod__
Object.prototype.__noSuchMethod__ = function(name) {
print(name + " function is not defined in " + this);
// Nashorn extension: stack property
// gives stack trace as a string
print(new Error().stack);
}
function func(obj) {
obj.foo();
}
func({});
func(this);

79
nashorn/samples/unzip.js Normal file
View File

@ -0,0 +1,79 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
* Simple unzip tool using #nashorn and #java
* zip fs file system interface.
*/
if (arguments.length == 0) {
print("Usage: jjs zipfs.js -- <.zip/.jar file> [out dir]");
exit(1);
}
var File = Java.type("java.io.File");
// output directory where zip is extracted
var outDir = arguments[1];
if (!outDir) {
outDir = ".";
} else {
if (! new File(outDir).isDirectory()) {
print(outDir + " directory does not exist!");
exit(1);
}
}
var Files = Java.type("java.nio.file.Files");
var FileSystems = Java.type("java.nio.file.FileSystems");
var Paths = Java.type("java.nio.file.Paths");
var zipfile = Paths.get(arguments[0])
var fs = FileSystems.newFileSystem(zipfile, null);
var root = fs.rootDirectories[0];
// walk root and handle each Path
Files.walk(root).forEach(
function(p) {
var outPath = outDir +
p.toString().replace('/', File.separatorChar);
print(outPath);
if (Files.isDirectory(p)) {
// create directories as needed
new File(outPath).mkdirs();
} else {
// copy a 'file' resource
Files.copy(p, new File(outPath).toPath());
}
}
);
// done
fs.close();

1
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
View File

@ -3798,7 +3798,6 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
emitBranch(binaryNode, onTrue, true);
if (isCurrentDiscard) {
method.label(onTrue);
method.pop();
} else {
method.load(false);
method._goto(skip);

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
View File

@ -204,7 +204,7 @@ public class LexicalContext {
/**
* Explicitly apply flags to the topmost element on the stack. This is only valid to use from a
* {@code NodeVisitor.leaveXxx()} method and only on the node being exited at the time. It is not mandatory to use,
* as {@link #pop(LexicalContextNode)} will apply the flags automatically, but this method can be used to apply them
* as {@link #pop(Node)} will apply the flags automatically, but this method can be used to apply them
* during the {@code leaveXxx()} method in case its logic depends on the value of the flags.
* @param node the node to apply the flags to. Must be the topmost node on the stack.
* @return the passed in node, or a modified node (if any flags were modified)

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java
View File

@ -57,7 +57,7 @@ public final class TryNode extends LexicalContextStatement implements JoinPredec
* block was not terminal; the original jump/return is simply ignored if the finally block itself
* terminates). The reason for this somewhat strange arrangement is that we didn't want to create a
* separate class for the (label, BlockStatement pair) but rather reused the already available LabelNode.
* However, if we simply used List<LabelNode> without wrapping the label nodes in an additional Block,
* However, if we simply used List&lt;LabelNode&gt; without wrapping the label nodes in an additional Block,
* that would've thrown off visitors relying on BlockLexicalContext -- same reason why we never use
* Statement as the type of bodies of e.g. IfNode, WhileNode etc. but rather blockify them even when they're
* single statements.

253
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
View File

@ -220,7 +220,12 @@ public final class Global extends ScriptObject implements Scope {
@Property(name = "Number", attributes = Attribute.NOT_ENUMERABLE)
public volatile Object number;
/** ECMA 15.1.4.7 Date constructor */
/**
* Getter for ECMA 15.1.4.7 Date property
*
* @param self self reference
* @return Date property value
*/
@Getter(name = "Date", attributes = Attribute.NOT_ENUMERABLE)
public static Object getDate(final Object self) {
final Global global = Global.instanceFrom(self);
@ -230,6 +235,12 @@ public final class Global extends ScriptObject implements Scope {
return global.date;
}
/**
* Setter for ECMA 15.1.4.7 Date property
*
* @param self self reference
* @param value value for the Date property
*/
@Setter(name = "Date", attributes = Attribute.NOT_ENUMERABLE)
public static void setDate(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -238,7 +249,12 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object date = LAZY_SENTINEL;
/** ECMA 15.1.4.8 RegExp constructor */
/**
* Getter for ECMA 15.1.4.8 RegExp property
*
* @param self self reference
* @return RegExp property value
*/
@Getter(name = "RegExp", attributes = Attribute.NOT_ENUMERABLE)
public static Object getRegExp(final Object self) {
final Global global = Global.instanceFrom(self);
@ -248,6 +264,12 @@ public final class Global extends ScriptObject implements Scope {
return global.regexp;
}
/**
* Setter for ECMA 15.1.4.8 RegExp property
*
* @param self self reference
* @param value value for the RegExp property
*/
@Setter(name = "RegExp", attributes = Attribute.NOT_ENUMERABLE)
public static void setRegExp(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -256,7 +278,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object regexp = LAZY_SENTINEL;
/** ECMA 15.12 - The JSON object */
/**
* Getter for ECMA 15.12 - The JSON property
* @param self self reference
* @return the value of JSON property
*/
@Getter(name = "JSON", attributes = Attribute.NOT_ENUMERABLE)
public static Object getJSON(final Object self) {
final Global global = Global.instanceFrom(self);
@ -266,6 +292,11 @@ public final class Global extends ScriptObject implements Scope {
return global.json;
}
/**
* Setter for ECMA 15.12 - The JSON property
* @param self self reference
* @param value value for the JSON property
*/
@Setter(name = "JSON", attributes = Attribute.NOT_ENUMERABLE)
public static void setJSON(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -274,7 +305,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object json = LAZY_SENTINEL;
/** Nashorn extension: global.JSAdapter */
/**
* Getter for Nashorn extension: global.JSAdapter
* @param self self reference
* @return value of the JSAdapter property
*/
@Getter(name = "JSAdapter", attributes = Attribute.NOT_ENUMERABLE)
public static Object getJSAdapter(final Object self) {
final Global global = Global.instanceFrom(self);
@ -284,6 +319,11 @@ public final class Global extends ScriptObject implements Scope {
return global.jsadapter;
}
/**
* Setter for Nashorn extension: global.JSAdapter
* @param self self reference
* @param value value for the JSAdapter property
*/
@Setter(name = "JSAdapter", attributes = Attribute.NOT_ENUMERABLE)
public static void setJSAdapter(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -300,7 +340,11 @@ public final class Global extends ScriptObject implements Scope {
@Property(name = "Error", attributes = Attribute.NOT_ENUMERABLE)
public volatile Object error;
/** EvalError object */
/**
* Getter for the EvalError property
* @param self self reference
* @return the value of EvalError property
*/
@Getter(name = "EvalError", attributes = Attribute.NOT_ENUMERABLE)
public static Object getEvalError(final Object self) {
final Global global = Global.instanceFrom(self);
@ -310,6 +354,11 @@ public final class Global extends ScriptObject implements Scope {
return global.evalError;
}
/**
* Setter for the EvalError property
* @param self self reference
* @param value value of the EvalError property
*/
@Setter(name = "EvalError", attributes = Attribute.NOT_ENUMERABLE)
public static void setEvalError(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -318,7 +367,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object evalError = LAZY_SENTINEL;
/** RangeError object */
/**
* Getter for the RangeError property.
* @param self self reference
* @return the value of RangeError property
*/
@Getter(name = "RangeError", attributes = Attribute.NOT_ENUMERABLE)
public static Object getRangeError(final Object self) {
final Global global = Global.instanceFrom(self);
@ -328,6 +381,12 @@ public final class Global extends ScriptObject implements Scope {
return global.rangeError;
}
/**
* Setter for the RangeError property.
* @param self self reference
* @param value value for the RangeError property
*/
@Setter(name = "RangeError", attributes = Attribute.NOT_ENUMERABLE)
public static void setRangeError(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -348,7 +407,11 @@ public final class Global extends ScriptObject implements Scope {
@Property(name = "TypeError", attributes = Attribute.NOT_ENUMERABLE)
public volatile Object typeError;
/** URIError object */
/**
* Getter for the URIError property.
* @param self self reference
* @return the value of URIError property
*/
@Getter(name = "URIError", attributes = Attribute.NOT_ENUMERABLE)
public static Object getURIError(final Object self) {
final Global global = Global.instanceFrom(self);
@ -358,6 +421,11 @@ public final class Global extends ScriptObject implements Scope {
return global.uriError;
}
/**
* Setter for the URIError property.
* @param self self reference
* @param value value for the URIError property
*/
@Setter(name = "URIError", attributes = Attribute.NOT_ENUMERABLE)
public static void setURIError(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -366,7 +434,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object uriError = LAZY_SENTINEL;
/** ArrayBuffer object */
/**
* Getter for the ArrayBuffer property.
* @param self self reference
* @return the value of the ArrayBuffer property
*/
@Getter(name = "ArrayBuffer", attributes = Attribute.NOT_ENUMERABLE)
public static Object getArrayBuffer(final Object self) {
final Global global = Global.instanceFrom(self);
@ -376,6 +448,11 @@ public final class Global extends ScriptObject implements Scope {
return global.arrayBuffer;
}
/**
* Setter for the ArrayBuffer property.
* @param self self reference
* @param value value of the ArrayBuffer property
*/
@Setter(name = "ArrayBuffer", attributes = Attribute.NOT_ENUMERABLE)
public static void setArrayBuffer(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -384,7 +461,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object arrayBuffer;
/** DataView object */
/**
* Getter for the DataView property.
* @param self self reference
* @return the value of the DataView property
*/
@Getter(name = "DataView", attributes = Attribute.NOT_ENUMERABLE)
public static Object getDataView(final Object self) {
final Global global = Global.instanceFrom(self);
@ -394,6 +475,12 @@ public final class Global extends ScriptObject implements Scope {
return global.dataView;
}
/**
* Setter for the DataView property.
* @param self self reference
* @param value value of the DataView property
*/
@Setter(name = "DataView", attributes = Attribute.NOT_ENUMERABLE)
public static void setDataView(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -402,7 +489,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object dataView;
/** TypedArray (int8) */
/**
* Getter for the Int8Array property.
* @param self self reference
* @return the value of the Int8Array property.
*/
@Getter(name = "Int8Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getInt8Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -412,6 +503,11 @@ public final class Global extends ScriptObject implements Scope {
return global.int8Array;
}
/**
* Setter for the Int8Array property.
* @param self self reference
* @param value value of the Int8Array property
*/
@Setter(name = "Int8Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setInt8Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -420,7 +516,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object int8Array;
/** TypedArray (uint8) */
/**
* Getter for the Uin8Array property.
* @param self self reference
* @return the value of the Uint8Array property
*/
@Getter(name = "Uint8Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getUint8Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -430,6 +530,11 @@ public final class Global extends ScriptObject implements Scope {
return global.uint8Array;
}
/**
* Setter for the Uin8Array property.
* @param self self reference
* @param value value of the Uin8Array property
*/
@Setter(name = "Uint8Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setUint8Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -438,7 +543,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object uint8Array;
/** TypedArray (uint8) - Clamped */
/**
* Getter for the Uint8ClampedArray property.
* @param self self reference
* @return the value of the Uint8ClampedArray property
*/
@Getter(name = "Uint8ClampedArray", attributes = Attribute.NOT_ENUMERABLE)
public static Object getUint8ClampedArray(final Object self) {
final Global global = Global.instanceFrom(self);
@ -448,6 +557,11 @@ public final class Global extends ScriptObject implements Scope {
return global.uint8ClampedArray;
}
/**
* Setter for the Uint8ClampedArray property.
* @param self self reference
* @param value value of the Uint8ClampedArray property
*/
@Setter(name = "Uint8ClampedArray", attributes = Attribute.NOT_ENUMERABLE)
public static void setUint8ClampedArray(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -456,7 +570,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object uint8ClampedArray;
/** TypedArray (int16) */
/**
* Getter for the Int16Array property.
* @param self self reference
* @return the value of the Int16Array property
*/
@Getter(name = "Int16Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getInt16Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -466,6 +584,11 @@ public final class Global extends ScriptObject implements Scope {
return global.int16Array;
}
/**
* Setter for the Int16Array property.
* @param self self reference
* @param value value of the Int16Array property
*/
@Setter(name = "Int16Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setInt16Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -474,7 +597,11 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object int16Array;
/** TypedArray (uint16) */
/**
* Getter for the Uint16Array property.
* @param self self reference
* @return the value of the Uint16Array property
*/
@Getter(name = "Uint16Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getUint16Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -484,6 +611,11 @@ public final class Global extends ScriptObject implements Scope {
return global.uint16Array;
}
/**
* Setter for the Uint16Array property.
* @param self self reference
* @param value value of the Uint16Array property
*/
@Setter(name = "Uint16Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setUint16Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -492,7 +624,12 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object uint16Array;
/** TypedArray (int32) */
/**
* Getter for the Int32Array property.
*
* @param self self reference
* @return the value of the Int32Array property
*/
@Getter(name = "Int32Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getInt32Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -502,6 +639,13 @@ public final class Global extends ScriptObject implements Scope {
return global.int32Array;
}
/**
* Setter for the Int32Array property.
*
* @param self self reference
* @param value value of the Int32Array property
*/
@Setter(name = "Int32Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setInt32Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -510,7 +654,12 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object int32Array;
/** TypedArray (uint32) */
/**
* Getter of the Uint32Array property.
*
* @param self self reference
* @return the value of the Uint32Array property
*/
@Getter(name = "Uint32Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getUint32Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -520,6 +669,13 @@ public final class Global extends ScriptObject implements Scope {
return global.uint32Array;
}
/**
* Setter of the Uint32Array property.
*
* @param self self reference
* @param value value of the Uint32Array property
*/
@Setter(name = "Uint32Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setUint32Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -528,7 +684,12 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object uint32Array;
/** TypedArray (float32) */
/**
* Getter for the Float32Array property.
*
* @param self self reference
* @return the value of the Float32Array property
*/
@Getter(name = "Float32Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getFloat32Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -538,6 +699,12 @@ public final class Global extends ScriptObject implements Scope {
return global.float32Array;
}
/**
* Setter for the Float32Array property.
*
* @param self self reference
* @param value value of the Float32Array property
*/
@Setter(name = "Float32Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setFloat32Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -546,7 +713,12 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object float32Array;
/** TypedArray (float64) */
/**
* Getter for the Float64Array property.
*
* @param self self reference
* @return the value of the Float64Array property
*/
@Getter(name = "Float64Array", attributes = Attribute.NOT_ENUMERABLE)
public static Object getFloat64Array(final Object self) {
final Global global = Global.instanceFrom(self);
@ -556,6 +728,12 @@ public final class Global extends ScriptObject implements Scope {
return global.float64Array;
}
/**
* Setter for the Float64Array property.
*
* @param self self reference
* @param value value of the Float64Array property
*/
@Setter(name = "Float64Array", attributes = Attribute.NOT_ENUMERABLE)
public static void setFloat64Array(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -592,7 +770,12 @@ public final class Global extends ScriptObject implements Scope {
@Property(attributes = Attribute.NOT_ENUMERABLE)
public volatile Object org;
/** Nashorn extension: Java access - global.javaImporter */
/**
* Getter for the Nashorn extension: Java access - global.javaImporter.
*
* @param self self reference
* @return the value of the JavaImporter property
*/
@Getter(name = "JavaImporter", attributes = Attribute.NOT_ENUMERABLE)
public static Object getJavaImporter(final Object self) {
final Global global = Global.instanceFrom(self);
@ -602,6 +785,12 @@ public final class Global extends ScriptObject implements Scope {
return global.javaImporter;
}
/**
* Setter for the Nashorn extension: Java access - global.javaImporter.
*
* @param self self reference
* @param value value of the JavaImporter property
*/
@Setter(name = "JavaImporter", attributes = Attribute.NOT_ENUMERABLE)
public static void setJavaImporter(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -610,7 +799,12 @@ public final class Global extends ScriptObject implements Scope {
private volatile Object javaImporter;
/** Nashorn extension: global.Java Object constructor. */
/**
* Getter for the Nashorn extension: global.Java property.
*
* @param self self reference
* @return the value of the Java property
*/
@Getter(name = "Java", attributes = Attribute.NOT_ENUMERABLE)
public static Object getJavaApi(final Object self) {
final Global global = Global.instanceFrom(self);
@ -620,6 +814,12 @@ public final class Global extends ScriptObject implements Scope {
return global.javaApi;
}
/**
* Setter for the Nashorn extension: global.Java property.
*
* @param self self reference
* @param value value of the Java property
*/
@Setter(name = "Java", attributes = Attribute.NOT_ENUMERABLE)
public static void setJavaApi(final Object self, final Object value) {
final Global global = Global.instanceFrom(self);
@ -2139,13 +2339,13 @@ public final class Global extends ScriptObject implements Scope {
@Override
public void addBoundProperties(final ScriptObject source, final jdk.nashorn.internal.runtime.Property[] properties) {
PropertyMap ownMap = getMap();
LexicalScope lexicalScope = null;
LexicalScope lexScope = null;
PropertyMap lexicalMap = null;
boolean hasLexicalDefinitions = false;
if (context.getEnv()._es6) {
lexicalScope = (LexicalScope) getLexicalScope();
lexicalMap = lexicalScope.getMap();
lexScope = (LexicalScope) getLexicalScope();
lexicalMap = lexScope.getMap();
for (final jdk.nashorn.internal.runtime.Property property : properties) {
if (property.isLexicalBinding()) {
@ -2165,8 +2365,8 @@ public final class Global extends ScriptObject implements Scope {
for (final jdk.nashorn.internal.runtime.Property property : properties) {
if (property.isLexicalBinding()) {
assert lexicalScope != null;
lexicalMap = lexicalScope.addBoundProperty(lexicalMap, source, property);
assert lexScope != null;
lexicalMap = lexScope.addBoundProperty(lexicalMap, source, property);
if (ownMap.findProperty(property.getKey()) != null) {
// If property exists in the global object invalidate any global constant call sites.
@ -2180,7 +2380,8 @@ public final class Global extends ScriptObject implements Scope {
setMap(ownMap);
if (hasLexicalDefinitions) {
lexicalScope.setMap(lexicalMap);
assert lexScope != null;
lexScope.setMap(lexicalMap);
invalidateLexicalSwitchPoint();
}
}

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
View File

@ -765,7 +765,7 @@ public final class NativeObject {
continue;
}
properties.add(AccessorProperty.create(methodName, Property.NOT_WRITABLE, getBoundBeanMethodGetter(source,
method), null));
method), Lookup.EMPTY_SETTER));
}
for(final String propertyName: propertyNames) {
MethodHandle getter;

55
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2015, 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
@ -34,10 +34,13 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.StreamTokenizer;
import java.io.StringReader;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
/**
* Global functions supported only in scripting mode.
@ -133,15 +136,8 @@ public final class ScriptingFunctions {
// Current global is need to fetch additional inputs and for additional results.
final ScriptObject global = Context.getGlobal();
// Break exec string into tokens.
final StringTokenizer tokenizer = new StringTokenizer(JSType.toString(string));
final String[] cmdArray = new String[tokenizer.countTokens()];
for (int i = 0; tokenizer.hasMoreTokens(); i++) {
cmdArray[i] = tokenizer.nextToken();
}
// Set up initial process.
final ProcessBuilder processBuilder = new ProcessBuilder(cmdArray);
final ProcessBuilder processBuilder = new ProcessBuilder(tokenizeCommandLine(JSType.toString(string)));
// Current ENV property state.
final Object env = global.get(ENV_NAME);
@ -239,4 +235,43 @@ public final class ScriptingFunctions {
private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
return MH.findStatic(MethodHandles.lookup(), ScriptingFunctions.class, name, MH.type(rtype, types));
}
/**
* Break an exec string into tokens, honoring quoted arguments and escaped
* spaces.
*
* @param execString a {@link String} with the command line to execute.
* @return a {@link List} of {@link String}s representing the tokens that
* constitute the command line.
* @throws IOException in case {@link StreamTokenizer#nextToken()} raises it.
*/
private static List<String> tokenizeCommandLine(final String execString) throws IOException {
final StreamTokenizer tokenizer = new StreamTokenizer(new StringReader(execString));
tokenizer.resetSyntax();
tokenizer.wordChars(0, 255);
tokenizer.whitespaceChars(0, ' ');
tokenizer.commentChar('#');
tokenizer.quoteChar('"');
tokenizer.quoteChar('\'');
final List<String> cmdList = new ArrayList<>();
final StringBuilder toAppend = new StringBuilder();
while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
final String s = tokenizer.sval;
// The tokenizer understands about honoring quoted strings and recognizes
// them as one token that possibly contains multiple space-separated words.
// It does not recognize quoted spaces, though, and will split after the
// escaping \ character. This is handled here.
if (s.endsWith("\\")) {
// omit trailing \, append space instead
toAppend.append(s.substring(0, s.length() - 1)).append(' ');
} else {
cmdList.add(toAppend.append(s).toString());
toAppend.setLength(0);
}
}
if (toAppend.length() != 0) {
cmdList.add(toAppend.toString());
}
return cmdList;
}
}

5
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
View File

@ -182,14 +182,13 @@ final class IntArrayData extends ContinuousArrayData implements IntElements {
@Override
public ArrayData convert(final Class<?> type) {
if (type == Integer.class) {
if (type == Integer.class || type == Byte.class || type == Short.class) {
return this;
} else if (type == Long.class) {
return convertToLong();
} else if (type == Double.class) {
} else if (type == Double.class || type == Float.class) {
return convertToDouble();
} else {
assert type == null || (!Number.class.isAssignableFrom(type) && !type.isPrimitive());
return convertToObject();
}
}

7
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
View File

@ -120,11 +120,11 @@ final class LongArrayData extends ContinuousArrayData implements IntOrLongElemen
@Override
public ContinuousArrayData convert(final Class<?> type) {
if (type == Integer.class || type == Long.class) {
if (type == Integer.class || type == Long.class || type == Byte.class || type == Short.class) {
return this;
}
final int len = (int)length();
if (type == Double.class) {
if (type == Double.class || type == Float.class) {
return new NumberArrayData(toDoubleArray(), len);
}
return new ObjectArrayData(toObjectArray(false), len);
@ -171,7 +171,8 @@ final class LongArrayData extends ContinuousArrayData implements IntOrLongElemen
@Override
public ArrayData set(final int index, final Object value, final boolean strict) {
if (value instanceof Long || value instanceof Integer) {
if (value instanceof Long || value instanceof Integer ||
value instanceof Byte || value instanceof Short) {
return set(index, ((Number)value).longValue(), strict);
} else if (value == ScriptRuntime.UNDEFINED) {
return new UndefinedArrayFilter(this).set(index, value, strict);

10
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
View File

@ -29,6 +29,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
import static jdk.nashorn.internal.lookup.Lookup.MH;
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
import jdk.internal.dynalink.support.TypeUtilities;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
@ -104,9 +105,14 @@ final class NumberArrayData extends ContinuousArrayData implements NumericElemen
return super.asArrayOfType(componentType);
}
private static boolean canWiden(final Class<?> type) {
return TypeUtilities.isWrapperType(type) &&
type != Boolean.class && type != Character.class;
}
@Override
public ContinuousArrayData convert(final Class<?> type) {
if (type != Double.class && type != Integer.class && type != Long.class) {
if (! canWiden(type)) {
final int len = (int)length();
return new ObjectArrayData(toObjectArray(false), len);
}
@ -154,7 +160,7 @@ final class NumberArrayData extends ContinuousArrayData implements NumericElemen
@Override
public ArrayData set(final int index, final Object value, final boolean strict) {
if (value instanceof Double || value instanceof Integer || value instanceof Long) {
if (value instanceof Double || (value != null && canWiden(value.getClass()))) {
return set(index, ((Number)value).doubleValue(), strict);
} else if (value == UNDEFINED) {
return new UndefinedArrayFilter(this).set(index, value, strict);

5
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java
View File

@ -216,10 +216,11 @@ final class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTyp
// Could've also used (targetType.isAssignableFrom(ScriptObjectMirror.class) && targetType != Object.class) but
// it's probably better to explicitly spell out the supported target types
if (targetType == Map.class || targetType == Bindings.class || targetType == JSObject.class || targetType == ScriptObjectMirror.class) {
if(ScriptObject.class.isAssignableFrom(sourceType)) {
if (ScriptObject.class.isAssignableFrom(sourceType)) {
return new GuardedInvocation(CREATE_MIRROR);
} else if (sourceType.isAssignableFrom(ScriptObject.class) || sourceType.isInterface()) {
return new GuardedInvocation(CREATE_MIRROR, IS_SCRIPT_OBJECT);
}
return new GuardedInvocation(CREATE_MIRROR, IS_SCRIPT_OBJECT);
}
return null;
}

89
nashorn/test/script/basic/JDK-8079145.js Normal file
View File

@ -0,0 +1,89 @@
/*
* Copyright (c) 2015 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-8079145: jdk.nashorn.internal.runtime.arrays.IntArrayData.convert assertion
*
* @test
* @fork
* @option -Dnashorn.debug=true
* @run
*/
var Byte = java.lang.Byte;
var Short = java.lang.Short;
var Integer = java.lang.Integer;
var Long = java.lang.Long;
var Float = java.lang.Float;
var Double = java.lang.Double;
var Character = java.lang.Character;
function checkWiden(arr, value, name) {
switch (typeof value) {
case 'object':
case 'undefined':
print(name + ": check widen for " + value);
break;
default:
print(name + ": check widen for " + value +
" [" + Debug.getClass(value) + "]");
}
arr[0] = value;
}
function checkIntWiden(value) {
checkWiden([34], value, "int array");
}
function checkLongWiden(value) {
checkWiden([Integer.MAX_VALUE + 1], value, "long array");
}
function checkNumberWiden(value) {
checkWiden([Math.PI], value, "number array");
}
function checkObjectWiden(value) {
checkWiden([null], value, "object array");
}
var values = [{}, null, undefined, false, true, new Byte(34),
new Integer(344454), new Long(454545), new Long(Integer.MAX_VALUE + 1),
new Float(34.3), new Double(Math.PI), new Character('s')];
for each (var v in values) {
checkIntWiden(v);
}
for each (var v in values) {
checkLongWiden(v);
}
for each (var v in values) {
checkNumberWiden(v);
}
for each (var v in values) {
checkObjectWiden(v);
}

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

@ -0,0 +1,48 @@
int array: check widen for [object Object]
int array: check widen for null
int array: check widen for undefined
int array: check widen for false [class java.lang.Boolean]
int array: check widen for true [class java.lang.Boolean]
int array: check widen for 34 [class java.lang.Byte]
int array: check widen for 344454 [class java.lang.Integer]
int array: check widen for 454545 [class java.lang.Long]
int array: check widen for 2147483648 [class java.lang.Long]
int array: check widen for 34.29999923706055 [class java.lang.Float]
int array: check widen for 3.141592653589793 [class java.lang.Double]
int array: check widen for s
long array: check widen for [object Object]
long array: check widen for null
long array: check widen for undefined
long array: check widen for false [class java.lang.Boolean]
long array: check widen for true [class java.lang.Boolean]
long array: check widen for 34 [class java.lang.Byte]
long array: check widen for 344454 [class java.lang.Integer]
long array: check widen for 454545 [class java.lang.Long]
long array: check widen for 2147483648 [class java.lang.Long]
long array: check widen for 34.29999923706055 [class java.lang.Float]
long array: check widen for 3.141592653589793 [class java.lang.Double]
long array: check widen for s
number array: check widen for [object Object]
number array: check widen for null
number array: check widen for undefined
number array: check widen for false [class java.lang.Boolean]
number array: check widen for true [class java.lang.Boolean]
number array: check widen for 34 [class java.lang.Byte]
number array: check widen for 344454 [class java.lang.Integer]
number array: check widen for 454545 [class java.lang.Long]
number array: check widen for 2147483648 [class java.lang.Long]
number array: check widen for 34.29999923706055 [class java.lang.Float]
number array: check widen for 3.141592653589793 [class java.lang.Double]
number array: check widen for s
object array: check widen for [object Object]
object array: check widen for null
object array: check widen for undefined
object array: check widen for false [class java.lang.Boolean]
object array: check widen for true [class java.lang.Boolean]
object array: check widen for 34 [class java.lang.Byte]
object array: check widen for 344454 [class java.lang.Integer]
object array: check widen for 454545 [class java.lang.Long]
object array: check widen for 2147483648 [class java.lang.Long]
object array: check widen for 34.29999923706055 [class java.lang.Float]
object array: check widen for 3.141592653589793 [class java.lang.Double]
object array: check widen for s

50
nashorn/test/script/basic/JDK-8079424.js Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2015 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-8079424: code generator for discarded boolean logical operation has an extra pop
*
* @test
* @run
*/
// If the compiler manages to compile all of these, the test passes.
void (true && true);
void (true && false);
void (false && true);
void (false && false);
void (true || true);
void (true || false);
void (false || true);
void (false || false);
void (1 && 1);
void (1 && 0);
void (0 && 1);
void (0 && 0);
void (1 || 1);
void (1 || 0);
void (0 || 1);
void (0 || 0);

37
nashorn/test/script/basic/JDK-8080848.js Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2015 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-8080848: delete of bound Java method property results in crash
*
* @test
* @run
*/
var obj = Object.bindProperties({}, new java.io.File("."));
delete obj.wait;
if (typeof obj.wait != 'undefined') {
throw new Error("obj.wait was not deleted");
}

4
nashorn/test/script/nosecurity/JDK-8050964.js
View File

@ -47,9 +47,9 @@ if (! nashornJar.isAbsolute()) {
}
var javahome = System.getProperty("java.home");
var jdepsPath = javahome + "/../bin/jdeps".replaceAll(/\//g, File.separater);
var jdepsPath = javahome + "/../bin/jdeps".replace(/\//g, File.separator);
if (! new File(jdepsPath).isFile()) {
jdepsPath = javahome + "/bin/jdeps".replaceAll(/\//g, File.separater);
jdepsPath = javahome + "/bin/jdeps".replace(/\//g, File.separator);
}
// run jdep on nashorn.jar - only summary but print profile info

4
nashorn/test/script/nosecurity/JDK-8055034.js
View File

@ -46,10 +46,10 @@ if (! nashornJar.isAbsolute()) {
// we want to use nashorn.jar passed and not the one that comes with JRE
var jjsCmd = javahome + "/../bin/jjs";
jjsCmd = jjsCmd.toString().replaceAll(/\//g, File.separater);
jjsCmd = jjsCmd.toString().replace(/\//g, File.separator);
if (! new File(jjsCmd).isFile()) {
jjsCmd = javahome + "/bin/jjs";
jjsCmd = jjsCmd.toString().replaceAll(/\//g, File.separater);
jjsCmd = jjsCmd.toString().replace(/\//g, File.separator);
}
jjsCmd += " -J-Xbootclasspath/p:" + nashornJar;

99
nashorn/test/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2015, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.nashorn.internal.runtime.test;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import java.util.Map;
import javax.script.Bindings;
import jdk.nashorn.api.scripting.JSObject;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.objects.NativeArray;
import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.linker.Bootstrap;
import org.testng.annotations.Test;
/**
* @test
* @bug 8078414
* @summary Test that arbitrary classes can't be converted to mirror's superclasses/interfaces.
* @run testng jdk.nashorn.internal.runtime.test.JDK_8078414_Test
*/
public class JDK_8078414_Test {
@Test
public void testCanNotConvertArbitraryClassToMirror() {
assertCanNotConvert(Double.class, Map.class);
assertCanNotConvert(Double.class, Bindings.class);
assertCanNotConvert(Double.class, JSObject.class);
assertCanNotConvert(Double.class, ScriptObjectMirror.class);
}
@Test
public void testCanConvertObjectToMirror() {
assertCanConvertToMirror(Object.class);
}
@Test
public void testCanConvertScriptObjectToMirror() {
assertCanConvertToMirror(ScriptObject.class);
}
@Test
public void testCanConvertScriptObjectSubclassToMirror() {
assertCanConvertToMirror(NativeArray.class);
}
@Test
public void testCanConvertArbitraryInterfaceToMirror() {
// We allow arbitrary interface classes, depending on what implements them, to end up being
// convertible to ScriptObjectMirror, as an implementation can theoretically pass an
// "instanceof ScriptObject" guard.
assertCanConvertToMirror(TestInterface.class);
}
public static interface TestInterface {
}
private static boolean canConvert(final Class<?> from, final Class<?> to) {
return Bootstrap.getLinkerServices().canConvert(from, to);
}
private static void assertCanConvert(final Class<?> from, final Class<?> to) {
assertTrue(canConvert(from, to));
}
private static void assertCanNotConvert(final Class<?> from, final Class<?> to) {
assertFalse(canConvert(from, to));
}
private static void assertCanConvertToMirror(final Class<?> from) {
assertCanConvert(from, Map.class);
assertCanConvert(from, Bindings.class);
assertCanConvert(from, JSObject.class);
assertCanConvert(from, ScriptObjectMirror.class);
}
}