Thu, 24 May 2018 16:39:31 +0800
Merge
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
attila@962 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
attila@962 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
attila@962 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
attila@962 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /** |
aoqi@0 | 25 | * JDK-8025515: Performance issues with Source.getLine() |
aoqi@0 | 26 | * |
aoqi@0 | 27 | * @test |
aoqi@0 | 28 | * @run |
aoqi@0 | 29 | */ |
aoqi@0 | 30 | |
aoqi@0 | 31 | // Make sure synthetic names of anonymous functions have correct line numbers |
aoqi@0 | 32 | |
aoqi@0 | 33 | function getFirstScriptFrame(stack) { |
aoqi@0 | 34 | for (frameNum in stack) { |
aoqi@0 | 35 | var frame = stack[frameNum]; |
aoqi@0 | 36 | if (frame.className.startsWith("jdk.nashorn.internal.scripts.Script$")) { |
aoqi@0 | 37 | return frame; |
aoqi@0 | 38 | } |
aoqi@0 | 39 | } |
aoqi@0 | 40 | } |
aoqi@0 | 41 | |
aoqi@0 | 42 | function testMethodName(f, expected) { |
aoqi@0 | 43 | try { |
aoqi@0 | 44 | f(); |
aoqi@0 | 45 | fail("expected error"); |
aoqi@0 | 46 | } catch (e) { |
aoqi@0 | 47 | var stack = e.nashornException.getStackTrace(); |
aoqi@0 | 48 | var name = getFirstScriptFrame(stack).methodName; |
aoqi@0 | 49 | if (name !== expected) { |
attila@963 | 50 | fail("got " + name + ", expected " + expected); |
aoqi@0 | 51 | } |
aoqi@0 | 52 | } |
aoqi@0 | 53 | } |
aoqi@0 | 54 | |
aoqi@0 | 55 | testMethodName(function() { |
aoqi@0 | 56 | return a.b.c; |
aoqi@0 | 57 | }, "L:55"); |
aoqi@0 | 58 | |
aoqi@0 | 59 | testMethodName(function() { throw new Error() }, "L:59"); |
aoqi@0 | 60 | |
aoqi@0 | 61 | var f = (function() { |
aoqi@0 | 62 | return function() { a.b.c; }; |
aoqi@0 | 63 | })(); |
hannesw@1829 | 64 | testMethodName(f, "f#L:62"); |
aoqi@0 | 65 | |
aoqi@0 | 66 | testMethodName((function() { |
aoqi@0 | 67 | return function() { return a.b.c; }; |
hannesw@1829 | 68 | })(), "L:66#L:67"); |