infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2014-06-18 10:08:47 -07:00
commit 0eeff11878
13 changed files with 541 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
nashorn/make/build.xml
View File

@ -363,40 +363,32 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" {
<echo message="WARNING: TestNG not available, will not run tests. Please copy testng.jar under test/lib directory."/>
</target>
<target name="test" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
<delete dir="${build.dir}/nashorn_code_cache"/>
<fileset id="test.classes" dir="${build.test.classes.dir}">
<include name="**/api/javaaccess/*Test.class"/>
<include name="**/api/scripting/*Test.class"/>
<include name="**/codegen/*Test.class"/>
<include name="**/parser/*Test.class"/>
<include name="**/runtime/*Test.class"/>
<include name="**/runtime/regexp/*Test.class"/>
<include name="**/runtime/regexp/joni/*Test.class"/>
<include name="**/framework/*Test.class"/>
</fileset>
<!-- only to be invoked as dependency of "test" target -->
<target name="-test-classes-all" depends="jar" unless="test.class">
<fileset id="test.classes" dir="${build.test.classes.dir}">
<include name="**/api/javaaccess/*Test.class"/>
<include name="**/api/scripting/*Test.class"/>
<include name="**/codegen/*Test.class"/>
<include name="**/parser/*Test.class"/>
<include name="**/runtime/*Test.class"/>
<include name="**/runtime/regexp/*Test.class"/>
<include name="**/runtime/regexp/joni/*Test.class"/>
<include name="**/framework/*Test.class"/>
</fileset>
</target>
<!-- only to be invoked as dependency of "test" target -->
<target name="-test-classes-single" depends="jar" if="test.class">
<fileset id="test.classes" dir="${build.test.classes.dir}">
<include name="${test.class}*"/>
</fileset>
</target>
<!-- only to be invoked as dependency of "test" target -->
<target name="-test-nosecurity" unless="test.class">
<fileset id="test.nosecurity.classes" dir="${build.test.classes.dir}">
<include name="**/framework/ScriptTest.class"/>
</fileset>
<testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
<jvmarg line="${ext.class.path}"/>
<jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
<propertyset>
<propertyref prefix="nashorn."/>
</propertyset>
<propertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
</propertyset>
<sysproperty key="test.js.excludes.file" value="${exclude.list}"/>
<classpath>
<pathelement path="${run.test.classpath}"/>
</classpath>
</testng>
<testng outputdir="${build.nosecurity.test.results.dir}" classfilesetref="test.nosecurity.classes"
verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
<jvmarg line="${ext.class.path}"/>
@ -414,6 +406,31 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" {
</testng>
</target>
<!-- only to be invoked as dependency of "test" target -->
<target name="-test-security">
<delete dir="${build.dir}/nashorn_code_cache"/>
<property name="debug.test.jvmargs" value=""/>
<testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
<jvmarg line="${ext.class.path}"/>
<jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
<jvmarg line="${debug.test.jvmargs}"/>
<propertyset>
<propertyref prefix="nashorn."/>
</propertyset>
<propertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
</propertyset>
<sysproperty key="test.js.excludes.file" value="${exclude.list}"/>
<classpath>
<pathelement path="${run.test.classpath}"/>
</classpath>
</testng>
</target>
<target name="test" depends="jar, -test-classes-all,-test-classes-single, check-testng, check-external-tests, compile-test, generate-policy-file, -test-security, -test-nosecurity" if="testng.available"/>
<target name="check-jemmy.jfx.testng" unless="jemmy.jfx.testng.available">
<echo message="WARNING: Jemmy or JavaFX or TestNG not available, will not run tests. Please copy testng.jar, JemmyCore.jar, JemmyFX.jar, JemmyAWTInput.jar under test${file.separator}lib directory. And make sure you have jfxrt.jar in ${java.home}${file.separator}lib${file.separator}ext dir."/>
</target>

36
nashorn/make/nbproject/ide-file-targets.xml
View File

