Attachment 201868 Details for Bug 355313 – Test & fix

[patch] Test & fix

Bug_355313.patch (text/plain), 8.76 KB, created by Stephan Herrmann

on 2011-08-21 10:53:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2011-08-21 10:53:10 EDT

Size: 8.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/objectteams/otdt/internal/core/compiler/control/Dependencies.java
>===================================================================
>--- compiler/org/eclipse/objectteams/otdt/internal/core/compiler/control/Dependencies.java	(revision 1867)
>+++ compiler/org/eclipse/objectteams/otdt/internal/core/compiler/control/Dependencies.java	(working copy)
>@@ -29,6 +29,7 @@
> import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
> import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
> import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
>+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
> import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
> import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding;
> import org.eclipse.jdt.internal.compiler.lookup.Binding;
>@@ -1653,7 +1654,7 @@
> 			resolver.resolve(false/*doCallout*/); // callins last so all methods incl. callout are already in place
> 		
> 		if (subRoleDecl != null)
>-			checkMissingMethods(subRole, subRoleDecl.scope);
>+			checkMissingMethods(subRole, subRoleDecl);
> 
>         clazz.setState(STATE_METHODS_CREATED);
>         return true;
>@@ -1777,11 +1778,12 @@
> 	}
> 
> 	// detail of STATE_METHODS_CREATED (can only check this after callouts have been transformed):
>-	private static void checkMissingMethods(ReferenceBinding roleBinding, ClassScope scope) {
>+	private static void checkMissingMethods(ReferenceBinding roleBinding, TypeDeclaration roleDecl) {
> 		if (roleBinding.isClass() && ((roleBinding.tagBits & TagBits.AnnotationInstantiation) != 0)) {
> 			InstantiationPolicy instantiationPolicy = RoleModel.getInstantiationPolicy(roleBinding);
> 			if (!instantiationPolicy.isAlways())
> 				return;
>+			ClassScope scope = roleDecl.scope;
> 			boolean missing = false;
> 			MethodBinding equals = roleBinding.getExactMethod(TypeConstants.EQUALS, 
> 															  new TypeBinding[] {scope.getJavaLangObject()}, scope.compilationUnitScope());
>@@ -1797,6 +1799,17 @@
> 				scope.problemReporter().missingEqualsHashCodeWithInstantation(scope.referenceContext, instantiationPolicy);
> 			}
> 		}
>+		// copied abstract methods are not yet checked for callout inference (which is normally triggered from checkMethods()) 
>+		if (roleBinding.isClass() && roleDecl.methods != null) {
>+			for (AbstractMethodDeclaration method : roleDecl.methods) {
>+				if (((method.modifiers & ClassFileConstants.AccAbstract) != 0) && method.isCopied) {
>+		    		// inheriting abstract method in non-abstract role may require callout inference:
>+					CalloutImplementor coi = new CalloutImplementor(roleDecl.getRoleModel());
>+					if (coi.generateInferredCallout(roleDecl, method.binding))
>+						roleDecl.scope.problemReporter().addingInferredCalloutForInherited(roleDecl, method.binding);
>+				}
>+			}
>+		}
> 	}
> 
> 	/* **** STATE_TYPES_ADJUSTED (OT/J) ****
>#P org.eclipse.objectteams.otdt.tests
>Index: otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java
>===================================================================
>--- otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java	(revision 1933)
>+++ otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java	(working copy)
>@@ -436,7 +436,7 @@
>  			    "\n" +
>  			    "public class T311acb8Main {\n" +
>  			    "    public static void main(String[] args) {\n" +
>- 			    "        Team311acb2 t = new Team311acb2();\n" +
>+ 			    "        Team311acb8_2 t = new Team311acb8_2();\n" +
>  			    "        T311acb8_1  o = new T311acb8_1();\n" +
>  			    "\n" +
>  			    "        System.out.print(t.getValue(o));\n" +
>@@ -454,9 +454,9 @@
>  			    "    }\n" +
>  			    "}\n" +
>  			    "    \n",
>-	    "Team311acb2.java",
>+	    "Team311acb8_2.java",
>  			    "\n" +
>- 			    "public team class Team311acb2 extends Team311acb8 {\n" +
>+ 			    "public team class Team311acb8_2 extends Team311acb8_1 {\n" +
>  			    "    @Override\n" +
>  			    "    public class Role311acb8 playedBy T311acb8_1 {\n" +
>  			    "        getValue -> getValue;\n" +
>@@ -466,9 +466,9 @@
>  			    "        return obj.getValueInternal();\n" +
>  			    "    }\n" +
>  			    "}\n",
>- 		"Team311acb8.java",
>+ 		"Team311acb8_1.java",
>  			    "\n" +
>- 			    "public abstract team class Team311acb8 {\n" +
>+ 			    "public abstract team class Team311acb8_1 {\n" +
>  			    "\n" +
>  			    "    public abstract class Role311acb8 {\n" +
>  			    "        public abstract String getValue();\n" +
>@@ -478,11 +478,65 @@
>  			    "}\n",
>              },
>             "----------\n" + 
>-			"1. ERROR in Team311acb2.java (at line 1)\n" + 
>+			"1. ERROR in Team311acb8_2.java (at line 4)\n" + 
>+			"	public class Role311acb8 playedBy T311acb8_1 {\n" + 
>+			"	             ^^^^^^^^^^^\n" + 
>+			"Inherited abstract method getValueInternal() is implicitly bound as an inferred callout (OTJLD 3.1(j)).\n" + 
>+			"----------\n");
>+     }
>+    // Bug 355314 - abstract method error may be masked by callout binding
>+    public void test311_abstractCalloutBinding8a() {
>+        
>+        runNegativeTest(
>+             new String[] {
>+ 		"T311acb8aMain.java",
>+ 			    "\n" +
>+ 			    "public class T311acb8aMain {\n" +
>+ 			    "    public static void main(String[] args) {\n" +
>+ 			    "        Team311acb8a_2 t = new Team311acb8a_2();\n" +
>+ 			    "        T311acb8a_1  o = new T311acb8a_1();\n" +
>+ 			    "\n" +
>+ 			    "        System.out.print(t.getValue(o));\n" +
>+ 			    "    }\n" +
>+ 			    "}\n" +
>+ 			    "    \n",
>+ 		"T311acb8a_1.java",
>+ 			    "\n" +
>+ 			    "public class T311acb8a_1 {\n" +
>+ 			    "    public String getValue() {\n" +
>+ 			    "        return \"OK\";\n" +
>+ 			    "    }\n" +
>+ 			    "}\n" +
>+ 			    "    \n",
>+	    "Team311acb8a_2.java",
>+ 			    "\n" +
>+ 			    "public team class Team311acb8a_2 extends Team311acb8a_1 {\n" +
>+ 			    "    @Override\n" +
>+ 			    "    public class Role311acb8a playedBy T311acb8a_1 {\n" +
>+ 			    "        getValue -> getValue;\n" +
>+ 			    "    }\n" +
>+ 			    "\n" +
>+ 			    "    public String getValue(T311acb8a_1 as Role311acb8a obj) {\n" +
>+ 			    "        return obj.getValueInternal();\n" +
>+ 			    "    }\n" +
>+ 			    "}\n",
>+ 		"Team311acb8a_1.java",
>+ 			    "\n" +
>+ 			    "public abstract team class Team311acb8a_1 {\n" +
>+ 			    "\n" +
>+ 			    "    public abstract class Role311acb8a {\n" +
>+ 			    "        public abstract String getValue();\n" +
>+ 			    "        public abstract String getValueInternal();\n" +
>+ 			    "    }\n" +
>+ 			    "\n" +
>+ 			    "}\n",
>+             },
>+            "----------\n" + 
>+			"1. ERROR in Team311acb8a_2.java (at line 1)\n" + 
> 			"	\n" + 
>-			"public team class Team311acb2 extends Team311acb8 {\n" + 
>+			"public team class Team311acb8a_2 extends Team311acb8a_1 {\n" + 
> 			"	^\n" + 
>-			"The abstract method getValueInternal in type Role311acb8 can only be defined by an abstract class\n" + 
>+			"The abstract method getValueInternal in type Role311acb8a can only be defined by an abstract class\n" + 
> 			"----------\n");
>      }
> 
>@@ -2820,6 +2874,53 @@
>             null/*no custom requestor*/);
>     }
> 
>+    // Bug 355313 - inferred callout not working for implicitly inherited method
>+    public void test3117_inferredCallout12() {
>+       Map customOptions = getCompilerOptions();
>+       customOptions.put(CompilerOptions.OPTION_ReportInferredCallout, CompilerOptions.WARNING);
>+       
>+       runConformTest(
>+            new String[] {
>+		"Team3117ic11_2.java",
>+			    "\n" +
>+			    "public team class Team3117ic11_2 extends Team3117ic11_1 {\n" +
>+			    "    @Override\n" +
>+			    "    @SuppressWarnings(\"inferredcallout\")\n" +
>+			    "    protected class R playedBy T3117ic11 {\n" +
>+			    "    }\n" +
>+			    "    Team3117ic11_2() {\n" +
>+			    "        new R(new T3117ic11()).test();\n" +
>+			    "    }\n" +
>+			    "    public static void main(String[] args) {\n" +
>+			    "        new Team3117ic11_2();\n" +
>+			    "    }\n" +
>+			    "}\n" +
>+			    "    \n",
>+		"Team3117ic11_1.java",
>+			    "\n" +
>+			    "public abstract team class Team3117ic11_1 {\n" +
>+			    "    protected abstract class R {\n" +
>+			    "        abstract protected void test();\n" +
>+			    "    }\n" +
>+			    "}\n" +
>+			    "    \n",
>+		"T3117ic11.java",
>+			    "\n" +
>+			    "public class T3117ic11 {\n" +
>+			    "    public void test() {\n" +
>+			    "        System.out.print(\"OK\");\n" +
>+			    "    }\n" +
>+			    "}\n" +
>+			    "    \n"
>+            },
>+            "OK",
>+            null/*classLibraries*/,
>+            true/*shouldFlushOutputDirectory*/,
>+            null/*vmArguments*/,
>+            customOptions,
>+            null/*no custom requestor*/);
>+    }
>+
>     // a short callout binding lacks a rhs
>     // 3.1.18-otjld-incomplete-callout-binding-1
>     public void test3118_incompleteCalloutBinding1() {

Actions: View | Diff

Attachments on bug 355313: 201868