2013-03-15 09:02:26 +00:00
|
|
|
/*
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
|
2013-03-15 09:02:26 +00:00
|
|
|
* 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
|
2013-04-10 11:31:02 +00:00
|
|
|
* @bug 5053846 8011432
|
2013-03-15 09:02:26 +00:00
|
|
|
* @summary javac: MethodRef entries are duplicated in the constant pool
|
2013-04-10 11:31:02 +00:00
|
|
|
* @summary javac, compiler regression iterable + captured type
|
2015-05-21 18:41:04 +00:00
|
|
|
* @modules jdk.compiler
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
* jdk.jdeps/com.sun.tools.javap
|
2013-03-15 09:02:26 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
import java.io.PrintWriter;
|
|
|
|
import java.io.StringWriter;
|
|
|
|
import java.nio.file.Paths;
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
public class MethodRefDupInConstantPoolTest {
|
|
|
|
|
|
|
|
private static final String methodToLookFor =
|
|
|
|
"java/util/Vector.iterator:()Ljava/util/Iterator;";
|
|
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
|
new MethodRefDupInConstantPoolTest().run();
|
|
|
|
}
|
|
|
|
|
|
|
|
void run() {
|
|
|
|
check("-v", Paths.get(System.getProperty("test.classes"),
|
2013-04-10 11:31:02 +00:00
|
|
|
this.getClass().getSimpleName() + "$TestHelper1.class").toString());
|
2013-03-15 09:02:26 +00:00
|
|
|
check("-v", Paths.get(System.getProperty("test.classes"),
|
2013-04-10 11:31:02 +00:00
|
|
|
this.getClass().getSimpleName() + "$TestHelper2.class").toString());
|
|
|
|
check("-v", Paths.get(System.getProperty("test.classes"),
|
|
|
|
this.getClass().getSimpleName() + "$TestHelper3.class").toString());
|
|
|
|
check("-v", Paths.get(System.getProperty("test.classes"),
|
|
|
|
this.getClass().getSimpleName() + "$TestHelper4.class").toString());
|
2013-03-15 09:02:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void check(String... params) {
|
|
|
|
StringWriter s;
|
|
|
|
String out;
|
|
|
|
try (PrintWriter pw = new PrintWriter(s = new StringWriter())) {
|
|
|
|
com.sun.tools.javap.Main.run(params, pw);
|
|
|
|
out = s.toString();
|
|
|
|
}
|
|
|
|
String constantPool = getConstantPool(out);
|
|
|
|
if (constantPool.indexOf(methodToLookFor) !=
|
|
|
|
constantPool.lastIndexOf(methodToLookFor)) {
|
|
|
|
throw new AssertionError("There is more than one entry for the method seek " +
|
|
|
|
methodToLookFor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
String getConstantPool(String out) {
|
|
|
|
int start = out.indexOf("Constant pool:");
|
|
|
|
int end = out.indexOf("{");
|
|
|
|
return out.substring(start, end);
|
|
|
|
}
|
|
|
|
|
2013-04-10 11:31:02 +00:00
|
|
|
class TestHelper1 {
|
|
|
|
void m() {
|
|
|
|
Vector v = new Vector();
|
|
|
|
Iterator iter = v.iterator();
|
|
|
|
while (iter.hasNext()) {
|
|
|
|
Object o = iter.next();
|
|
|
|
Object o2 = o;
|
|
|
|
}
|
|
|
|
for (Object o: v) {
|
|
|
|
Object o2 = o;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class TestHelper2<X extends Number & Iterable<String>> {
|
|
|
|
void test(X x) {
|
|
|
|
for (String s : x) { }
|
2013-03-15 09:02:26 +00:00
|
|
|
}
|
2013-04-10 11:31:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
interface Data extends Iterable<String> {}
|
|
|
|
|
|
|
|
class TestHelper3<X extends Number & Iterable<? extends Data>> {
|
|
|
|
void test(X x) {
|
|
|
|
for (Data s : x) { }
|
2013-03-15 09:02:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-10 11:31:02 +00:00
|
|
|
class TestHelper4 {
|
|
|
|
void test(Iterable<? extends Data> t) {
|
|
|
|
for(Object a: t.iterator().next());
|
|
|
|
}
|
2013-03-15 09:02:26 +00:00
|
|
|
}
|
|
|
|
}
|