Attachment 185260 Details for Bug 332637 – draft patch

[patch] draft patch

patch332637.txt (text/plain), 2.32 KB, created by Ayushman Jain

on 2010-12-15 15:10:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2010-12-15 15:10:08 EST

Size: 2.32 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java,v
>retrieving revision 1.114
>diff -u -r1.114 TryStatement.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java	19 Nov 2009 15:57:21 -0000	1.114
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java	15 Dec 2010 20:03:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -126,15 +126,29 @@
> 								addPotentialInitializationsFrom(
> 									handlingContext.initsOnReturn));
> 				} else {
>-					catchInfo =
>+					if ((tryInfo.tagBits & FlowInfo.UNREACHABLE) != 0 && (handlingContext.initsOnReturn.tagBits & FlowInfo.UNREACHABLE) == 0) {
>+						// incase the try block returns, the null info that would've gone into tryInfo can 
>+						// be obtained from handlingContext.initsOnReturn instead.
>+						catchInfo =
> 						flowInfo.unconditionalCopy().
> 							addPotentialInitializationsFrom(
> 								handlingContext.initsOnException(
> 									this.caughtExceptionTypes[i]))
>-							.addPotentialInitializationsFrom(tryInfo.unconditionalCopy())
>+							.addPotentialInitializationsFrom(handlingContext.initsOnReturn.unconditionalCopy())
> 							.addPotentialInitializationsFrom(
> 								handlingContext.initsOnReturn.
> 									nullInfoLessUnconditionalCopy());
>+					} else {
>+						catchInfo =
>+							flowInfo.unconditionalCopy().
>+								addPotentialInitializationsFrom(
>+									handlingContext.initsOnException(
>+										this.caughtExceptionTypes[i]))
>+								.addPotentialInitializationsFrom(tryInfo.unconditionalCopy())
>+								.addPotentialInitializationsFrom(
>+									handlingContext.initsOnReturn.
>+										nullInfoLessUnconditionalCopy());
>+					}
> 				}
> 
> 				// catch var is always set

Actions: View | Diff

Attachments on bug 332637: 185225 | 185260 | 185280 | 185336 | 185401 | 185402