Attachment #65572 for bug #184546

View | Details | Raw Unified | Return to bug 184546
Collapse All | Expand All

Lines 4350-4355 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java (-2 / +26 lines)
4350	// null analysis -- try/finally	4350	// null analysis -- try/finally
4351	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128547	4351	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128547
4352	// variant	4352	// variant
		4353	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=184546
		4354	// variant
4353	public void test0516_try_finally() {	4355	public void test0516_try_finally() {
4354	this.runConformTest(	4356	this.runConformTest(
4355	new String[] {	4357	new String[] {
Lines 4371-4377 Link Here
4371	"");	4373	"");
4372	}	4374	}
4373		4375
4374
4375	// null analysis -- try/finally	4376	// null analysis -- try/finally
4376	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=132072	4377	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=132072
4377	// AIOOBE in null check compiling com.sun.org.apache.xalan.internal.res.XSLTErrorResources from JDK 1.5 source	4378	// AIOOBE in null check compiling com.sun.org.apache.xalan.internal.res.XSLTErrorResources from JDK 1.5 source
Lines 4413-4419 Link Here
4413	"");	4414	"");
4414	}	4415	}
4415		4416
4416
4417	// null analysis -- try/finally	4417	// null analysis -- try/finally
4418	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=132120	4418	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=132120
4419	// [compiler][null] NPE batch compiling JDT/Core from HEAD	4419	// [compiler][null] NPE batch compiling JDT/Core from HEAD
Lines 4891-4896 Link Here
4891	"");	4891	"");
4892	}	4892	}
4893		4893
		4894	// null analysis -- try/finally
		4895	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=184546
		4896	public void test0533_try_finally_field() {
		4897	this.runConformTest(
		4898	new String[] {
		4899	"X.java",
		4900	"public class X {\n" +
		4901	" static char SHOULD_NOT_MATTER = '?';\n" +
		4902	" Object foo() {\n" +
		4903	" X x = null;\n" +
		4904	" try {\n" +
		4905	" x = new X();\n" +
		4906	" return x;\n" +
		4907	" }\n" +
		4908	" finally {\n" +
		4909	" if (x != null) {\n" +
		4910	" x.toString();\n" +
		4911	" }\n" +
		4912	" }\n" +
		4913	" }\n" +
		4914	"}\n"},
		4915	"");
		4916	}
		4917
4894	// null analysis -- try/catch	4918	// null analysis -- try/catch
4895	public void test0550_try_catch() {	4919	public void test0550_try_catch() {
4896	this.runConformTest(	4920	this.runConformTest(

Lines 38-43 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/NullInfoRegistry.java (+1 lines)
38	* not modified by this constructor	38	* not modified by this constructor
39	*/	39	*/
40	public NullInfoRegistry(UnconditionalFlowInfo upstream) {	40	public NullInfoRegistry(UnconditionalFlowInfo upstream) {
		41	this.maxFieldCount = upstream.maxFieldCount;
41	if ((upstream.tagBits & NULL_FLAG_MASK) != 0) {	42	if ((upstream.tagBits & NULL_FLAG_MASK) != 0) {
42	long u1, u2, u3, u4, nu2, nu3, nu4;	43	long u1, u2, u3, u4, nu2, nu3, nu4;
43	this.nullBit2 = (u1 = upstream.nullBit1)	44	this.nullBit2 = (u1 = upstream.nullBit1)

Return to bug 184546