Attachment #181581 for bug #328281

Lines 7-12 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java (+5 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.lookup;	12	package org.eclipse.jdt.internal.compiler.lookup;
12		13
Lines 146-151 Link Here
146	void buildFieldsAndMethods() {	147	void buildFieldsAndMethods() {
147	buildFields();	148	buildFields();
148	buildMethods();	149	buildMethods();
		150	if ((this.referenceContext.binding.tagBits & TagBits.IsAccessibleViaNonPrivateSub) != 0)
		151	this.referenceContext.binding.tagIndirectlyAccessibleFields();
149		152
150	SourceTypeBinding sourceType = this.referenceContext.binding;	153	SourceTypeBinding sourceType = this.referenceContext.binding;
151	if (sourceType.isMemberType() && !sourceType.isLocalType())	154	if (sourceType.isMemberType() && !sourceType.isLocalType())
Lines 903-908 Link Here
903	} else {	906	} else {
904	// only want to reach here when no errors are reported	907	// only want to reach here when no errors are reported
905	sourceType.superclass = superclass;	908	sourceType.superclass = superclass;
		909	if (superclass.isPrivate() && !sourceType.isPrivate())
		910	superclass.tagBits \|= TagBits.IsAccessibleViaNonPrivateSub;
906	return true;	911	return true;
907	}	912	}
908	}	913	}

