Attachment #113610 for bug #247953




 * @param codegenBinding
 * @param actualReceiverType
 * @param isImplicitThisReceiver
 * @param hasGenericCast
 * @return the receiver type to use in constant pool
 */
public static TypeBinding getConstantPoolDeclaringClass(Scope currentScope, MethodBinding codegenBinding, TypeBinding actualReceiverType, boolean isImplicitThisReceiver) {
	TypeBinding constantPoolDeclaringClass = codegenBinding.declaringClass;
	// Post 1.4.0 target, array clone() invocations are qualified with array type
	// This is handled in array type #clone method binding resolution (see Scope and UpdatedMethodBinding)

		// for runtime compatibility on 1.2 VMs : change the declaring class of the binding
		// NOTE: from target 1.2 on, method's declaring class is touched if any different from receiver type
		// and not from Object or implicit static method call.
		if (constantPoolDeclaringClass != actualReceiverType.erasure() && !actualReceiverType.isArrayType()) {
			CompilerOptions options = currentScope.compilerOptions();
			if ((options.targetJDK >= ClassFileConstants.JDK1_2
						&& (options.complianceLevel >= ClassFileConstants.JDK1_4 || !(isImplicitThisReceiver && codegenBinding.isStatic()))




public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {
	int pc = codeStream.position;
	MethodBinding codegenBinding = this.binding.original();
	TypeBinding codeGenReceiverType = this.actualReceiverType;
	if (codegenBinding.canBeSeenBy(codeGenReceiverType, this, currentScope)) {
		// generate receiver/enclosing instance access
		boolean isStatic = codegenBinding.isStatic();
		// outer access ?

			}
		} else {
			this.receiver.generateCode(currentScope, codeStream, !isStatic);
			// compute generic cast if necessary
			TypeBinding upperBound = ((ReferenceBinding) codeGenReceiverType).getReceiverTypeErasure(this.binding.declaringClass);
			if (upperBound != null && upperBound != codeGenReceiverType.erasure()) {
				codeStream.checkcast(upperBound); // handle indirect inheritance thru variable secondary bound
				codeGenReceiverType = upperBound;
			}
			codeStream.recordPositionsFrom(pc, this.sourceStart);
		}
		// generate arguments
		generateArguments(this.binding, this.arguments, currentScope, codeStream);
		// actual message invocation
		TypeBinding constantPoolDeclaringClass = CodeStream.getConstantPoolDeclaringClass(currentScope, codegenBinding, codeGenReceiverType, this.receiver.isImplicitThis());
		if (isStatic) {
			codeStream.invoke(Opcodes.OPC_invokestatic, codegenBinding, constantPoolDeclaringClass);
		} else if( (this.receiver.isSuper()) || codegenBinding.isPrivate()){

			currentScope.problemReporter().needImplementation(this);
		} else {
			this.receiver.generateCode(currentScope, codeStream, !isStatic);
			// compute generic cast if necessary
			TypeBinding upperBound = codeGenReceiverType.getReceiverTypeErasure(this.binding.declaringClass);
			if (upperBound != null && upperBound != codeGenReceiverType.erasure()) {
				codeStream.checkcast(upperBound); // handle indirect inheritance thru variable secondary bound
				codeGenReceiverType = upperBound;
			}

			codeStream.recordPositionsFrom(pc, this.sourceStart);
		}
		if (isStatic) {




		scope.problemReporter().invalidField(this, this.actualReceiverType);
		return null;
	}
	// compute generic cast if necessary
	TypeBinding upperBound = this.actualReceiverType.getReceiverTypeErasure(fieldBinding.declaringClass);
	if (upperBound != null && upperBound != this.actualReceiverType.erasure()) {
		this.actualReceiverType = upperBound; // handle indirect inheritance thru variable secondary bound
	}	
	}
	this.receiver.computeConversion(scope, this.actualReceiverType, this.actualReceiverType);
	if (isFieldUseDeprecated(fieldBinding, scope, (this.bits & ASTNode.IsStrictlyAssigned) !=0)) {
		scope.problemReporter().deprecatedField(fieldBinding, this);




	public long nameSourcePosition ; //(start<<32)+end

	public TypeBinding actualReceiverType;
	public TypeBinding receiverGenericCast; // extra reference type cast to perform on generic receiver
	public TypeBinding valueCast; // extra reference type cast to perform on method returned value
	public TypeReference[] typeArguments;
	public TypeBinding[] genericTypeArguments;

 * @param valueRequired boolean
 */
public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {

	int pc = codeStream.position;

	// generate receiver/enclosing instance access
	MethodBinding codegenBinding = this.binding.original();
	boolean isStatic = codegenBinding.isStatic();
	TypeBinding codeGenReceiverType = this.actualReceiverType;
	if (isStatic) {
		this.receiver.generateCode(currentScope, codeStream, false);
		codeStream.recordPositionsFrom(pc, this.sourceStart);

		codeStream.generateOuterAccess(path, this, targetType, currentScope);
	} else {
		this.receiver.generateCode(currentScope, codeStream, true);
		if (this.receiverGenericCast != null)
			codeStream.checkcast(this.receiverGenericCast);
		codeStream.recordPositionsFrom(pc, this.sourceStart);

	}
	// generate arguments
	generateArguments(this.binding, this.arguments, currentScope, codeStream);

	// actual message invocation
	if (this.syntheticAccessor == null){
		TypeBinding constantPoolDeclaringClass = CodeStream.getConstantPoolDeclaringClass(currentScope, codegenBinding, codeGenReceiverType, this.receiver.isImplicitThis());
		if (isStatic){
			codeStream.invoke(Opcodes.OPC_invokestatic, codegenBinding, constantPoolDeclaringClass);
		} else if( (this.receiver.isSuper()) || codegenBinding.isPrivate()){

	if ((this.binding.tagBits & TagBits.HasMissingType) != 0) {
		scope.problemReporter().missingTypeInMethod(this, this.binding);
	}
	// compute generic cast if necessary
	TypeBinding upperBound = this.actualReceiverType.getReceiverTypeErasure(this.binding.declaringClass);
	if (upperBound != null && upperBound != this.actualReceiverType.erasure()) {
		this.actualReceiverType = upperBound; // handle indirect inheritance thru variable secondary bound
	}	
	final CompilerOptions compilerOptions = scope.compilerOptions();
	if (!this.binding.isStatic()) {
		// the "receiver" must not be a type

			}
		} else {
			this.receiver.computeConversion(scope, this.actualReceiverType, this.actualReceiverType);
			// compute generic cast if necessary
			TypeBinding receiverErasure = this.actualReceiverType.erasure();
			if (receiverErasure instanceof ReferenceBinding) {
				if (receiverErasure.findSuperTypeOriginatingFrom(this.binding.declaringClass) == null) {
					this.receiverGenericCast = this.binding.declaringClass; // handle indirect inheritance thru variable secondary bound
				}
			}
		}
	} else {
		// static message invoked through receiver? legal but unoptimal (optional warning).

	if (this.typeArguments != null && this.binding.original().typeVariables == Binding.NO_TYPE_VARIABLES) {
		scope.problemReporter().unnecessaryTypeArgumentsForMethodInvocation(this.binding, this.genericTypeArguments, this.typeArguments);
	}
	return (this.resolvedType.tagBits & TagBits.HasMissingType) == 0 ? this.resolvedType : null;
				? this.resolvedType
				: null;
}

public void setActualReceiverType(ReferenceBinding receiverType) {




	return signature();
}

/**
 * Return erasure for the receiver type which is compatible with a given declaring class.
 * This is different from standard erasure when dealing with types with multiple upper bounds where
 * the first compatible bound is to be considered.
 * NOTE: the declaringClass is already know to be compatible with the receiver
 * @param declaringClass to look for
 * @return the first compatible bound, or null if none found
 */
public TypeBinding getReceiverTypeErasure(TypeBinding declaringClass) {
	switch(kind()) {
		case Binding.TYPE_PARAMETER :
			TypeVariableBinding variable = (TypeVariableBinding) this;
			if (variable.superclass != null && variable.superclass.findSuperTypeOriginatingFrom(declaringClass) != null) {
				return variable.superclass.getReceiverTypeErasure(declaringClass);
			}
			for (int i = 0, otherLength = variable.superInterfaces.length; i < otherLength; i++) {
				ReferenceBinding superInterface = variable.superInterfaces[i];
				if (superInterface.findSuperTypeOriginatingFrom(declaringClass) != null) {
					return superInterface.getReceiverTypeErasure(declaringClass);
				}
			}
			return null; // cannot happen if declaringClass is compatible
		case Binding.INTERSECTION_TYPE :
			WildcardBinding intersection = (WildcardBinding) this;
			if (intersection.superclass != null && intersection.superclass.findSuperTypeOriginatingFrom(declaringClass) != null) {
				return intersection.superclass.getReceiverTypeErasure(declaringClass);
			}
			for (int i = 0, otherLength = intersection.superInterfaces.length; i < otherLength; i++) {
				ReferenceBinding superInterface = intersection.superInterfaces[i];
				if (superInterface.findSuperTypeOriginatingFrom(declaringClass) != null) {
					return superInterface.getReceiverTypeErasure(declaringClass);
				}
			}
			return null; // cannot happen if declaringClass is compatible
		default :
			return erasure(); 
	}
}

public abstract PackageBinding getPackage();

void initializeForStaticImports() {




			"----------\n");
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953
public void test1381()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

			"}\n",
			"p/IB.java", // =====================
			"package p;\n" +
			"interface IA {\n" + // non visible
			"	void baz();\n" + 
			"}\n" + 
			"public interface IB extends IA {\n" + 
			"}\n",
		},
		"done");
	// check #baz() invocation declaring class is IB
	String expectedOutput =
		"  // Method descriptor #10 ()V\n" + 
		"  // Stack: 1, Locals: 1\n" + 
		"  void foo();\n" + 
		"     0  aload_0 [this]\n" + 
		"     1  getfield X.t : AA [21]\n" + 
		"     4  checkcast p.IB [23]\n" + 
		"     7  invokeinterface p.IB.baz() : void [25] [nargs: 1]\n" + 
		"     7  invokeinterface p.IA.baz() : void [27] [nargs: 1]\n" + 
		"    12  return\n" + 
		"      Line numbers:\n" + 
		"        [pc: 0, line: 4]\n" + 
		"        [pc: 12, line: 5]\n" + 
		"      Local variable table:\n" + 
		"        [pc: 0, pc: 13] local: this index: 0 type: X\n";
		"        [pc: 0, pc: 13] local: xt index: 1 type: X\n";

	File f = new File(OUTPUT_DIR + File.separator + "X.class");
	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1382()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1383()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1384()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1385()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1386()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

			"public interface IB extends IA {\n" + 
			"}\n",
		},
		"");
	// check #baz() invocation declaring class is not IA
	String expectedOutput =
		"  // Method descriptor #21 (LX;)V\n" + 

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1387()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

		"done");
	// check #baz declaring class is not IA
	String expectedOutput =
		"  // Method descriptor #10 ()V\n" + 
		"  // Stack: 2, Locals: 1\n" + 
		"  void foo();\n" + 
		"     0  getstatic java.lang.System.out : java.io.PrintStream [21]\n" + 
		"     3  aload_0 [this]\n" + 
		"     4  getfield X.t : AA [27]\n" + 
		"     7  checkcast p.IB [29]\n" + 
		"    10  pop\n" + 
		"    11  getstatic p.IB.baz : java.lang.Object [31]\n" + 
		"    14  invokevirtual java.io.PrintStream.println(java.lang.Object) : void [35]\n" + 
		"    17  return\n" + 
		"      Line numbers:\n" + 
		"        [pc: 0, line: 4]\n" + 
		"        [pc: 17, line: 5]\n" + 
		"      Local variable table:\n" + 
		"        [pc: 0, pc: 18] local: this index: 0 type: X\n";
		"        [pc: 0, pc: 13] local: xt index: 1 type: X\n";

	File f = new File(OUTPUT_DIR + File.separator + "X.class");
	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1388()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

	}
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
public void test1389()  throws Exception {
	this.runConformTest(
		new String[] {
			"X.java",

Return to bug 247953

Lines 545-556 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java (-6 / +5 lines)
545	scope.problemReporter().invalidField(this, this.actualReceiverType);	545	scope.problemReporter().invalidField(this, this.actualReceiverType);
546	return null;	546	return null;
547	}	547	}
548	TypeBinding receiverErasure = this.actualReceiverType.erasure();	548	// compute generic cast if necessary
549	if (receiverErasure instanceof ReferenceBinding) {	549	TypeBinding upperBound = this.actualReceiverType.getReceiverTypeErasure(fieldBinding.declaringClass);
550	if (receiverErasure.findSuperTypeOriginatingFrom(fieldBinding.declaringClass) == null) {	550	if (upperBound != null && upperBound != this.actualReceiverType.erasure()) {
551	this.actualReceiverType = fieldBinding.declaringClass; // handle indirect inheritance thru variable secondary bound	551	this.actualReceiverType = upperBound; // handle indirect inheritance thru variable secondary bound
552	}	552	}
553	}
554	this.receiver.computeConversion(scope, this.actualReceiverType, this.actualReceiverType);	553	this.receiver.computeConversion(scope, this.actualReceiverType, this.actualReceiverType);
555	if (isFieldUseDeprecated(fieldBinding, scope, (this.bits & ASTNode.IsStrictlyAssigned) !=0)) {	554	if (isFieldUseDeprecated(fieldBinding, scope, (this.bits & ASTNode.IsStrictlyAssigned) !=0)) {
556	scope.problemReporter().deprecatedField(fieldBinding, this);	555	scope.problemReporter().deprecatedField(fieldBinding, this);

Lines 50-56 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java (-17 / +8 lines)
50	public long nameSourcePosition ; //(start<<32)+end	50	public long nameSourcePosition ; //(start<<32)+end
51		51
52	public TypeBinding actualReceiverType;	52	public TypeBinding actualReceiverType;
53	public TypeBinding receiverGenericCast; // extra reference type cast to perform on generic receiver
54	public TypeBinding valueCast; // extra reference type cast to perform on method returned value	53	public TypeBinding valueCast; // extra reference type cast to perform on method returned value
55	public TypeReference[] typeArguments;	54	public TypeReference[] typeArguments;
56	public TypeBinding[] genericTypeArguments;	55	public TypeBinding[] genericTypeArguments;
Lines 123-134 Link Here
123	* @param valueRequired boolean	122	* @param valueRequired boolean
124	*/	123	*/
125	public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {	124	public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {
126
127	int pc = codeStream.position;	125	int pc = codeStream.position;
128
129	// generate receiver/enclosing instance access	126	// generate receiver/enclosing instance access
130	MethodBinding codegenBinding = this.binding.original();	127	MethodBinding codegenBinding = this.binding.original();
131	boolean isStatic = codegenBinding.isStatic();	128	boolean isStatic = codegenBinding.isStatic();
		129	TypeBinding codeGenReceiverType = this.actualReceiverType;
132	if (isStatic) {	130	if (isStatic) {
133	this.receiver.generateCode(currentScope, codeStream, false);	131	this.receiver.generateCode(currentScope, codeStream, false);
134	codeStream.recordPositionsFrom(pc, this.sourceStart);	132	codeStream.recordPositionsFrom(pc, this.sourceStart);
Lines 139-155 Link Here
139	codeStream.generateOuterAccess(path, this, targetType, currentScope);	137	codeStream.generateOuterAccess(path, this, targetType, currentScope);
140	} else {	138	} else {
141	this.receiver.generateCode(currentScope, codeStream, true);	139	this.receiver.generateCode(currentScope, codeStream, true);
142	if (this.receiverGenericCast != null)
143	codeStream.checkcast(this.receiverGenericCast);
144	codeStream.recordPositionsFrom(pc, this.sourceStart);	140	codeStream.recordPositionsFrom(pc, this.sourceStart);
145
146	}	141	}
147	// generate arguments	142	// generate arguments
148	generateArguments(this.binding, this.arguments, currentScope, codeStream);	143	generateArguments(this.binding, this.arguments, currentScope, codeStream);
149		144
150	// actual message invocation	145	// actual message invocation
151	if (this.syntheticAccessor == null){	146	if (this.syntheticAccessor == null){
152	TypeBinding constantPoolDeclaringClass = CodeStream.getConstantPoolDeclaringClass(currentScope, codegenBinding, this.actualReceiverType, this.receiver.isImplicitThis(), this.receiverGenericCast != null);	147	TypeBinding constantPoolDeclaringClass = CodeStream.getConstantPoolDeclaringClass(currentScope, codegenBinding, codeGenReceiverType, this.receiver.isImplicitThis());
153	if (isStatic){	148	if (isStatic){
154	codeStream.invoke(Opcodes.OPC_invokestatic, codegenBinding, constantPoolDeclaringClass);	149	codeStream.invoke(Opcodes.OPC_invokestatic, codegenBinding, constantPoolDeclaringClass);
155	} else if( (this.receiver.isSuper()) \|\| codegenBinding.isPrivate()){	150	} else if( (this.receiver.isSuper()) \|\| codegenBinding.isPrivate()){
Lines 443-448 Link Here
443	if ((this.binding.tagBits & TagBits.HasMissingType) != 0) {	438	if ((this.binding.tagBits & TagBits.HasMissingType) != 0) {
444	scope.problemReporter().missingTypeInMethod(this, this.binding);	439	scope.problemReporter().missingTypeInMethod(this, this.binding);
445	}	440	}
		441	// compute generic cast if necessary
		442	TypeBinding upperBound = this.actualReceiverType.getReceiverTypeErasure(this.binding.declaringClass);
		443	if (upperBound != null && upperBound != this.actualReceiverType.erasure()) {
		444	this.actualReceiverType = upperBound; // handle indirect inheritance thru variable secondary bound
		445	}
446	final CompilerOptions compilerOptions = scope.compilerOptions();	446	final CompilerOptions compilerOptions = scope.compilerOptions();
447	if (!this.binding.isStatic()) {	447	if (!this.binding.isStatic()) {
448	// the "receiver" must not be a type	448	// the "receiver" must not be a type
Lines 455-467 Link Here
455	}	455	}
456	} else {	456	} else {
457	this.receiver.computeConversion(scope, this.actualReceiverType, this.actualReceiverType);	457	this.receiver.computeConversion(scope, this.actualReceiverType, this.actualReceiverType);
458	// compute generic cast if necessary
459	TypeBinding receiverErasure = this.actualReceiverType.erasure();
460	if (receiverErasure instanceof ReferenceBinding) {
461	if (receiverErasure.findSuperTypeOriginatingFrom(this.binding.declaringClass) == null) {
462	this.receiverGenericCast = this.binding.declaringClass; // handle indirect inheritance thru variable secondary bound
463	}
464	}
465	}	458	}
466	} else {	459	} else {
467	// static message invoked through receiver? legal but unoptimal (optional warning).	460	// static message invoked through receiver? legal but unoptimal (optional warning).
Lines 507-515 Link Here
507	if (this.typeArguments != null && this.binding.original().typeVariables == Binding.NO_TYPE_VARIABLES) {	500	if (this.typeArguments != null && this.binding.original().typeVariables == Binding.NO_TYPE_VARIABLES) {
508	scope.problemReporter().unnecessaryTypeArgumentsForMethodInvocation(this.binding, this.genericTypeArguments, this.typeArguments);	501	scope.problemReporter().unnecessaryTypeArgumentsForMethodInvocation(this.binding, this.genericTypeArguments, this.typeArguments);
509	}	502	}
510	return (this.resolvedType.tagBits & TagBits.HasMissingType) == 0	503	return (this.resolvedType.tagBits & TagBits.HasMissingType) == 0 ? this.resolvedType : null;
511	? this.resolvedType
512	: null;
513	}	504	}
514		505
515	public void setActualReceiverType(ReferenceBinding receiverType) {	506	public void setActualReceiverType(ReferenceBinding receiverType) {

Lines 46336-46342 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java (-37 / +36 lines)
46336	"----------\n");	46336	"----------\n");
46337	}	46337	}
46338	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953	46338	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953
46339	public void _test1381() throws Exception {	46339	public void test1381() throws Exception {
46340	this.runConformTest(	46340	this.runConformTest(
46341	new String[] {	46341	new String[] {
46342	"X.java",	46342	"X.java",
Lines 46361-46390 Link Here
46361	"}\n",	46361	"}\n",
46362	"p/IB.java", // =====================	46362	"p/IB.java", // =====================
46363	"package p;\n" +	46363	"package p;\n" +
46364	"interface IA {\n" +	46364	"interface IA {\n" + // non visible
46365	" void baz();\n" +	46365	" void baz();\n" +
46366	"}\n" +	46366	"}\n" +
46367	"public interface IB extends IA {\n" +	46367	"public interface IB extends IA {\n" +
46368	"}\n",	46368	"}\n",
46369	},	46369	},
46370	"done");	46370	"done");
46371	// check #baz() invocation declaring class is IA	46371	// check #baz() invocation declaring class is IB
46372	String expectedOutput =	46372	String expectedOutput =
46373	" // Method descriptor #21 (LX;)V\n" +	46373	" // Method descriptor #10 ()V\n" +
46374	" // Signature: (LX<TT;>;)V\n" +	46374	" // Stack: 1, Locals: 1\n" +
46375	" // Stack: 1, Locals: 2\n" +	46375	" void foo();\n" +
46376	" void foo(X xt);\n" +	46376	" 0 aload_0 [this]\n" +
46377	" 0 aload_1 [xt]\n" +	46377	" 1 getfield X.t : AA [21]\n" +
46378	" 1 invokevirtual X.get() : AA [23]\n" +	46378	" 4 checkcast p.IB [23]\n" +
46379	" 4 checkcast p.IA [25]\n" +	46379	" 7 invokeinterface p.IB.baz() : void [25] [nargs: 1]\n" +
46380	" 7 invokeinterface p.IA.baz() : void [27] [nargs: 1]\n" +
46381	" 12 return\n" +	46380	" 12 return\n" +
46382	" Line numbers:\n" +	46381	" Line numbers:\n" +
46383	" [pc: 0, line: 5]\n" +	46382	" [pc: 0, line: 4]\n" +
46384	" [pc: 12, line: 6]\n" +	46383	" [pc: 12, line: 5]\n" +
46385	" Local variable table:\n" +	46384	" Local variable table:\n" +
46386	" [pc: 0, pc: 13] local: this index: 0 type: X\n" +	46385	" [pc: 0, pc: 13] local: this index: 0 type: X\n";
46387	" [pc: 0, pc: 13] local: xt index: 1 type: X\n";
46388		46386
46389	File f = new File(OUTPUT_DIR + File.separator + "X.class");	46387	File f = new File(OUTPUT_DIR + File.separator + "X.class");
46390	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);	46388	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
Lines 46399-46405 Link Here
46399	}	46397	}
46400	}	46398	}
46401	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46399	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46402	public void _test1382() throws Exception {	46400	public void test1382() throws Exception {
46403	this.runConformTest(	46401	this.runConformTest(
46404	new String[] {	46402	new String[] {
46405	"X.java",	46403	"X.java",
Lines 46452-46458 Link Here
46452	}	46450	}
46453	}	46451	}
46454	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46452	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46455	public void _test1383() throws Exception {	46453	public void test1383() throws Exception {
46456	this.runConformTest(	46454	this.runConformTest(
46457	new String[] {	46455	new String[] {
46458	"X.java",	46456	"X.java",
Lines 46507-46513 Link Here
46507	}	46505	}
46508	}	46506	}
46509	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46507	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46510	public void _test1384() throws Exception {	46508	public void test1384() throws Exception {
46511	this.runConformTest(	46509	this.runConformTest(
46512	new String[] {	46510	new String[] {
46513	"X.java",	46511	"X.java",
Lines 46561-46567 Link Here
46561	}	46559	}
46562	}	46560	}
46563	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46561	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46564	public void _test1385() throws Exception {	46562	public void test1385() throws Exception {
46565	this.runConformTest(	46563	this.runConformTest(
46566	new String[] {	46564	new String[] {
46567	"X.java",	46565	"X.java",
Lines 46613-46619 Link Here
46613	}	46611	}
46614	}	46612	}
46615	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46613	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46616	public void _test1386() throws Exception {	46614	public void test1386() throws Exception {
46617	this.runConformTest(	46615	this.runConformTest(
46618	new String[] {	46616	new String[] {
46619	"X.java",	46617	"X.java",
Lines 46635-46641 Link Here
46635	"public interface IB extends IA {\n" +	46633	"public interface IB extends IA {\n" +
46636	"}\n",	46634	"}\n",
46637	},	46635	},
46638	"111");	46636	"");
46639	// check #baz() invocation declaring class is not IA	46637	// check #baz() invocation declaring class is not IA
46640	String expectedOutput =	46638	String expectedOutput =
46641	" // Method descriptor #21 (LX;)V\n" +	46639	" // Method descriptor #21 (LX;)V\n" +
Lines 46667-46673 Link Here
46667	}	46665	}
46668	}	46666	}
46669	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46667	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46670	public void _test1387() throws Exception {	46668	public void test1387() throws Exception {
46671	this.runConformTest(	46669	this.runConformTest(
46672	new String[] {	46670	new String[] {
46673	"X.java",	46671	"X.java",
Lines 46698-46718 Link Here
46698	"done");	46696	"done");
46699	// check #baz declaring class is not IA	46697	// check #baz declaring class is not IA
46700	String expectedOutput =	46698	String expectedOutput =
46701	" // Method descriptor #21 (LX;)V\n" +	46699	" // Method descriptor #10 ()V\n" +
46702	" // Signature: (LX<TT;>;)V\n" +	46700	" // Stack: 2, Locals: 1\n" +
46703	" // Stack: 1, Locals: 2\n" +	46701	" void foo();\n" +
46704	" void foo(X xt);\n" +	46702	" 0 getstatic java.lang.System.out : java.io.PrintStream [21]\n" +
46705	" 0 aload_1 [xt]\n" +	46703	" 3 aload_0 [this]\n" +
46706	" 1 invokevirtual X.get() : AA [23]\n" +	46704	" 4 getfield X.t : AA [27]\n" +
46707	" 4 checkcast p.IB [25]\n" +	46705	" 7 checkcast p.IB [29]\n" +
46708	" 7 invokeinterface p.IB.baz() : void [27] [nargs: 1]\n" +	46706	" 10 pop\n" +
46709	" 12 return\n" +	46707	" 11 getstatic p.IB.baz : java.lang.Object [31]\n" +
		46708	" 14 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [35]\n" +
		46709	" 17 return\n" +
46710	" Line numbers:\n" +	46710	" Line numbers:\n" +
46711	" [pc: 0, line: 5]\n" +	46711	" [pc: 0, line: 4]\n" +
46712	" [pc: 12, line: 6]\n" +	46712	" [pc: 17, line: 5]\n" +
46713	" Local variable table:\n" +	46713	" Local variable table:\n" +
46714	" [pc: 0, pc: 13] local: this index: 0 type: X\n" +	46714	" [pc: 0, pc: 18] local: this index: 0 type: X\n";
46715	" [pc: 0, pc: 13] local: xt index: 1 type: X\n";
46716		46715
46717	File f = new File(OUTPUT_DIR + File.separator + "X.class");	46716	File f = new File(OUTPUT_DIR + File.separator + "X.class");
46718	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);	46717	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
Lines 46727-46733 Link Here
46727	}	46726	}
46728	}	46727	}
46729	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46728	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46730	public void _test1388() throws Exception {	46729	public void test1388() throws Exception {
46731	this.runConformTest(	46730	this.runConformTest(
46732	new String[] {	46731	new String[] {
46733	"X.java",	46732	"X.java",
Lines 46787-46793 Link Here
46787	}	46786	}
46788	}	46787	}
46789	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation	46788	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=247953 - variation
46790	public void _test1389() throws Exception {	46789	public void test1389() throws Exception {
46791	this.runConformTest(	46790	this.runConformTest(
46792	new String[] {	46791	new String[] {
46793	"X.java",	46792	"X.java",

Lines 2932-2941 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java (-3 / +2 lines)
2932	* @param codegenBinding	2932	* @param codegenBinding
2933	* @param actualReceiverType	2933	* @param actualReceiverType
2934	* @param isImplicitThisReceiver	2934	* @param isImplicitThisReceiver
2935	* @param hasGenericCast
2936	* @return the receiver type to use in constant pool	2935	* @return the receiver type to use in constant pool
2937	*/	2936	*/
2938	public static TypeBinding getConstantPoolDeclaringClass(Scope currentScope, MethodBinding codegenBinding, TypeBinding actualReceiverType, boolean isImplicitThisReceiver, boolean hasGenericCast) {	2937	public static TypeBinding getConstantPoolDeclaringClass(Scope currentScope, MethodBinding codegenBinding, TypeBinding actualReceiverType, boolean isImplicitThisReceiver) {
2939	TypeBinding constantPoolDeclaringClass = codegenBinding.declaringClass;	2938	TypeBinding constantPoolDeclaringClass = codegenBinding.declaringClass;
2940	// Post 1.4.0 target, array clone() invocations are qualified with array type	2939	// Post 1.4.0 target, array clone() invocations are qualified with array type
2941	// This is handled in array type #clone method binding resolution (see Scope and UpdatedMethodBinding)	2940	// This is handled in array type #clone method binding resolution (see Scope and UpdatedMethodBinding)
Lines 2949-2955 Link Here
2949	// for runtime compatibility on 1.2 VMs : change the declaring class of the binding	2948	// for runtime compatibility on 1.2 VMs : change the declaring class of the binding
2950	// NOTE: from target 1.2 on, method's declaring class is touched if any different from receiver type	2949	// NOTE: from target 1.2 on, method's declaring class is touched if any different from receiver type
2951	// and not from Object or implicit static method call.	2950	// and not from Object or implicit static method call.
2952	if (constantPoolDeclaringClass != actualReceiverType.erasure() && !hasGenericCast && !actualReceiverType.isArrayType()) {	2951	if (constantPoolDeclaringClass != actualReceiverType.erasure() && !actualReceiverType.isArrayType()) {
2953	CompilerOptions options = currentScope.compilerOptions();	2952	CompilerOptions options = currentScope.compilerOptions();
2954	if ((options.targetJDK >= ClassFileConstants.JDK1_2	2953	if ((options.targetJDK >= ClassFileConstants.JDK1_2
2955	&& (options.complianceLevel >= ClassFileConstants.JDK1_4 \|\| !(isImplicitThisReceiver && codegenBinding.isStatic()))	2954	&& (options.complianceLevel >= ClassFileConstants.JDK1_4 \|\| !(isImplicitThisReceiver && codegenBinding.isStatic()))

Lines 51-57 Link Here

(-)eval/org/eclipse/jdt/internal/eval/CodeSnippetMessageSend.java (-6 / +16 lines)
51	public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {	51	public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {
52	int pc = codeStream.position;	52	int pc = codeStream.position;
53	MethodBinding codegenBinding = this.binding.original();	53	MethodBinding codegenBinding = this.binding.original();
54	if (codegenBinding.canBeSeenBy(this.actualReceiverType, this, currentScope)) {	54	TypeBinding codeGenReceiverType = this.actualReceiverType;
		55	if (codegenBinding.canBeSeenBy(codeGenReceiverType, this, currentScope)) {
55	// generate receiver/enclosing instance access	56	// generate receiver/enclosing instance access
56	boolean isStatic = codegenBinding.isStatic();	57	boolean isStatic = codegenBinding.isStatic();
57	// outer access ?	58	// outer access ?
Lines 67-80 Link Here
67	}	68	}
68	} else {	69	} else {
69	this.receiver.generateCode(currentScope, codeStream, !isStatic);	70	this.receiver.generateCode(currentScope, codeStream, !isStatic);
70	if (this.receiverGenericCast != null)	71	// compute generic cast if necessary
71	codeStream.checkcast(this.receiverGenericCast);	72	TypeBinding upperBound = ((ReferenceBinding) codeGenReceiverType).getReceiverTypeErasure(this.binding.declaringClass);
		73	if (upperBound != null && upperBound != codeGenReceiverType.erasure()) {
		74	codeStream.checkcast(upperBound); // handle indirect inheritance thru variable secondary bound
		75	codeGenReceiverType = upperBound;
		76	}
72	codeStream.recordPositionsFrom(pc, this.sourceStart);	77	codeStream.recordPositionsFrom(pc, this.sourceStart);
73	}	78	}
74	// generate arguments	79	// generate arguments
75	generateArguments(this.binding, this.arguments, currentScope, codeStream);	80	generateArguments(this.binding, this.arguments, currentScope, codeStream);
76	// actual message invocation	81	// actual message invocation
77	TypeBinding constantPoolDeclaringClass = CodeStream.getConstantPoolDeclaringClass(currentScope, codegenBinding, this.actualReceiverType, this.receiver.isImplicitThis(), this.receiverGenericCast != null);	82	TypeBinding constantPoolDeclaringClass = CodeStream.getConstantPoolDeclaringClass(currentScope, codegenBinding, codeGenReceiverType, this.receiver.isImplicitThis());
78	if (isStatic) {	83	if (isStatic) {
79	codeStream.invoke(Opcodes.OPC_invokestatic, codegenBinding, constantPoolDeclaringClass);	84	codeStream.invoke(Opcodes.OPC_invokestatic, codegenBinding, constantPoolDeclaringClass);
80	} else if( (this.receiver.isSuper()) \|\| codegenBinding.isPrivate()){	85	} else if( (this.receiver.isSuper()) \|\| codegenBinding.isPrivate()){
Lines 96-103 Link Here
96	currentScope.problemReporter().needImplementation(this);	101	currentScope.problemReporter().needImplementation(this);
97	} else {	102	} else {
98	this.receiver.generateCode(currentScope, codeStream, !isStatic);	103	this.receiver.generateCode(currentScope, codeStream, !isStatic);
99	if (this.receiverGenericCast != null)	104	// compute generic cast if necessary
100	codeStream.checkcast(this.receiverGenericCast);	105	TypeBinding upperBound = codeGenReceiverType.getReceiverTypeErasure(this.binding.declaringClass);
		106	if (upperBound != null && upperBound != codeGenReceiverType.erasure()) {
		107	codeStream.checkcast(upperBound); // handle indirect inheritance thru variable secondary bound
		108	codeGenReceiverType = upperBound;
		109	}
		110
101	codeStream.recordPositionsFrom(pc, this.sourceStart);	111	codeStream.recordPositionsFrom(pc, this.sourceStart);
102	}	112	}
103	if (isStatic) {	113	if (isStatic) {

Lines 358-363 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java (+39 lines)
358	return signature();	358	return signature();
359	}	359	}
360		360
		361	/**
		362	* Return erasure for the receiver type which is compatible with a given declaring class.
		363	* This is different from standard erasure when dealing with types with multiple upper bounds where
		364	* the first compatible bound is to be considered.
		365	* NOTE: the declaringClass is already know to be compatible with the receiver
		366	* @param declaringClass to look for
		367	* @return the first compatible bound, or null if none found
		368	*/
		369	public TypeBinding getReceiverTypeErasure(TypeBinding declaringClass) {
		370	switch(kind()) {
		371	case Binding.TYPE_PARAMETER :
		372	TypeVariableBinding variable = (TypeVariableBinding) this;
		373	if (variable.superclass != null && variable.superclass.findSuperTypeOriginatingFrom(declaringClass) != null) {
		374	return variable.superclass.getReceiverTypeErasure(declaringClass);
		375	}
		376	for (int i = 0, otherLength = variable.superInterfaces.length; i < otherLength; i++) {
		377	ReferenceBinding superInterface = variable.superInterfaces[i];
		378	if (superInterface.findSuperTypeOriginatingFrom(declaringClass) != null) {
		379	return superInterface.getReceiverTypeErasure(declaringClass);
		380	}
		381	}
		382	return null; // cannot happen if declaringClass is compatible
		383	case Binding.INTERSECTION_TYPE :
		384	WildcardBinding intersection = (WildcardBinding) this;
		385	if (intersection.superclass != null && intersection.superclass.findSuperTypeOriginatingFrom(declaringClass) != null) {
		386	return intersection.superclass.getReceiverTypeErasure(declaringClass);
		387	}
		388	for (int i = 0, otherLength = intersection.superInterfaces.length; i < otherLength; i++) {
		389	ReferenceBinding superInterface = intersection.superInterfaces[i];
		390	if (superInterface.findSuperTypeOriginatingFrom(declaringClass) != null) {
		391	return superInterface.getReceiverTypeErasure(declaringClass);
		392	}
		393	}
		394	return null; // cannot happen if declaringClass is compatible
		395	default :
		396	return erasure();
		397	}
		398	}
		399
361	public abstract PackageBinding getPackage();	400	public abstract PackageBinding getPackage();
362		401
363	void initializeForStaticImports() {	402	void initializeForStaticImports() {