Attachment 13681 Details for Bug 70997 – Apply on HEAD

[patch] Apply on HEAD

patch_for_70997.txt (text/plain), 1.67 KB, created by Olivier Thomann

on 2004-07-29 18:30:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2004-07-29 18:30:58 EDT

Size: 1.67 KB

patch

obsolete

>Index: TryStatement.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java,v
>retrieving revision 1.74
>diff -u -r1.74 TryStatement.java
>--- TryStatement.java	1 Jul 2004 15:11:49 -0000	1.74
>+++ TryStatement.java	29 Jul 2004 22:18:17 -0000
>@@ -343,17 +343,20 @@
> 					case FINALLY_MUST_BE_INLINED :
> 						codeStream.store(anyExceptionVariable, false);
> 						this.finallyBlock.generateCode(currentScope, codeStream);
>+						position = codeStream.position;
> 						codeStream.load(anyExceptionVariable);
> 						codeStream.athrow();
>+						codeStream.recordPositionsFrom(
>+								position,
>+								finallyBlock.sourceEnd);
> 						subRoutineStartLabel.place();
>-						codeStream.recordPositionsFrom(finallySequenceStartPC, finallyBlock.sourceStart);
> 						break;
> 						
> 					case FINALLY_DOES_NOT_COMPLETE :
> 						codeStream.pop();
> 						subRoutineStartLabel.place();
> 						codeStream.recordPositionsFrom(finallySequenceStartPC, finallyBlock.sourceStart);
>-						finallyBlock.generateCode(scope, codeStream);
>+						this.finallyBlock.generateCode(scope, codeStream);
> 						break;
> 				}
> 				// will naturally fall into subsequent code after subroutine invocation
>@@ -379,7 +382,7 @@
> 								codeStream.removeNotDefinitelyAssignedVariables(currentScope, preTryInitStateIndex);
> 							}
> 							// entire sequence for finally is associated to finally block
>-							finallyBlock.generateCode(scope, codeStream);
>+							this.finallyBlock.generateCode(scope, codeStream);
> 							break;
> 						
> 						case FINALLY_DOES_NOT_COMPLETE :

Actions: View | Diff

Attachments on bug 70997: 13680 | 13681 | 14101