Mercurial > hg > openjdk > jdk8 > nashorn
changeset 382:f9c855b828fe
8019226: line number not generated for first statement if it is on the same function declaration line
Reviewed-by: jlaskey, hannesw
author | sundar |
---|---|
date | Thu, 27 Jun 2013 13:24:50 +0530 |
parents | d1886ad46f0c |
children | 5ec4762d9df0 218c2833c344 |
files | src/jdk/nashorn/internal/codegen/CodeGenerator.java test/script/basic/JDK-8019226.js test/script/basic/JDK-8019226.js.EXPECTED |
diffstat | 3 files changed, 45 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Jun 26 12:38:35 2013 -0300 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Jun 27 13:24:50 2013 +0530 @@ -1016,6 +1016,8 @@ 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 @@ private void lineNumber(final Statement statement) { final int lineNumber = statement.getLineNumber(); if (lineNumber != lastLineNumber) { - method.lineNumber(statement.getLineNumber()); + method.lineNumber(lineNumber); } lastLineNumber = lineNumber; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8019226.js Thu Jun 27 13:24:50 2013 +0530 @@ -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, '/')) +}