Thu, 12 Jan 2012 15:28:34 +0000
7123100: javac fails with java.lang.StackOverflowError
Summary: Inference of under-constrained type-variables creates erroneous recursive wildcard types
Reviewed-by: jjg
duke@1 | 1 | /* |
jjg@893 | 2 | * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ohair@554 | 7 | * published by the Free Software Foundation. Oracle designates this |
duke@1 | 8 | * particular file as subject to the "Classpath" exception as provided |
ohair@554 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
duke@1 | 10 | * |
duke@1 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | * accompanied this code). |
duke@1 | 16 | * |
duke@1 | 17 | * You should have received a copy of the GNU General Public License version |
duke@1 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | * |
ohair@554 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@554 | 22 | * or visit www.oracle.com if you need additional information or have any |
ohair@554 | 23 | * questions. |
duke@1 | 24 | */ |
duke@1 | 25 | |
duke@1 | 26 | package com.sun.tools.javadoc; |
duke@1 | 27 | |
jjg@197 | 28 | import java.util.EnumSet; |
jjg@197 | 29 | import javax.tools.JavaFileObject; |
jjg@197 | 30 | |
duke@1 | 31 | import com.sun.tools.javac.code.Symbol.PackageSymbol; |
duke@1 | 32 | import com.sun.tools.javac.jvm.ClassReader; |
duke@1 | 33 | import com.sun.tools.javac.util.Context; |
duke@1 | 34 | |
duke@1 | 35 | /** Javadoc uses an extended class reader that records package.html entries |
duke@1 | 36 | * @author Neal Gafter |
duke@1 | 37 | */ |
ksrini@1051 | 38 | public class JavadocClassReader extends ClassReader { |
duke@1 | 39 | |
duke@1 | 40 | public static JavadocClassReader instance0(Context context) { |
duke@1 | 41 | ClassReader instance = context.get(classReaderKey); |
duke@1 | 42 | if (instance == null) |
duke@1 | 43 | instance = new JavadocClassReader(context); |
duke@1 | 44 | return (JavadocClassReader)instance; |
duke@1 | 45 | } |
duke@1 | 46 | |
jjg@893 | 47 | public static void preRegister(Context context) { |
duke@1 | 48 | context.put(classReaderKey, new Context.Factory<ClassReader>() { |
jjg@893 | 49 | public ClassReader make(Context c) { |
jjg@893 | 50 | return new JavadocClassReader(c); |
duke@1 | 51 | } |
duke@1 | 52 | }); |
duke@1 | 53 | } |
duke@1 | 54 | |
duke@1 | 55 | private DocEnv docenv; |
duke@1 | 56 | private EnumSet<JavaFileObject.Kind> all = EnumSet.of(JavaFileObject.Kind.CLASS, |
duke@1 | 57 | JavaFileObject.Kind.SOURCE, |
duke@1 | 58 | JavaFileObject.Kind.HTML); |
duke@1 | 59 | private EnumSet<JavaFileObject.Kind> noSource = EnumSet.of(JavaFileObject.Kind.CLASS, |
duke@1 | 60 | JavaFileObject.Kind.HTML); |
duke@1 | 61 | |
ksrini@1051 | 62 | public JavadocClassReader(Context context) { |
duke@1 | 63 | super(context, true); |
duke@1 | 64 | docenv = DocEnv.instance(context); |
jjg@754 | 65 | preferSource = true; |
duke@1 | 66 | } |
duke@1 | 67 | |
duke@1 | 68 | /** |
duke@1 | 69 | * Override getPackageFileKinds to include search for package.html |
duke@1 | 70 | */ |
duke@1 | 71 | @Override |
duke@1 | 72 | protected EnumSet<JavaFileObject.Kind> getPackageFileKinds() { |
duke@1 | 73 | return docenv.docClasses ? noSource : all; |
duke@1 | 74 | } |
duke@1 | 75 | |
duke@1 | 76 | /** |
duke@1 | 77 | * Override extraFileActions to check for package documentation |
duke@1 | 78 | */ |
duke@1 | 79 | @Override |
duke@1 | 80 | protected void extraFileActions(PackageSymbol pack, JavaFileObject fo) { |
jjg@197 | 81 | if (fo.isNameCompatible("package", JavaFileObject.Kind.HTML)) |
jjg@197 | 82 | docenv.getPackageDoc(pack).setDocPath(fo); |
duke@1 | 83 | } |
duke@1 | 84 | } |