Additional fix re Bug 321651 - [compiler][otre] array-translations (lifting/lowering) in nested team not properly translated

-> fix regression in test1129_nestedCallin2().

1 files changed, 18 insertions, 3 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CallinImplementor.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CallinImplementor.java
index 2d63d79cb..350a44298 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CallinImplementor.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/CallinImplementor.java
@@ -605,14 +605,29 @@ public class CallinImplementor extends MethodMappingImplementor
 			//     return _OT$result;
 			//   $endif
 
-			Statement roleMessageSendStatement = roleMessageSend;
+			Expression roleMessageSendExpression = roleMessageSend;
+			
+			if (roleMethodBinding.returnType.isArrayType()) {
+				// if return from role method requires array-lowering, we must determine how to access the team (receiver of lowering-method):
+				TypeBinding returnLeaf = roleMethodBinding.returnType.leafComponentType();
+				findEnclosingTeam: 
+				if (returnLeaf.isRole()) {
+					ReferenceBinding returnEnclosing = returnLeaf.enclosingType(); // the team type containing the returned role
+					ReferenceBinding currentType = roleModel.getBinding();
+					while ((currentType = currentType.enclosingType()) != null)	   // traverse all types accessible as this$<n>
+						if (currentType == returnEnclosing)
+							break findEnclosingTeam; // successful
+					// not found, which means this$<n> is not a suitable receiver for array lowering, must use 'receiver' instead:
+					roleMessageSendExpression = new PotentialLowerExpression(roleMessageSend, wrapperReturnType, receiver);
+				}
+			}
 			callinBindingDeclaration.resultVar = gen.localVariable(
 											IOTConstants.RESULT, wrapperReturnType, null);
 			callinBindingDeclaration.resultVar.type.setBaseclassDecapsulation(DecapsulationState.REPORTED);
 			statements.add(callinBindingDeclaration.resultVar);
-			roleMessageSendStatement = gen.assignment(
+			Statement roleMessageSendStatement = gen.assignment(
 											gen.singleNameReference(IOTConstants.RESULT),
-											new PotentialLowerExpression(roleMessageSend, wrapperReturnType, receiver));
+											roleMessageSendExpression);
 			TryStatement tryFinally = gen.tryFinally(
 								new Statement[] {roleMessageSendStatement},
 								new Statement[] {resetFlag});