Lines 7-13 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/FieldBinding.java (-1 / +5 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 185682 - Increment/decrement operators mark local variables as read	10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contributions for
		11	* bug 185682 - Increment/decrement operators mark local variables as read
		12	* bug 328281 - visibility leaks not detected when analyzing unused field in private class
11	*******************************************************************************/	13	*******************************************************************************/
12	package org.eclipse.jdt.internal.compiler.lookup;	14	package org.eclipse.jdt.internal.compiler.lookup;
13		15
Lines 299-304 Link Here
299	public final boolean isOrEnclosedByPrivateType() {	301	public final boolean isOrEnclosedByPrivateType() {
300	if ((this.modifiers & ClassFileConstants.AccPrivate) != 0)	302	if ((this.modifiers & ClassFileConstants.AccPrivate) != 0)
301	return true;	303	return true;
		304	if ((this.tagBits & TagBits.IsAccessibleViaNonPrivateSub) != 0)
		305	return false; // visibility leak through non-private subclass
302	return this.declaringClass != null && this.declaringClass.isOrEnclosedByPrivateType();	306	return this.declaringClass != null && this.declaringClass.isOrEnclosedByPrivateType();
303	}	307	}
304	/* Answer true if the receiver has private visibility and is used locally	308	/* Answer true if the receiver has private visibility and is used locally

Lines 7-12 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java (+3 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.lookup;	12	package org.eclipse.jdt.internal.compiler.lookup;
12		13
Lines 705-710 Link Here
705	public final boolean isOrEnclosedByPrivateType() {	706	public final boolean isOrEnclosedByPrivateType() {
706	if ((this.modifiers & ClassFileConstants.AccPrivate) != 0)	707	if ((this.modifiers & ClassFileConstants.AccPrivate) != 0)
707	return true;	708	return true;
		709	if ((this.tagBits & TagBits.IsAccessibleViaNonPrivateSub) != 0)
		710	return false; // visibility leak through non-private subclass
708	return this.declaringClass != null && this.declaringClass.isOrEnclosedByPrivateType();	711	return this.declaringClass != null && this.declaringClass.isOrEnclosedByPrivateType();
709	}	712	}
710		713




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Benjamin Muskalla - Contribution for bug 239066
 *     Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.lookup;


		if (current == null && !isOrEnclosedByPrivateType) {
			int length = inherited.length;
			for (int i = 0; i < length; i++){
				inherited[i].original().tagBits |= TagBits.IsAccessibleViaNonPrivateSub;
			}
		}


			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=296660, if current type is exposed,
			// inherited methods of super classes are too. current == null case handled already.
			if (!isOrEnclosedByPrivateType && current != null) {
				inheritedMethod.original().tagBits |= TagBits.IsAccessibleViaNonPrivateSub;
			}
			matchingInherited[++index] = inheritedMethod;
			for (int j = i + 1; j < length; j++) {




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.lookup;


		if (current == null && !isOrEnclosedByPrivateType) {
			int length = inherited.length;
			for (int i = 0; i < length; i++){
				inherited[i].original().tagBits |= TagBits.IsAccessibleViaNonPrivateSub;
			}
		}
		if (current == null && this.type.isPublic()) {

			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=296660, if current type is exposed,
			// inherited methods of super classes are too. current == null case handled already.
			if (!isOrEnclosedByPrivateType && matchMethod == null && current != null) {
				inherited[i].original().tagBits |= TagBits.IsAccessibleViaNonPrivateSub;	
			}
			if (skip[i]) continue;
			MethodBinding inheritedMethod = inherited[i];

Lines 7-12 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java (+10 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.lookup;	12	package org.eclipse.jdt.internal.compiler.lookup;
12		13
Lines 1627-1630 Link Here
1627	public FieldBinding[] unResolvedFields() {	1628	public FieldBinding[] unResolvedFields() {
1628	return this.fields;	1629	return this.fields;
1629	}	1630	}
		1631
		1632	public void tagIndirectlyAccessibleFields() {
		1633	for (int i = 0; i < this.fields.length; i++) {
		1634	if (!this.fields[i].isPrivate())
		1635	this.fields[i].tagBits \|= TagBits.IsAccessibleViaNonPrivateSub;
		1636	}
		1637	if (this.superclass.isPrivate())
		1638	((SourceTypeBinding)this.superclass).tagIndirectlyAccessibleFields();
		1639	}
1630	}	1640	}

Lines 7-12 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java (+5 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.lookup;	12	package org.eclipse.jdt.internal.compiler.lookup;
12		13
Lines 122-125 Link Here
122		123
123	// set when type contains non-private constructor(s)	124	// set when type contains non-private constructor(s)
124	long HasNonPrivateConstructor = ASTNode.Bit53L;	125	long HasNonPrivateConstructor = ASTNode.Bit53L;
		126
		127	// set on a private class if it has a non-private subclass
		128	// set on a field/method of a private class if it is accessible via a non-private subclass
		129	long IsAccessibleViaNonPrivateSub = ASTNode.Bit54L;
125	}	130	}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 328281 - visibility leaks not detected when analyzing unused field in private class
 *******************************************************************************/
package org.eclipse.jdt.core.tests.compiler.regression;


		"----------\n");
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=296660
// check independence of textual order
public void test099a() {
	this.runNegativeTest(
		new String[] {
			"X.java",
			"public class X {\n" +
			"   public class C extends B {\n" +
		    "		public void foo(int a) {\n" +
			"			System.out.println(\"Hello\");\n" +    
			"		}\n" +
		    "		public void foo(double a) {\n" +
			"			System.out.println(\"Hello\");\n" +    
			"		}\n" +
			"		public void foo(boolean a) {\n" +
			"			System.out.println(\"Hello\");\n" +    
			"		}\n" +
			"		public void foo(byte a) {\n" +
			"			System.out.println(\"Hello\");\n" +     
			"		}\n" +
		    "   }\n" +
			"   private class B extends A {\n" +
			"		public void foo(int a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"		public void foo(float a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   	public void foo(double a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   	public void foo(char a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   }\n" +
			"   private class A {\n" +
			"    	public void foo(int a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"    	}\n" +
			"	    public void foo(float a) {\n" +
			"   		System.out.println(\"Hello\");\n" + 
			"   	}\n" +
			"   	public void foo(boolean a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"      	public void foo(Integer a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   }\n" + 
			"}\n"
		},
		"----------\n" + 
		"1. WARNING in X.java (at line 2)\n" + 
		"	public class C extends B {\n" + 
		"	             ^\n" + 
		"Access to enclosing constructor X.B() is emulated by a synthetic accessor method\n" + 
		"----------\n" + 
		"2. WARNING in X.java (at line 16)\n" + 
		"	private class B extends A {\n" + 
		"	              ^\n" + 
		"Access to enclosing constructor X.A() is emulated by a synthetic accessor method\n" + 
		"----------\n" + 
		"3. WARNING in X.java (at line 23)\n" + 
		"	public void foo(double a) {\n" + 
		"	            ^^^^^^^^^^^^^\n" + 
		"The method foo(double) from the type X.B is never used locally\n" + 
		"----------\n" + 
		"4. WARNING in X.java (at line 31)\n" + 
		"	public void foo(int a) {\n" + 
		"	            ^^^^^^^^^^\n" + 
		"The method foo(int) from the type X.A is never used locally\n" + 
		"----------\n" + 
		"5. WARNING in X.java (at line 34)\n" + 
		"	public void foo(float a) {\n" + 
		"	            ^^^^^^^^^^^^\n" + 
		"The method foo(float) from the type X.A is never used locally\n" + 
		"----------\n" + 
		"6. WARNING in X.java (at line 37)\n" + 
		"	public void foo(boolean a) {\n" + 
		"	            ^^^^^^^^^^^^^^\n" + 
		"The method foo(boolean) from the type X.A is never used locally\n" + 
		"----------\n");
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=296660
// check usage via super-call
public void test099b() {
	this.runNegativeTest(
		new String[] {
			"X.java",
			"public class X {\n" +
			"    private class A {\n" +
			"    	public void foo(int a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"    	}\n" +
			"	    public void foo(float a) {\n" +
			"   		System.out.println(\"Hello\");\n" + 
			"   	}\n" +
			"   	public void foo(boolean a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"      	public void foo(Integer a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   }\n" + 
			"   private class B extends A {\n" +
			"		public void foo(int a) {\n" +
			"   		super.foo(a);\n" +    
			"   	}\n" +
			"		public void foo(float a) {\n" +
			"   		super.foo(a);\n" +    
			"   	}\n" +
			"   	public void foo(double a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   	public void foo(char a) {\n" +
			"   		System.out.println(\"Hello\");\n" +    
			"   	}\n" +
			"   }\n" +
			"   public class C extends B {\n" +
		    "		public void foo(int a) {\n" +
			"			System.out.println(\"Hello\");\n" +    
			"		}\n" +
		    "		public void foo(double a) {\n" +
			"			super.foo(a);\n" +    
			"		}\n" +
			"		public void foo(boolean a) {\n" +
			"			super.foo(a);\n" +    
			"		}\n" +
			"		public void foo(byte a) {\n" +
			"			System.out.println(\"Hello\");\n" +     
			"		}\n" +
		    "   }\n" +
			"}\n"
		},
		"----------\n" + 
		"1. WARNING in X.java (at line 16)\n" + 
		"	private class B extends A {\n" + 
		"	              ^\n" + 
		"Access to enclosing constructor X.A() is emulated by a synthetic accessor method\n" + 
		"----------\n" + 
		"2. WARNING in X.java (at line 30)\n" + 
		"	public class C extends B {\n" + 
		"	             ^\n" + 
		"Access to enclosing constructor X.B() is emulated by a synthetic accessor method\n" + 
		"----------\n");
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=296660
public void test100() {
	this.runNegativeTest(
		new String[] {

Lines 7-13 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/ProgrammingProblemsTest.java (-1 / +28 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 185682 - Increment/decrement operators mark local variables as read	10	* Stephan Herrmann <stephan@cs.tu-berlin.de> - Contributions for
		11	* bug 185682 - Increment/decrement operators mark local variables as read
		12	* bug 328281 - visibility leaks not detected when analyzing unused field in private class
11	*******************************************************************************/	13	*******************************************************************************/
12	package org.eclipse.jdt.core.tests.compiler.regression;	14	package org.eclipse.jdt.core.tests.compiler.regression;
13		15
Lines 2120-2124 Link Here
2120	true/shouldFlushOutputDirectory/,	2122	true/shouldFlushOutputDirectory/,
2121	customOptions);	2123	customOptions);
2122	}	2124	}
		2125	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=328281
		2126	public void test0052() {
		2127	Map customOptions = getCompilerOptions();
		2128	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
		2129	this.runConformTest(
		2130	new String[] {
		2131	"X.java",
		2132	"class X {\n" +
		2133	" Y y = new Y();\n" +
		2134	" private class Y {\n" +
		2135	" int abc;\n" +
		2136	" Y() {\n" +
		2137	" abc++;\n" + // not a relevant usage
		2138	" }\n" +
		2139	" }\n" +
		2140	" class Z extends Y {}\n" + // makes 'abc' externally accessible
		2141	"}"
		2142	},
		2143	"",
		2144	null/classLibraries/,
		2145	true/shouldFlushOutputDirectory/,
		2146	null/vmArguments/,
		2147	customOptions,
		2148	null/requestor/);
		2149	}
2123		2150
2124	}	2151	}

Return to bug 328281