Attachment 241721 Details for Bug 427745 – Patch to carry annotations to bridge methods

[patch] Patch to carry annotations to bridge methods

422745_eclipse.jdt.coreandtests.patch (text/plain), 2.95 KB, created by Sasikanth Bharadwaj

on 2014-04-08 07:41:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sasikanth Bharadwaj

Created: 2014-04-08 07:41:01 EDT

Size: 2.95 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
>index 3bdaf56..fcdbd8b 100644
>--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
>+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2013 IBM Corporation and others.
>+ * Copyright (c) 2000, 2014 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -11627,7 +11627,7 @@
> 			"\n"+ 
> 			"}\n"
> 		},
>-		this.complianceLevel <= ClassFileConstants.JDK1_5 ? "Annotation was found" : "Annotation was not found");
>+		"Annotation was found");
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=288658, make sure a bridge method
> // is generated when a public method is inherited from a non-public class into a
>@@ -11665,7 +11665,7 @@
> 			"\n"+ 
> 			"}\n"
> 		},
>-		this.complianceLevel <= ClassFileConstants.JDK1_5 ? "Annotation was found" : "Annotation was not found");
>+		"Annotation was found");
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=322001
> public void test209() {
>@@ -13712,7 +13712,7 @@
> 			"\n"+ 
> 			"}\n"
> 		},
>-		this.complianceLevel <= ClassFileConstants.JDK1_5 ? "Annotation was found" : "Annotation was not found");
>+		"Annotation was found");
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=288658, make sure a bridge method
> // is generated when a public method is inherited from a non-public class into a
>@@ -13751,7 +13751,7 @@
> 			"\n"+ 
> 			"}\n"
> 		},
>-		this.complianceLevel <= ClassFileConstants.JDK1_5 ? "Annotation was found" : "Annotation was not found");
>+		"Annotation was found");
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=354229
> public void test354229() {
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
>index 10dd27d..9b4e143 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
>@@ -3299,6 +3299,9 @@
> 		}
> 		if (this.targetJDK >= ClassFileConstants.JDK1_4) {
> 			AbstractMethodDeclaration methodDeclaration = methodBinding.sourceMethod();
>+			if(methodBinding instanceof SyntheticMethodBinding && methodBinding.isBridge()) {
>+				methodDeclaration = ((SyntheticMethodBinding)methodBinding).targetMethod.sourceMethod();
>+			}
> 			if (methodDeclaration != null) {
> 				Annotation[] annotations = methodDeclaration.annotations;
> 				if (annotations != null) {

Actions: View | Diff

Attachments on bug 427745: 241709 | 241710 | 241721