@ -22,38 +22,14 @@
questions.
-->
<project basedir=".." name="nashorn-IDE">
<property file="nbproject/nbjdk.properties"/>
<property location="${netbeans.user}/build.properties" name="user.properties.file"/>
<property file="${user.properties.file}"/>
<import file="jdk.xml"/>
<import file="${basedir}/build-init.xml"/>
<!-- TODO: edit the following target according to your needs -->
<!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->
<target depends="-jdk-init, init" name="debug-selected-file-in-src">
<fail unless="debug.class">Must set property 'debug.class'</fail>
<ant antfile="build.xml" inheritall="false" target="jar"/>
<target name="debug-selected-file-in-src">
<fail unless="test.class">Must set property 'debug.class'</fail>
<nbjpdastart addressproperty="jpda.address" name="nashorn" transport="dt_socket">
<classpath path="${run.test.classpath}"/>
</nbjpdastart>
<java classname="${debug.class}" fork="false">
<classpath path="${run.test.classpath}"/>
<jvmarg line="${boot.class.path}"/>
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
<jvmarg line="${run.test.jvmargs}"/>
<arg value="${debug.class}"/>
</java>
</target>
<!-- TODO: edit the following target according to your needs -->
<!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->
<target depends="-jdk-init, init" name="run-selected-file-in-src">
<fail unless="run.class">Must set property 'run.class'</fail>
<ant antfile="build.xml" inheritall="false" target="jar"/>
<java classname="${run.class}" failonerror="true" fork="false">
<classpath path="${run.test.classpath}"/>
<jvmarg line="${boot.class.path}"/>
<jvmarg line="${run.test.jvmargs}"/>
<arg value="${run.class}"/>
</java>
<ant antfile="build.xml" inheritall="false" target="test">
<property name="test.class" value="${test.class}"/>
<property name="debug.test.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
</ant>
</target>
</project>

22
nashorn/make/nbproject/project.xml
View File

@ -98,27 +98,27 @@
<script>nbproject/nbjdk.xml</script>
<target>debug-nb</target>
</action>
<action name="debug.single">
<script>nbproject/ide-file-targets.xml</script>
<target>debug-selected-file-in-src</target>
<action name="run.single">
<script>build.xml</script>
<target>test</target>
<context>
<property>debug.class</property>
<folder>test/src</folder>
<property>test.class</property>
<folder>../test/src</folder>
<pattern>\.java$</pattern>
<format>java-name</format>
<format>relative-path-noext</format>
<arity>
<one-file-only/>
</arity>
</context>
</action>
<action name="run.single">
<action name="debug.single">
<script>nbproject/ide-file-targets.xml</script>
<target>run-selected-file-in-src</target>
<target>debug-selected-file-in-src</target>
<context>
<property>run.class</property>
<folder>test/src</folder>
<property>test.class</property>
<folder>../test/src</folder>
<pattern>\.java$</pattern>
<format>java-name</format>
<format>relative-path-noext</format>
<arity>
<one-file-only/>
</arity>

14
nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
View File

