Thu, 27 Jun 2013 13:24:50 +0530
8019226: line number not generated for first statement if it is on the same function declaration line
Reviewed-by: jlaskey, hannesw
1.1 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Jun 26 12:38:35 2013 -0300 1.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Jun 27 13:24:50 2013 +0530 1.3 @@ -1016,6 +1016,8 @@ 1.4 assert lc.hasCompileUnits(); 1.5 1.6 method = lc.pushMethodEmitter(unit.getClassEmitter().method(functionNode)); 1.7 + // new method - reset last line number 1.8 + lastLineNumber = -1; 1.9 // Mark end for variable tables. 1.10 method.begin(); 1.11 1.12 @@ -1093,7 +1095,7 @@ 1.13 private void lineNumber(final Statement statement) { 1.14 final int lineNumber = statement.getLineNumber(); 1.15 if (lineNumber != lastLineNumber) { 1.16 - method.lineNumber(statement.getLineNumber()); 1.17 + method.lineNumber(lineNumber); 1.18 } 1.19 lastLineNumber = lineNumber; 1.20 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/script/basic/JDK-8019226.js Thu Jun 27 13:24:50 2013 +0530 2.3 @@ -0,0 +1,39 @@ 2.4 +/* 2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + */ 2.26 + 2.27 +/** 2.28 + * JDK-8019226: line number not generated for first statement if it is on the same function declaration line 2.29 + * 2.30 + * @test 2.31 + * @run 2.32 + */ 2.33 + 2.34 +function func1() { func2() } 2.35 + 2.36 +function func2() { throw new Error() } 2.37 + 2.38 +try { 2.39 + func1() 2.40 +} catch (e) { 2.41 + print(e.stack.replace(/\\/g, '/')) 2.42 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/script/basic/JDK-8019226.js.EXPECTED Thu Jun 27 13:24:50 2013 +0530 3.3 @@ -0,0 +1,3 @@ 3.4 +func2 @ test/script/basic/JDK-8019226.js:33 3.5 +func1 @ test/script/basic/JDK-8019226.js:31 3.6 +<program> @ test/script/basic/JDK-8019226.js:36