stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8042785: javac, bridge methods are not getting the flags from the original method

Browse Source 
Reviewed-by: jjg, jlahoda
This commit is contained in:
Vicente Romero 2014-05-30 18:21:05 +01:00
parent 490b1acb50
commit 8447e4cf46
3 changed files with 84 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -296,8 +296,8 @@ public class Flags {
ModifierFlags = ((long)StandardFlags & ~INTERFACE) | DEFAULT,
InterfaceMethodMask = ABSTRACT | STATIC | PUBLIC | STRICTFP | DEFAULT,
AnnotationTypeElementMask = ABSTRACT | PUBLIC,
LocalVarFlags = FINAL | PARAMETER;
LocalVarFlags = FINAL | PARAMETER,
BridgeMethodMask = AccessFlags | FINAL | STRICTFP;
public static Set<Modifier> asModifierSet(long flags) {
Set<Modifier> modifiers = modifierSets.get(flags);

4
langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
View File

@ -253,7 +253,7 @@ public class TransTypes extends TreeTranslator {
// Create a bridge method symbol and a bridge definition without a body.
Type bridgeType = meth.erasure(types);
long flags = impl.flags() & AccessFlags | SYNTHETIC | BRIDGE |
long flags = impl.flags() & BridgeMethodMask | SYNTHETIC | BRIDGE |
(origin.isInterface() ? DEFAULT : 0);
if (hypothetical) flags |= HYPOTHETICAL;
MethodSymbol bridge = new MethodSymbol(flags,
@ -931,7 +931,7 @@ public class TransTypes extends TreeTranslator {
ClassSymbol c,
ListBuffer<JCTree> bridges) {
Type implErasure = impl.erasure(types);
long flags = (impl.flags() & AccessFlags) | SYNTHETIC | BRIDGE | OVERRIDE_BRIDGE;
long flags = impl.flags() & BridgeMethodMask | SYNTHETIC | BRIDGE | OVERRIDE_BRIDGE;
member = new MethodSymbol(flags, member.name, member.type, c);
JCMethodDecl md = make.MethodDef(member, null);
JCExpression receiver = make.Super(types.supertype(c.type).tsym.erasure(types), c);

79
langtools/test/tools/javac/T8042785/FlagsNotCopiedToBridgeMethodTest.java Normal file
View File

@ -0,0 +1,79 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8042785
* @summary javac, bridge methods are not getting the flags from the original method
* @run main FlagsNotCopiedToBridgeMethodTest
*/
import java.io.BufferedInputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import com.sun.tools.classfile.AccessFlags;
import com.sun.tools.classfile.ClassFile;
import com.sun.tools.classfile.Method;
import com.sun.tools.javac.util.Assert;
public class FlagsNotCopiedToBridgeMethodTest {
public static void main(String[] args) throws Exception {
new FlagsNotCopiedToBridgeMethodTest().run();
}
void run() throws Exception {
checkClassFile(Paths.get(System.getProperty("test.classes"),
this.getClass().getSimpleName() + "$CovariantReturnType.class"));
checkClassFile(Paths.get(System.getProperty("test.classes"),
this.getClass().getSimpleName() +
"$CovariantReturnType$VisibilityChange.class"));
}
void checkClassFile(final Path cfilePath) throws Exception {
ClassFile classFile = ClassFile.read(
new BufferedInputStream(Files.newInputStream(cfilePath)));
for (Method method : classFile.methods) {
if (method.access_flags.is(AccessFlags.ACC_BRIDGE)) {
Assert.check(method.access_flags.is(AccessFlags.ACC_FINAL | AccessFlags.ACC_STRICT),
"bridge method has incorrect flags");
}
}
}
abstract class T<A,B> {
B m(A a){ return null; }
}
class CovariantReturnType extends T<Integer, Integer> {
strictfp final Integer m(Integer i) {
return i;
}
public class VisibilityChange extends CovariantReturnType {}
}
}