Merge

Merge

Merge

8001235: Improve JAXP HTTP handling Reviewed-by: lancea, skoivu

Added tag jdk8-b81 for changeset 4f3da455d5f5

Merge

8009559: clean up method handle lookup code. Reviewed-by: ahgross, jlaskey, attila, sundar

8009553: Object.create(Array.prototype) doesn't respect reset length Reviewed-by: jlaskey, lagergren

8009379: Remove $ from generated class names Reviewed-by: attila, lagergren Contributed-by: james.laskey@oracle.com

8008370: coffee script compiler doesn't work with Nashorn Reviewed-by: lagergren, attila

Merge

8009263: Fix all javadoc errors in nashorn code Reviewed-by: hannesw, lagergren

8009240: RegExpScanner code is inefficient and too complex Reviewed-by: jlaskey, lagergren

8009229: ant makefile default target should be "test" Reviewed-by: lagergren, jlaskey

8009150: Previous dead code elimination was incomplete Reviewed-by: hannesw, lagergren

8009146: Eliminate some dead code in preparation for immutable AST Reviewed-by: hannesw, lagergren

8009143: Eliminate Dynalink dependency on java.beans Reviewed-by: jlaskey, lagergren, sundar

8008950: jdk8/tl failing with SetupJavaCompilation BUILD_NASGEN contains missing directory -c on Windows Reviewed-by: chegar, sundar

8009021: nasgen should be run on boot jdk rather than currenly built jdk Reviewed-by: jlaskey

8006984: Introducing local into a function inside with statement confuses its scope Reviewed-by: jlaskey, lagergren, sundar

8008789: Enable java access and nashorn runtime tests for jtreg Reviewed-by: lagergren, jlaskey, hannesw

8008731: Separate configuration environment (options, error/output writer etc.) from Context Reviewed-by: hannesw, lagergren

8008776: Revise BuildNashorn.gmk for changes in new build system Reviewed-by: jjh Contributed-by: james.laskey@oracle.com

8008729: Make sure that we can run basic jsr223 tests using jtreg Reviewed-by: jlaskey, hannesw, lagergren

8006028: Integrate Joni regexp engine with Nashorn Reviewed-by: lagergren, attila

8008093: Make RegExp engine pluggable Reviewed-by: lagergren, attila

8008721: Tweaks to make all NEWBUILD=false round 4 Reviewed-by: jjh Contributed-by: james.laskey@oracle.com

8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code Reviewed-by: attila, hannesw

8008575: Re-integrate code coverage Reviewed-by: attila, hannesw Contributed-by: eugene.drobitko@oracle.com, ilya.dergalin@oracle.com

8008554: load was broken for URLs Reviewed-by: attila, sundar

8008447: Tweaks to make all NEWBUILD=false round 3 Reviewed-by: jjh, sundar Contributed-by: james.laskey@oracle.com

8008648: Lazy JIT scope and callee semantics bugfixes. Broke out wallclock timer. Reviewed-by: attila, hannesw

8008166: URL handling was broken on windows, causing "load" to malfunction Reviewed-by: attila, jlaskey Contributed-by: klara.ward@oracle.com

8008207: Make constants array and source fields private Reviewed-by: hannesw, lagergren

8008448: Add coverage test for jdk.nashorn.internal.ir.debug.JSONWriter Reviewed-by: jlaskey, attila

Merge

8008420: Tweaks to make all NEWBUILD=false round 2 Reviewed-by: jjh Contributed-by: james.laskey@oracle.com

8008387: Improve code coverage tests for JSObjectLinker and NashornBottomLinker Reviewed-by: lagergren, jlaskey, hannesw

8008371: Fix Dynalink compiler warnings and whitespace Reviewed-by: jlaskey, sundar

8008351: Avoid using String.replace(String, String) in codegen Reviewed-by: sundar, attila

8008305: ScriptEngine.eval should offer the ability to provide a codebase Reviewed-by: lagergren, hannesw, attila

8008298: Add tests to cover specialized versions of Math functions. Reviewed-by: jlaskey, lagergren

8008291: Add more tests for better coverage of objects, scripting and parser packages Reviewed-by: lagergren, jlaskey

8008239: Unpublicized parts of the code generator package that were only package internal. Reviewed-by: hannesw, attila

8008215: break in catch clause causes java.lang.VerifyError: Inconsistent stackmap Reviewed-by: jlaskey, lagergren

8008231: Fix build system to accommodate integration of dynalink Reviewed-by: jlaskey Contributed-by: james.laskey@oracle.com

8008198: java.lang.AssertionError: Invalid break target class jdk.nashorn.internal.ir.TryNode Reviewed-by: attila, jlaskey

8007990: No access to interface methods on a restricted class Reviewed-by: jlaskey, lagergren, sundar

8008206: The allInteger case for SwitchNode generation in CodeGenerator assumes integer LITERALS only. Reviewed-by: sundar, jlaskey

8008085: Integrate Dynalink source code into Nashorn codebase Reviewed-by: jlaskey, lagergren, sundar

