JDK-8160928: javac incorrectly copies over interior type annotations to bridge method
Vicente Romero
vicente.romero at oracle.com
Thu Aug 30 14:18:38 UTC 2018
On 08/30/2018 09:47 AM, Maurizio Cimadamore wrote:
>
> Hi Vicente,
> Is Toolbox available in 8u-dev ? I assume that is why the workaround
> has been put in place?
>
yep, I just did a fresh clone, it is at: test/tools/javac/lib/ToolBox.java
>
> Maurizio
>
Vicente
>
> On 30/08/18 14:36, Vicente Romero wrote:
>> why not using ToolBox in the test? We introduced it with the idea of
>> using it for these cases
>>
>> Thanks,
>> Vicente
>>
>> On 08/29/2018 06:33 AM, Evgeny Mandrikov wrote:
>>> # HG changeset patch
>>> # User Evgeny Mandrikov<mandrikov at gmail.com>
>>> # Date 1535527073 -7200
>>> # Wed Aug 29 09:17:53 2018 +0200
>>> # Node ID 6dbec1ff0ffcc5a076c08855bb6c5071bab627ee
>>> # Parent 7031ed34a60400768d5136df03cbf8f05e6d9a6b
>>> 8160928: javac incorrectly copies over interior type annotations to bridge method
>>>
>>> diff -r 7031ed34a604 -r 6dbec1ff0ffc src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
>>> --- a/src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java Tue Jul 24 09:52:12 2018 -0700
>>> +++ b/src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java Wed Aug 29 09:17:53 2018 +0200
>>> @@ -31,10 +31,13 @@
>>>
>>> import com.sun.tools.javac.comp.Annotate;
>>> import com.sun.tools.javac.comp.AttrContext;
>>> +import com.sun.tools.javac.code.Attribute.TypeCompound;
>>> +import com.sun.tools.javac.code.Kinds;
>>> import com.sun.tools.javac.comp.Env;
>>> import com.sun.tools.javac.util.*;
>>> import com.sun.tools.javac.util.Assert;
>>> import com.sun.tools.javac.util.List;
>>> +import com.sun.tools.javac.util.ListBuffer;
>>> import com.sun.tools.javac.util.Log;
>>> import com.sun.tools.javac.util.Pair;
>>> import static com.sun.tools.javac.code.Kinds.PCK;
>>> @@ -152,9 +155,22 @@
>>> throw new NullPointerException();
>>> }
>>> setDeclarationAttributes(other.getDeclarationAttributes());
>>> - setTypeAttributes(other.getTypeAttributes());
>>> - setInitTypeAttributes(other.getInitTypeAttributes());
>>> - setClassInitTypeAttributes(other.getClassInitTypeAttributes());
>>> + if ((sym.flags() & Flags.BRIDGE) != 0) {
>>> + Assert.check(other.sym.kind == Kinds.MTH);
>>> + ListBuffer<TypeCompound> typeAttributes = new ListBuffer<>();
>>> + for (TypeCompound tc : other.getTypeAttributes()) {
>>> + // Carry over only contractual type annotations: i.e nothing interior to method body.
>>> + if (!tc.position.type.isLocal())
>>> + typeAttributes.append(tc);
>>> + }
>>> + setTypeAttributes(typeAttributes.toList());
>>> + } else {
>>> + setTypeAttributes(other.getTypeAttributes());
>>> + }
>>> + if (sym.kind == Kinds.TYP) {
>>> + setInitTypeAttributes(other.getInitTypeAttributes());
>>> + setClassInitTypeAttributes(other.getClassInitTypeAttributes());
>>> + }
>>> }
>>>
>>> public void setDeclarationAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.Compound> ctx) {
>>> diff -r 7031ed34a604 -r 6dbec1ff0ffc test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java
>>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
>>> +++ b/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java Wed Aug 29 09:17:53 2018 +0200
>>> @@ -0,0 +1,102 @@
>>> +/*
>>> + * Copyright (c) 2016, 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 visitwww.oracle.com if you need additional information or have any
>>> + * questions.
>>> + */
>>> +
>>> +/*
>>> + * @test
>>> + * @bug 8160928
>>> + * @summary javac incorrectly copies over interior type annotations to bridge method
>>> + * @run compile -g BridgeShouldHaveNoInteriorAnnotationsTest.java
>>> + * @run main BridgeShouldHaveNoInteriorAnnotationsTest
>>> + */
>>> +
>>> +import java.lang.annotation.ElementType;
>>> +import java.lang.annotation.Target;
>>> +import java.io.*;
>>> +
>>> +class Pair_8160928<T1, T2> {
>>> +}
>>> +
>>> +public class BridgeShouldHaveNoInteriorAnnotationsTest implements java.util.Iterator<Pair_8160928<Object, Object>> {
>>> +
>>> + @Override
>>> + public boolean hasNext() {
>>> + throw new RuntimeException();
>>> + }
>>> +
>>> + @Override
>>> + public Pair_8160928<@NonNull Object, Object> next() {
>>> + Comparable<@NonNull Object> cble1 = (Comparable<@NonNull Object>) null;
>>> + return null;
>>> + }
>>> +
>>> + @Override
>>> + public void remove() {
>>> + throw new RuntimeException();
>>> + }
>>> +
>>> + @Target(ElementType.TYPE_USE)
>>> + public @interface NonNull {
>>> + }
>>> +
>>> + static class OutputExpectedOnceHolder {
>>> + public String[] outputs = {
>>> + "0: #63(): CAST, offset=0, type_index=0, location=[TYPE_ARGUMENT(0)]",
>>> + "1: #63(): LOCAL_VARIABLE, {start_pc=5, length=2, index=1}, location=[TYPE_ARGUMENT(0)]",
>>> + };
>>> + }
>>> +
>>> + static class OutputExpectedTwiceHolder {
>>> + public String[] outputs = {
>>> + "0: #63(): METHOD_RETURN, location=[TYPE_ARGUMENT(0)]",
>>> + };
>>> + }
>>> +
>>> + public static void main(String[] args) throws Exception {
>>> + File testClasses = new File(System.getProperty("test.classes"));
>>> + File testClass = new File(testClasses, "BridgeShouldHaveNoInteriorAnnotationsTest.class");
>>> +
>>> + StringWriter sw = new StringWriter();
>>> + PrintWriter pw = new PrintWriter(sw);
>>> + int rc = com.sun.tools.javap.Main.run(new String[]{"-v", "-p", testClass.getPath()}, pw);
>>> + pw.close();
>>> + if (rc != 0) {
>>> + throw new Error("javap failed unexpectedly");
>>> + }
>>> + String javapOut = sw.toString();
>>> +
>>> + OutputExpectedOnceHolder holder = new OutputExpectedOnceHolder();
>>> + for (String s : holder.outputs) {
>>> + String newOutput = javapOut.replace(s, "");
>>> + if (((javapOut.length() - newOutput.length()) / s.length()) != 1)
>>> + throw new AssertionError("Interior annotations carried over to bridge ?");
>>> + }
>>> +
>>> + OutputExpectedTwiceHolder holder2 = new OutputExpectedTwiceHolder();
>>> + for (String s : holder2.outputs) {
>>> + String newOutput = javapOut.replace(s, "");
>>> + if (((javapOut.length() - newOutput.length()) / s.length()) != 2)
>>> + throw new AssertionError("Exterior annotations not properly carried over to bridge");
>>> + }
>>> + }
>>> +
>>> +}
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/compiler-dev/attachments/20180830/ad9ae6fe/attachment.html>
More information about the compiler-dev
mailing list