infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-18 20:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

8019226: line number not generated for first statement if it is on the same function declaration line

Browse Source 
Reviewed-by: jlaskey, hannesw
This commit is contained in:
Athijegannathan Sundararajan 2013-06-27 13:24:50 +05:30
parent 1e7b1f36e4
commit a089899deb
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
View File

@ -1016,6 +1016,8 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
assert lc.hasCompileUnits();
method = lc.pushMethodEmitter(unit.getClassEmitter().method(functionNode));
// new method - reset last line number
lastLineNumber = -1;
// Mark end for variable tables.
method.begin();
@ -1093,7 +1095,7 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
private void lineNumber(final Statement statement) {
final int lineNumber = statement.getLineNumber();
if (lineNumber != lastLineNumber) {
method.lineNumber(statement.getLineNumber());
method.lineNumber(lineNumber);
}
lastLineNumber = lineNumber;
}

39
nashorn/test/script/basic/JDK-8019226.js Normal file
View File

@ -0,0 +1,39 @@
/*
* 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.
*/
/**
* JDK-8019226: line number not generated for first statement if it is on the same function declaration line
*
* @test
* @run
*/
function func1() { func2() }
function func2() { throw new Error() }
try {
func1()
} catch (e) {
print(e.stack.replace(/\\/g, '/'))
}

3
nashorn/test/script/basic/JDK-8019226.js.EXPECTED Normal file
View File

@ -0,0 +1,3 @@
func2 @ test/script/basic/JDK-8019226.js:33
func1 @ test/script/basic/JDK-8019226.js:31
<program> @ test/script/basic/JDK-8019226.js:36