8008199: Lazy compilation and trampoline implementation Summary: The code pipeline now supports lazy compilation, which can be used to only compile certain FunctionNodes and leave others be, saving startup time. When these uncompiled nodes are hit, a trampoline will force them to be recompiled. This can also be used to specialize compilation fixing parameter types and return types to a callsite specific compilation. This will give performance. Reviewed-by: attila, sundar

8008197: Cross script engine function calls do not work as expected Reviewed-by: lagergren, hannesw

8008193: test262 tests should be run with security manager enabled Reviewed-by: jlaskey

8008103: Source object should maintain URL of the script source as a private field Reviewed-by: lagergren, jlaskey

8008096: TokenStream buffer should grow exponentially Reviewed-by: attila, lagergren, sundar

8007900: Function binding is inefficient Reviewed-by: jlaskey, lagergren

8007956: Wrong or obsolete system properties in docs/DEVELOPER_README Reviewed-by: attila, jlaskey

8007915: Nashorn IR, codegen, parser packages and Context instance should be inaccessible to user code Reviewed-by: lagergren, jlaskey, attila

8006943: Fix order of function method arguments to be (callee, thisObject) Reviewed-by: jlaskey, lagergren

8006222: Move slot from SpillProperty to Property Reviewed-by: hannesw, lagergren Contributed-by: james.laskey@oracle.com

8007718: Make static RegExp properties fully compatible to other engines Reviewed-by: lagergren, sundar

8007627: Support @Getter annotation on constructor Reviewed-by: attila, lagergren

8007715: Make sure that not all tests run with AllPermission Reviewed-by: lagergren, attila

8007643: Add testing for quit and exit Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8007629: Remove extraneous quit from shell.js Reviewed-by: sundar, hannesw Contributed-by: james.laskey@oracle.com

8007545: jjs input evalinput need to be NOT_ENUMERABLE Reviewed-by: sundar, lagergren Contributed-by: james.laskey@oracle.com

8007619: Add support for deprecated properties of RegExp constructor Reviewed-by: lagergren, hannesw

8007273: Creation of ScriptFunctions can be refactored Reviewed-by: lagergren, attila

8007523: VerifyError on script that uses regular expression literals with ternary operator Reviewed-by: lagergren

8007522: IllegalStateException thrown from String.prototype.search function Reviewed-by: jlaskey

8007521: $ENV should be undefined when security manager is present Reviewed-by: hannesw, jlaskey

8007452: add scripting programmers doc changes for nashorn Reviewed-by: jlaskey, hannesw

8006191: `cmd` -> exec("cmd") in script mode Reviewed-by: sundar, lagergren, hannesw Contributed-by: james.laskey@oracle.com

8007215: Varargs broken for the case of passing more than the arg limit arguments. Reviewed-by: jlaskey, attila

8007460: var assignment to a parameter in a varargs method causes compilation error Reviewed-by: jlaskey, lagergren

8007455: Extraneous $(ECHO) in make/Makefile Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8007060: Primitive wrap filter throws ClassCastException in test262parallel Reviewed-by: sundar, jlaskey, lagergren

8006529: Methods always get callee - it should be conditional Summary: This commit streamlines the bytecode function signatures, prologue, local variable use, scope creation, and invocation. It started out quite innocently when we noticed that we always emit __callee__ parameters for all functions even when they are not needed, but it turned out to be quite a deep rabbit hole. In the end, I identified exact conditions when functions need to have a callee parameter, when they need to receive parent scope, when they need to create their own scope, when they need to have variable arity signature, and when they need to have an "arguments" object, and made sure that callee parameters in signatures only show up when they are needed, that parent function's scope is only passed to a child function when it is needed, that the function only creates its own scope when it is needed. In crypto.js, the number of scopes dropped from 446 to 244, and the number of callees dropped from 315 to 145. Reviewed-by: jlaskey, lagergren

8007286: Add JavaAdapter and importPackage to compatibility script Reviewed-by: lagergren, jlaskey

8007140: Java.extend crashes when attempting to extend java.lang.Object Reviewed-by: lagergren, hannesw

8007109: Regression: String(ConsString) does not flatten argument to String Reviewed-by: sundar, lagergren

8007132: Java objects returned from constructor functions are lost Reviewed-by: hannesw, lagergren, attila