@ -550,8 +550,13 @@ public class AccessorProperty extends Property {
"invalid getter type " + type + " for " + getKey();
//all this does is add a return value filter for object fields only
if (GETTER_CACHE[i] == null) {
GETTER_CACHE[i] = debug(
final MethodHandle[] getterCache = GETTER_CACHE;
final MethodHandle cachedGetter = getterCache[i];
final MethodHandle getter;
if (cachedGetter != null) {
getter = cachedGetter;
} else {
getter = debug(
createGetter(
getCurrentType(),
type,
@ -561,9 +566,10 @@ public class AccessorProperty extends Property {
getCurrentType(),
type,
"get");
getterCache[i] = getter;
}
assert GETTER_CACHE[i].type().returnType() == type && GETTER_CACHE[i].type().parameterType(0) == Object.class;
return GETTER_CACHE[i];
assert getter.type().returnType() == type && getter.type().parameterType(0) == Object.class;
return getter;
}
@Override

3
nashorn/src/jdk/nashorn/internal/runtime/Context.java
View File

@ -1014,6 +1014,9 @@ public final class Context {
}
private static ScriptFunction getProgramFunction(final Class<?> script, final ScriptObject scope) {
if (script == null) {
return null;
}
return invokeCreateProgramFunctionHandle(getCreateProgramFunctionHandle(script), scope);
}

64
nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java
View File

@ -25,14 +25,21 @@
package jdk.nashorn.internal.runtime;
import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
import java.lang.invoke.MethodHandle;
import java.lang.reflect.Field;
import java.net.URL;
import java.util.HashSet;
import java.util.Set;
import jdk.nashorn.internal.scripts.JS;
/**
* This class provides support for external debuggers. Its primary purpose is
* is to simplify the debugger tasks and provide better performance.
* Even though the methods are not public, there are still part of the
* external debugger interface.
*/
final class DebuggerSupport {
/**
@ -49,6 +56,11 @@ final class DebuggerSupport {
@SuppressWarnings("unused")
final
DebuggerValueDesc forceLoad = new DebuggerValueDesc(null, false, null, null);
// Hook to force the loading of the SourceInfo class
@SuppressWarnings("unused")
final
SourceInfo srcInfo = new SourceInfo(null, 0, null, null);
}
/** This class is used to send a bulk description of a value. */
@ -73,6 +85,54 @@ final class DebuggerSupport {
}
}
static class SourceInfo {
final String name;
final URL url;
final int hash;
final char[] content;
SourceInfo(final String name, final int hash, final URL url, final char[] content) {
this.name = name;
this.hash = hash;
this.url = url;
this.content = content;
}
}
/**
* Hook that is called just before invoking method handle
* from ScriptFunctionData via invoke, constructor method calls.
*
* @param mh script class method about to be invoked.
*/
static void notifyInvoke(final MethodHandle mh) {
// Do nothing here. This is placeholder method on which a
// debugger can place a breakpoint so that it can access the
// (script class) method handle that is about to be invoked.
// See ScriptFunctionData.invoke and ScriptFunctionData.construct.
}
/**
* Return the script source info for the given script class.
*
* @param clazz compiled script class
* @return SourceInfo
*/
static SourceInfo getSourceInfo(final Class<?> clazz) {
if (JS.class.isAssignableFrom(clazz)) {
try {
final Field sourceField = clazz.getDeclaredField(SOURCE.symbolName());
sourceField.setAccessible(true);
final Source src = (Source) sourceField.get(null);
return src.getSourceInfo();
} catch (final IllegalAccessException | NoSuchFieldException ignored) {
return null;
}
}
return null;
}
/**
* Return the current context global.
* @return context global.
@ -87,7 +147,7 @@ final class DebuggerSupport {
* @param self Receiver to use.
* @param string String to evaluate.
* @param returnException true if exceptions are to be returned.
* @return Result of eval as string, or, an exception or null depending on returnException.
* @return Result of eval, or, an exception or null depending on returnException.
*/
static Object eval(final ScriptObject scope, final Object self, final String string, final boolean returnException) {
final ScriptObject global = Context.getGlobal();
@ -238,7 +298,7 @@ final class DebuggerSupport {
* @param value Arbitrary value to be displayed by the debugger.
* @return A string representation of the value or an array of DebuggerValueDesc.
*/
private static String valueAsString(final Object value) {
static String valueAsString(final Object value) {
final JSType type = JSType.of(value);
switch (type) {

4
nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
View File

@ -551,6 +551,8 @@ public abstract class ScriptFunctionData implements Serializable {
final Object selfObj = convertThisObject(self);
final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
DebuggerSupport.notifyInvoke(mh);
if (isVarArg(mh)) {
if (needsCallee(mh)) {
return mh.invokeExact(fn, selfObj, args);
@ -604,6 +606,8 @@ public abstract class ScriptFunctionData implements Serializable {
final MethodHandle mh = getGenericConstructor(fn.getScope());
final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
DebuggerSupport.notifyInvoke(mh);
if (isVarArg(mh)) {
if (needsCallee(mh)) {
return mh.invokeExact(fn, args);

5
nashorn/src/jdk/nashorn/internal/runtime/Source.java
View File

@ -126,6 +126,11 @@ public final class Source implements Loggable {
}
}
/* package-private */
DebuggerSupport.SourceInfo getSourceInfo() {
return new DebuggerSupport.SourceInfo(getName(), data.hashCode(), data.url(), data.array());
}
// Wrapper to manage lazy loading
private static interface Data {

151
nashorn/test/script/nosecurity/JDK-8044798.js Normal file
View File

@ -0,0 +1,151 @@
/*
* 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-8044798: API for debugging Nashorn
*
* @test
* @run
*/
// basic API exercise checks
var Arrays = Java.type("java.util.Arrays");
var CharArray = Java.type("char[]");
var DebuggerSupport = Java.type("jdk.nashorn.internal.runtime.DebuggerSupport");
var DebuggerValueDesc = Java.type("jdk.nashorn.internal.runtime.DebuggerSupport.DebuggerValueDesc");
var valueDescFields = DebuggerValueDesc.class.declaredFields;
Arrays.sort(valueDescFields, function(f1, f2) f1.name.compareTo(f2.name));
for each (var f in valueDescFields) {
f.accessible = true;
}
var debuggerSupportMethods = DebuggerSupport.class.declaredMethods;
// methods of DebuggerSupport that we use
var evalMethod, valueInfoMethod, valueInfosMethod;
var getSourceInfoMethod, valueAsStringMethod;
for each (var m in debuggerSupportMethods) {
m.accessible = true;
switch (m.name) {
case "eval":
evalMethod = m;
break;
case "valueInfo":
if (m.parameterCount == 3) {
valueInfoMethod = m;
}
break;
case "valueInfos":
valueInfosMethod = m;
break;
case "valueAsString":
valueAsStringMethod = m;
break;
case "getSourceInfo":
getSourceInfoMethod = m;
break;
}
}
// eval
var value = evalMethod.invoke(null, null, null, "33 + 55", false);
print(value);
// valueInfo
var info = valueInfoMethod.invoke(null, "apply", Function, true);
for each (var f in valueDescFields) {
print(f.name, "=", f.get(info));
}
// valueInfo - user defined object
var info = valueInfoMethod.invoke(null, "foo", { foo: 343 }, true);
for each (var f in valueDescFields) {
print(f.name, "=", f.get(info));
}
// valueInfos
var infos = valueInfosMethod.invoke(null, Object, true);
for each (var info in infos) {
for each (var f in valueDescFields) {
print(f.name, "=", f.get(info));
}
}
// valueInfos - user defined object
var infos = valueInfosMethod.invoke(null, { foo: 34, bar: "hello" }, true);
for each (var info in infos) {
for each (var f in valueDescFields) {
print(f.name, "=", f.get(info));
}
}
// valueAsString
function printValue(value) {
print(valueAsStringMethod.invoke(null, value));
}
printValue(undefined);
printValue(null);
printValue("hello");
printValue(Math.PI);
printValue(this);
// The below are not part of DebuggerSupport. But we need these to
// test DebuggerSupport.getSourceInfo etc. which need compiled script class
var Source = Java.type("jdk.nashorn.internal.runtime.Source");
var Context = Java.type("jdk.nashorn.internal.runtime.Context");
var sourceCls = Source.class;
var errorMgrCls = Java.type("jdk.nashorn.internal.runtime.ErrorManager").class;
var booleanCls = Java.type("java.lang.Boolean").TYPE;
// private compile method of Context class
var compileMethod = Context.class.getDeclaredMethod("compile",
sourceCls, errorMgrCls, booleanCls);
compileMethod.accessible = true;
var scriptCls = compileMethod.invoke(Context.context,
Source.sourceFor("test", "print('hello')"),
new Context.ThrowErrorManager(), false);
var SCRIPT_CLASS_NAME_PREFIX = "jdk.nashorn.internal.scripts.Script$";
print("script class name pattern satisfied? " +
scriptCls.name.startsWith(SCRIPT_CLASS_NAME_PREFIX));
var srcInfo = getSourceInfoMethod.invoke(null, scriptCls);
var srcInfoFields = srcInfo.class.declaredFields;
Arrays.sort(srcInfoFields, function(f1, f2) f1.name.compareTo(f2.name));
print("Source info");
for each (var f in srcInfoFields) {
f.accessible = true;
var fieldValue = f.get(srcInfo);
if (fieldValue instanceof CharArray) {
fieldValue = new java.lang.String(fieldValue);
}
print(f.name, "=", fieldValue);
}

104
nashorn/test/script/nosecurity/JDK-8044798.js.EXPECTED Normal file
View File

@ -0,0 +1,104 @@
88
expandable = false
key = apply
valueAsObject = function Function() { [native code] }
valueAsString = function Function() { [native code] }
expandable = true
key = foo
valueAsObject = [object Object]
valueAsString = {foo: 343}
expandable = false
key = setIndexedPropertiesToExternalArrayData
valueAsObject = function setIndexedPropertiesToExternalArrayData() { [native code] }
valueAsString = function setIndexedPropertiesToExternalArrayData() { [native code] }
expandable = false
key = getPrototypeOf
valueAsObject = function getPrototypeOf() { [native code] }
valueAsString = function getPrototypeOf() { [native code] }
expandable = false
key = setPrototypeOf
valueAsObject = function setPrototypeOf() { [native code] }
valueAsString = function setPrototypeOf() { [native code] }
expandable = false
key = getOwnPropertyDescriptor
valueAsObject = function getOwnPropertyDescriptor() { [native code] }
valueAsString = function getOwnPropertyDescriptor() { [native code] }
expandable = false
key = getOwnPropertyNames
valueAsObject = function getOwnPropertyNames() { [native code] }
valueAsString = function getOwnPropertyNames() { [native code] }
expandable = false
key = create
valueAsObject = function create() { [native code] }
valueAsString = function create() { [native code] }
expandable = false
key = defineProperty
valueAsObject = function defineProperty() { [native code] }
valueAsString = function defineProperty() { [native code] }
expandable = false
key = defineProperties
valueAsObject = function defineProperties() { [native code] }
valueAsString = function defineProperties() { [native code] }
expandable = false
key = seal
valueAsObject = function seal() { [native code] }
valueAsString = function seal() { [native code] }
expandable = false
key = freeze
valueAsObject = function freeze() { [native code] }
valueAsString = function freeze() { [native code] }
expandable = false
key = preventExtensions
valueAsObject = function preventExtensions() { [native code] }
valueAsString = function preventExtensions() { [native code] }
expandable = false
key = isSealed
valueAsObject = function isSealed() { [native code] }
valueAsString = function isSealed() { [native code] }
expandable = false
key = isFrozen
valueAsObject = function isFrozen() { [native code] }
valueAsString = function isFrozen() { [native code] }
expandable = false
key = isExtensible
valueAsObject = function isExtensible() { [native code] }
valueAsString = function isExtensible() { [native code] }
expandable = false
key = keys
valueAsObject = function keys() { [native code] }
valueAsString = function keys() { [native code] }
expandable = false
key = bindProperties
valueAsObject = function bindProperties() { [native code] }
valueAsString = function bindProperties() { [native code] }
expandable = false
key = prototype
valueAsObject = [object Object]
valueAsString = {toString: function toString() { [native code] }, toLocaleString: function toLocaleString() { [native code] }, valueOf: function valueOf() { [native code] }, hasOwnProperty: function hasOwnProperty() { [native code] }, isPrototypeOf: function isPrototypeOf() { [native code] }, propertyIsEnumerable: function propertyIsEnumerable() { [native code] }, constructor: function Object() { [native code] }, __proto__: null}
expandable = false
key = length
valueAsObject = 1
valueAsString = 1
expandable = false
key = name
valueAsObject = Object
valueAsString = "Object"
expandable = false
key = foo
valueAsObject = 34
valueAsString = 34
expandable = false
key = bar
valueAsObject = hello
valueAsString = "hello"
undefined
null
"hello"
3.141592653589793
[object global]
script class name pattern satisfied? true
Source info
content = print('hello')
hash = 1655359881
name = test
url = null

94
nashorn/test/script/nosecurity/debuggersupportapi.js Normal file
View File

@ -0,0 +1,94 @@
/*
* 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-8044798: API for debugging Nashorn
*
* @test
* @run
*/
// Basic API class, method, field existence checks.
// The following classes and the associated methods and fields are used as
// private debugger interface. Though private/implementation defined, nashorn
// code should not be changed to remove these classes, fields and methods.
// The test takes signatures of debugger interface and stores in .EXPECTED file.
// If any incompatible change is made to nashorn to break any of these, this
// test will fail.
var Arrays = Java.type("java.util.Arrays");
var DebuggerSupport = Java.type("jdk.nashorn.internal.runtime.DebuggerSupport");
print(DebuggerSupport.class);
print();
var methods = DebuggerSupport.class.declaredMethods;
Arrays.sort(methods, function(m1, m2) m1.name.compareTo(m2.name));
for each (var mth in methods) {
switch (mth.name) {
case "eval":
case "notifyInvoke":
case "getSourceInfo":
case "valueAsString":
case "valueInfos":
print(mth);
break;
case "valueInfo":
if (mth.parameterCount == 3) {
print(mth);
}
break;
}
}
print();
var DebuggerValueDesc = Java.type("jdk.nashorn.internal.runtime.DebuggerSupport.DebuggerValueDesc");
print(DebuggerValueDesc.class);
print();
var fields = DebuggerValueDesc.class.declaredFields;
Arrays.sort(fields, function(f1, f2) f1.name.compareTo(f2.name));
for each (var fld in fields) {
switch (fld.name) {
case "key":
case "expandable":
case "valueAsObject":
case "valueAsString":
print(fld);
}
}
print();
var SourceInfo = Java.type("jdk.nashorn.internal.runtime.DebuggerSupport.SourceInfo");
print(SourceInfo.class);
print();
var fields = SourceInfo.class.declaredFields;
Arrays.sort(fields, function(f1, f2) f1.name.compareTo(f2.name));
for each (var fld in fields) {
switch (fld.name) {
case "name":
case "hash":
case "url":
case "content":
print(fld);
}
}

22
nashorn/test/script/nosecurity/debuggersupportapi.js.EXPECTED Normal file
View File

@ -0,0 +1,22 @@
class jdk.nashorn.internal.runtime.DebuggerSupport
static java.lang.Object jdk.nashorn.internal.runtime.DebuggerSupport.eval(jdk.nashorn.internal.runtime.ScriptObject,java.lang.Object,java.lang.String,boolean)
static jdk.nashorn.internal.runtime.DebuggerSupport$SourceInfo jdk.nashorn.internal.runtime.DebuggerSupport.getSourceInfo(java.lang.Class)
static void jdk.nashorn.internal.runtime.DebuggerSupport.notifyInvoke(java.lang.invoke.MethodHandle)
static java.lang.String jdk.nashorn.internal.runtime.DebuggerSupport.valueAsString(java.lang.Object)
static jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc jdk.nashorn.internal.runtime.DebuggerSupport.valueInfo(java.lang.String,java.lang.Object,boolean)
static jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc[] jdk.nashorn.internal.runtime.DebuggerSupport.valueInfos(java.lang.Object,boolean)
class jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc
final boolean jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc.expandable
final java.lang.String jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc.key
final java.lang.Object jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc.valueAsObject
final java.lang.String jdk.nashorn.internal.runtime.DebuggerSupport$DebuggerValueDesc.valueAsString
class jdk.nashorn.internal.runtime.DebuggerSupport$SourceInfo
final char[] jdk.nashorn.internal.runtime.DebuggerSupport$SourceInfo.content
final int jdk.nashorn.internal.runtime.DebuggerSupport$SourceInfo.hash
final java.lang.String jdk.nashorn.internal.runtime.DebuggerSupport$SourceInfo.name
final java.net.URL jdk.nashorn.internal.runtime.DebuggerSupport$SourceInfo.url

22
nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
View File

@ -28,6 +28,7 @@ package jdk.nashorn.internal.runtime;
import static jdk.nashorn.internal.runtime.Source.sourceFor;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.util.Map;
import jdk.nashorn.internal.objects.Global;
@ -60,6 +61,27 @@ public class ContextTest {
}
}
// Make sure trying to compile an invalid script returns null - see JDK-8046215.
@Test
public void compileErrorTest() {
final Options options = new Options("");
final ErrorManager errors = new ErrorManager();
final Context cx = new Context(options, errors, Thread.currentThread().getContextClassLoader());
final Global oldGlobal = Context.getGlobal();
Context.setGlobal(cx.createGlobal());
try {
final ScriptFunction script = cx.compileScript(sourceFor("<evalCompileErrorTest>", "*/"), Context.getGlobal());
if (script != null) {
fail("Invalid script compiled without errors");
}
if (errors.getNumberOfErrors() != 1) {
fail("Wrong number of errors: " + errors.getNumberOfErrors());
}
} finally {
Context.setGlobal(oldGlobal);
}
}
// basic check for JS reflection access - java.util.Map-like access on ScriptObject
@Test
public void reflectionTest() {