diff options
Diffstat (limited to 'test/script/trusted/JDK-8006529.js')
| -rw-r--r-- | test/script/trusted/JDK-8006529.js | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/test/script/trusted/JDK-8006529.js b/test/script/trusted/JDK-8006529.js index 3567c33e..5f618074 100644 --- a/test/script/trusted/JDK-8006529.js +++ b/test/script/trusted/JDK-8006529.js @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,16 +33,18 @@ * This test script depends on nashorn Compiler internals. It uses reflection * to get access to private field and many public methods of Compiler and * FunctionNode classes. Note that this is trusted code and access to such - * internal package classes and methods is okay. But, if you modify any + * internal package classes and methods is okay. But, if you modify any * Compiler or FunctionNode class, you may have to revisit this script. * We cannot use direct Java class (via dynalink bean linker) to Compiler * and FunctionNode because of package-access check and so reflective calls. */ -var forName = java.lang.Class["forName(String)"]; +var forName = java.lang.Class["forName(String)"]; var Parser = forName("jdk.nashorn.internal.parser.Parser").static var Compiler = forName("jdk.nashorn.internal.codegen.Compiler").static +var CompilationPhases = forName("jdk.nashorn.internal.codegen.Compiler$CompilationPhases").static; var Context = forName("jdk.nashorn.internal.runtime.Context").static +var CodeInstaller = forName("jdk.nashorn.internal.runtime.CodeInstaller").static var ScriptEnvironment = forName("jdk.nashorn.internal.runtime.ScriptEnvironment").static var Source = forName("jdk.nashorn.internal.runtime.Source").static var FunctionNode = forName("jdk.nashorn.internal.ir.FunctionNode").static @@ -54,20 +56,23 @@ var BinaryNode = forName("jdk.nashorn.internal.ir.BinaryNode").static var ThrowErrorManager = forName("jdk.nashorn.internal.runtime.Context$ThrowErrorManager").static var ErrorManager = forName("jdk.nashorn.internal.runtime.ErrorManager").static var Debug = forName("jdk.nashorn.internal.runtime.Debug").static +var String = forName("java.lang.String").static +var boolean = Java.type("boolean"); var parseMethod = Parser.class.getMethod("parse"); -var compileMethod = Compiler.class.getMethod("compile", FunctionNode.class); +var compileMethod = Compiler.class.getMethod("compile", FunctionNode.class, CompilationPhases.class); var getBodyMethod = FunctionNode.class.getMethod("getBody"); var getStatementsMethod = Block.class.getMethod("getStatements"); var getInitMethod = VarNode.class.getMethod("getInit"); var getExpressionMethod = ExpressionStatement.class.getMethod("getExpression") -var rhsMethod = UnaryNode.class.getMethod("rhs") +var rhsMethod = UnaryNode.class.getMethod("getExpression") var lhsMethod = BinaryNode.class.getMethod("lhs") var binaryRhsMethod = BinaryNode.class.getMethod("rhs") var debugIdMethod = Debug.class.getMethod("id", java.lang.Object.class) +var compilePhases = CompilationPhases.class.getField("COMPILE_UPTO_BYTECODE").get(null); // These are method names of methods in FunctionNode class -var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'hasScopeBlock', 'needsSelfSymbol', 'isSplit', 'hasEval', 'allVarsInScope', 'isStrict'] +var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'hasScopeBlock', 'usesSelfSymbol', 'isSplit', 'hasEval', 'allVarsInScope', 'isStrict'] // corresponding Method objects of FunctionNode class var functionNodeMethods = {}; @@ -103,8 +108,8 @@ function findFunction(node) { return findFunction(rhsMethod.invoke(node)) } else if(node instanceof BinaryNode) { return findFunction(lhsMethod.invoke(node)) || findFunction(binaryRhsMethod.invoke(node)) - } else if(node instanceof ExpressionStatement) { - return findFunction(getExpressionMethod.invoke(node)) + } else if(node instanceof ExpressionStatement) { + return findFunction(getExpressionMethod.invoke(node)) } else if(node instanceof FunctionNode) { return node } @@ -115,22 +120,23 @@ var getEnvMethod = Context.class.getMethod("getEnv") var sourceForMethod = Source.class.getMethod("sourceFor", java.lang.String.class, java.lang.String.class) var ParserConstructor = Parser.class.getConstructor(ScriptEnvironment.class, Source.class, ErrorManager.class) -var CompilerConstructor = Compiler.class.getConstructor(ScriptEnvironment.class) +var CompilerConstructor = Compiler.class.getConstructor(Context.class, ScriptEnvironment.class, CodeInstaller.class, Source.class, ErrorManager.class, boolean.class); -// compile(script) -- compiles a script specified as a string with its -// source code, returns a jdk.nashorn.internal.ir.FunctionNode object +// compile(script) -- compiles a script specified as a string with its +// source code, returns a jdk.nashorn.internal.ir.FunctionNode object // representing it. -function compile(source) { +function compile(source, phases) { var source = sourceForMethod.invoke(null, "<no name>", source); - var env = getEnvMethod.invoke(getContextMethod.invoke(null)) + var ctxt = getContextMethod.invoke(null); + var env = getEnvMethod.invoke(ctxt); var parser = ParserConstructor.newInstance(env, source, ThrowErrorManager.class.newInstance()); var func = parseMethod.invoke(parser); - var compiler = CompilerConstructor.newInstance(env); + var compiler = CompilerConstructor.newInstance(ctxt, env, null, source, null, false); - return compileMethod.invoke(compiler, func); + return compileMethod.invoke(compiler, func, phases); }; var allAssertions = (function() { @@ -166,8 +172,8 @@ function test(f) { // assertions are true in the first function in the given script; "script" // is a string with the source text of the script. function testFirstFn(script) { - arguments[0] = getFirstFunction(compile(script)) - test.apply(null, arguments) + arguments[0] = getFirstFunction(compile(script, compilePhases)); + test.apply(null, arguments); } // ---------------------------------- ACTUAL TESTS START HERE -------------- @@ -197,13 +203,13 @@ testFirstFn("function f() { function arguments() {}; arguments; }") // A function defining "arguments" as a local variable will be vararg. testFirstFn("function f() { var arguments; arguments; }", 'isVarArg', 'needsCallee') -// A self-referencing function defined as a statement doesn't need a self +// A self-referencing function defined as a statement doesn't need a self // symbol, as it'll rather obtain itself from the parent scope. testFirstFn("function f() { f() }", 'needsCallee', 'needsParentScope') // A self-referencing function defined as an expression needs a self symbol, // as it can't obtain itself from the parent scope. -testFirstFn("(function f() { f() })", 'needsCallee', 'needsSelfSymbol') +testFirstFn("(function f() { f() })", 'needsCallee', 'usesSelfSymbol') // A child function accessing parent's variable triggers the need for scope // in parent @@ -217,7 +223,7 @@ testFirstFn("(function f(x) { function g() { x } })", 'hasScopeBlock') // scope in parent testFirstFn("(function f() { function g() { x } })", 'needsParentScope', 'needsCallee') -// A child function redefining a local variable from its parent should not +// A child function redefining a local variable from its parent should not // affect the parent function in any way testFirstFn("(function f() { var x; function g() { var x; x } })") @@ -239,14 +245,15 @@ testFirstFn("(function f() { var x; function g() { var o; with(o) { x } } })", ' // Using "eval" triggers pretty much everything. The function even needs to be // vararg, 'cause we don't know if eval will be using "arguments". -testFirstFn("(function f() { eval() })", 'needsParentScope', 'needsCallee', 'hasScopeBlock', 'hasEval', 'isVarArg', 'allVarsInScope') +testFirstFn("(function f() { eval() })", 'usesSelfSymbol', 'needsParentScope', 'needsCallee', 'hasScopeBlock', 'hasEval', 'isVarArg', 'allVarsInScope') // Nested function using "eval" is almost the same as parent function using // eval, but at least the parent doesn't have to be vararg. -testFirstFn("(function f() { function g() { eval() } })", 'needsParentScope', 'needsCallee', 'hasScopeBlock', 'allVarsInScope') +testFirstFn("(function f() { function g() { eval() } })", 'usesSelfSymbol', 'needsParentScope', 'needsCallee', 'hasScopeBlock', 'allVarsInScope') // Function with 250 named parameters is ordinary testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250) { p250 = p249 }") // Function with 251 named parameters is variable arguments -testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250, p251) { p250 = p251 }", 'isVarArg') +// NOTE: hasScopeBlock should be optimized away. Implementation of JDK-8038942 should take care of it. +testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250, p251) { p250 = p251 }", 'isVarArg', 'hasScopeBlock') |