Attachment 193971 Details for Bug 343713 – test & proposed fix

[patch] test & proposed fix

Bug_343713.patch (text/plain), 3.73 KB, created by Stephan Herrmann

on 2011-04-24 15:57:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2011-04-24 15:57:11 EDT

Size: 3.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java,v
>retrieving revision 1.114
>diff -u -r1.114 ConstructorDeclaration.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java	5 Mar 2011 17:18:43 -0000	1.114
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java	24 Apr 2011 19:42:45 -0000
>@@ -365,12 +365,13 @@
> 		if (this.ignoreFurtherInvestigation) {
> 			throw new AbortMethod(this.scope.referenceCompilationUnit().compilationResult, null);
> 		}
>+		int preReturnPC = codeStream.lastEntryPC;
> 		if ((this.bits & ASTNode.NeedFreeReturn) != 0) {
> 			codeStream.return_();
> 		}
> 		// local variable attributes
> 		codeStream.exitUserScope(this.scope);
>-		codeStream.recordPositionsFrom(0, this.bodyEnd);
>+		codeStream.recordPositionsFrom(preReturnPC, this.bodyEnd);
> 		try {
> 			classFile.completeCodeAttribute(codeAttributeOffset);
> 		} catch(NegativeArraySizeException e) {
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java,v
>retrieving revision 1.1
>diff -u -r1.1 InnerEmulationTest_1_5.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java	12 May 2009 20:49:53 -0000	1.1
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java	24 Apr 2011 19:42:46 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -286,6 +286,39 @@
> 		"     inner name: #24 D, accessflags: 8 static]\n";
> 	checkDisassembledClassFile(OUTPUT_DIR + File.separator + "p" + File.separator + "X.class", "X", expectedOutput);
> }
>+public void test14() throws Exception {
>+	runConformTest(new String[] {
>+		"LineNumberBug.java",
>+		"public class LineNumberBug {\n" + 
>+		"    class Inner {\n" + 
>+		"		public Inner() {\n" + 
>+		"			System.out.println(\"Inner()\");\n" + 
>+		"		}\n" + 
>+		"    }\n" + 
>+		"	public static void main(String[] args) {\n" + 
>+		"		new LineNumberBug().new Inner();\n" + 
>+		"	}\n" + 
>+		"}\n"
>+	});
>+	String expectedOutput =
>+		"  // Method descriptor #8 (LLineNumberBug;)V\n" + 
>+		"  // Stack: 2, Locals: 2\n" + 
>+		"  public LineNumberBug$Inner(LineNumberBug arg0);\n" + 
>+		"     0  aload_0 [this]\n" + 
>+		"     1  aload_1 [arg0]\n" + 
>+		"     2  putfield LineNumberBug$Inner.this$0 : LineNumberBug [10]\n" + 
>+		"     5  aload_0 [this]\n" + 
>+		"     6  invokespecial java.lang.Object() [12]\n" + 
>+		"     9  getstatic java.lang.System.out : java.io.PrintStream [15]\n" + 
>+		"    12  ldc <String \"Inner()\"> [21]\n" + 
>+		"    14  invokevirtual java.io.PrintStream.println(java.lang.String) : void [23]\n" + 
>+		"    17  return\n" + 
>+		"      Line numbers:\n" + 
>+		"        [pc: 5, line: 3]\n" + 
>+		"        [pc: 9, line: 4]\n" +
>+		"        [pc: 17, line: 5]\n";
>+	checkDisassembledClassFile(OUTPUT_DIR + File.separator + "LineNumberBug$Inner.class", "LineNumberBug$Inner", expectedOutput);	
>+}
> public static Class testClass() {
> 	return InnerEmulationTest_1_5.class;
> }

Actions: View | Diff

Attachments on bug 343713: 193971 | 193972 | 194026