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