8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes. Summary: Lower suffered from being a "God class" trying to do everything at once. As Nashorn code generation has grown, so has Lower. It does several post processing passes, tries to do several things at once even though all type information isn't in place, adjusting state afterwards and so on. It also performs control flow analysis, type attribution and constant folding, and everything else code generation related before byte code emission. I have now separated the compilation process into Lower (create low level nodes from high level ones, copy code such as finally block inlining etc), Attr (assign types and symbols to all nodes - freeze slot and scope information) and FinalizeTypes (insert explicit casts, specialize invoke dynamic types for scope accesses). I've removed the kludgy AccessSpecializer, as this now integrates naturally with typing. Everything is now much easier to read and each module performs only one thing. I have added separate loggers for the separate tiers. In the process I have also fixed: (1) problems with type coercion (see test/script/basic/typecoercion.js, basically our coercion was too late and our symbol inference was erroneous. This only manifested itself in very rare occasions where toNumber coercion has side effects, such as for example when valueOf is overridden) (2) copying literal nodes (literal copy did not use the superclass copy, which made all the Node specific fields not to be copied (3) erroneous literal tokenization (literals shouldn't always just inherit token information from whatever node that creates them) (4) splitter weighnodes - unary nodes were considered weightless (4) removed the hateful and kludgy "VarNode.shouldAppend", which really isn't needed when we have an attribution phase that determines self reference symbols (the only thing it was used for) (5) duplicate line number issues in the parser (6) convert bug in CodeGenerator for intermediate results of scope accesses (see test/script/basic/access-specializer.js) ... Several of these things just stopped being problems with the new architecture "can't happen anymore" and are not bug fixes per se. All tests run. No performance regressions exist that I've been able to measure. Some increases in performance were measured, but in the statistical margin of error (which is very wide as HotSpot currently has warmup issues with LambdaForms/invoke dynamic). Compile speed has not measurably increased. Reviewed-by: jlaskey, attila

8007094: Apply version to nashorn.jar manifest Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8007091: Provide private API to pass application class loader for nashorn script engine Reviewed-by: jlaskey, lagergren

8006676: Integrate Nashorn into new build system Reviewed-by: jlaskey Contributed-by: james.laskey@oracle.com

8007004: nashorn script engine should not use thread context class loader as script 'application loader' Reviewed-by: attila, hannesw

8006983: Introduce a command line option to switch off syntactic extensions of nashorn Reviewed-by: lagergren, attila

8006766: Array-like access to characters of a string is slow Reviewed-by: lagergren, attila

8006857: ClassCastException when interface implementing function uses arguments object Reviewed-by: jlaskey, lagergren

8006852: Move tests from JIRA for prepopulated map failures Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8006408: Clean up and specialize NativeString Reviewed-by: jlaskey, lagergren

8006755: Functions inside with statements dont get correct scope Reviewed-by: lagergren, attila

8006575: Error in codegen for element access on primitive value Reviewed-by: hannesw, lagergren

8006736: nashorn script engine should support the usage multiple global objects with same engine instance Reviewed-by: lagergren, jlaskey, hannesw

8006678: Avoid too many Context.getGlobal() calls Reviewed-by: lagergren, jlaskey

8006677: Remove unused FunctionNode flags Reviewed-by: hannesw, jlaskey

8006570: This-value for non-strict functions should be converted to object Reviewed-by: jlaskey, lagergren, attila

8006635: Reduce access levels as much as possible Reviewed-by: jlaskey, lagergren, attila

8006525: Give StaticClass objects their own linker Reviewed-by: hannesw, lagergren

8006557: JDK8/Lambda build clashes on Map.replace() Reviewed-by: jlaskey

8006584: improve variable handling in NashornScriptEngine Reviewed-by: jlaskey, hannesw

8006562: findOwnMH in nashorn "objects" package should be cleaned up Reviewed-by: jlaskey, lagergren

8006527: nashorn jsr223 engine does not work in sandbox Reviewed-by: jlaskey, attila, lagergren

8006517: PropertyHashMap.Element.equals() compares to Property Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8006424: Passing null or undefined to adapter class constructors results in NPE or ClassCastException Reviewed-by: attila, hannesw, jlaskey

8006412: Improve toString method of ScriptObjectMirror class Reviewed-by: jlaskey, lagergren

8006304: Remove pre-population of maps for constructor produced maps Reviewed-by: sundar Contributed-by: james.laskey@oracle.com

8006337: Discarded arguments for INVOKESTATIC must still be evaluated for side effects Reviewed-by: hannesw, jlaskey, sundar

8005958: invoking a function through INVOKESTATIC with more arguments than it declares resulted in malformed bytecode being generated Reviewed-by: lagergren, jlaskey

8006293: Reduce ScriptObject.findCallMethodMethod Reviewed-by: lagergren, jlaskey

8006181: nashorn script engine does not run jrunscript's initialization script Reviewed-by: lagergren, jlaskey Contributed-by: rieberandreas@gmail.com

8006168: ability to generate multi-type Java adapters Reviewed-by: lagergren, jlaskey

8006093: Add a makefile target to run all tests (test, test262, perf tests) Reviewed-by: attila, hannesw

8006082: Provide option to run octane benchmarks in separate processes Reviewed-by: lagergren, jlaskey

8005976: Break out AccessSpecializer into one pass before CodeGenerator instead of iterative applications from CodeGenerator Summary: Now scope and slot information is guaranteed to be fixed AND NOT CHANGE before CodeGeneration. We want to keep it that way to build future type specializations and bring all type work out of CodeGenerator. Reviewed-by: attila, hannesw

8005983: JavaAdapterFactory generated proxy classes should take extra constructor arguments at the end Reviewed-by: lagergren, sundar

8005982: NASHORN-71.js failing in nightlys Reviewed-by: attila, lagergren, jlaskey

8005987: ant octane tries to run non-benchmark scripts Reviewed-by: lagergren, attila, jlaskey

8005971: runsunspider.js should check results of benchmarks Reviewed-by: attila, hannesw