Wed, 16 Oct 2013 16:33:04 -0400
8026286: Improper locking of annotation queues causes assertion failures.
8026063: Calls to annotate.flush() cause incorrect type annotations to be generated.
Summary: Fix locking in ClassReader.java
Reviewed-by: jfranck
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. Oracle designates this |
aoqi@0 | 8 | * particular file as subject to the "Classpath" exception as provided |
aoqi@0 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
aoqi@0 | 10 | * |
aoqi@0 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 15 | * accompanied this code). |
aoqi@0 | 16 | * |
aoqi@0 | 17 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 20 | * |
aoqi@0 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 22 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 23 | * questions. |
aoqi@0 | 24 | */ |
aoqi@0 | 25 | |
aoqi@0 | 26 | package com.sun.tools.javac.parser; |
aoqi@0 | 27 | |
aoqi@0 | 28 | import java.util.HashMap; |
aoqi@0 | 29 | import java.util.Map; |
aoqi@0 | 30 | |
aoqi@0 | 31 | import com.sun.tools.javac.parser.Tokens.Comment; |
aoqi@0 | 32 | import com.sun.tools.javac.tree.DCTree.DCDocComment; |
aoqi@0 | 33 | import com.sun.tools.javac.tree.DocCommentTable; |
aoqi@0 | 34 | import com.sun.tools.javac.tree.JCTree; |
aoqi@0 | 35 | import com.sun.tools.javac.util.DiagnosticSource; |
aoqi@0 | 36 | |
aoqi@0 | 37 | |
aoqi@0 | 38 | /** |
aoqi@0 | 39 | * |
aoqi@0 | 40 | * <p><b>This is NOT part of any supported API. |
aoqi@0 | 41 | * If you write code that depends on this, you do so at your own risk. |
aoqi@0 | 42 | * This code and its internal interfaces are subject to change or |
aoqi@0 | 43 | * deletion without notice.</b> |
aoqi@0 | 44 | */ |
aoqi@0 | 45 | public class LazyDocCommentTable implements DocCommentTable { |
aoqi@0 | 46 | private static class Entry { |
aoqi@0 | 47 | final Comment comment; |
aoqi@0 | 48 | DCDocComment tree; |
aoqi@0 | 49 | |
aoqi@0 | 50 | Entry(Comment c) { |
aoqi@0 | 51 | comment = c; |
aoqi@0 | 52 | } |
aoqi@0 | 53 | } |
aoqi@0 | 54 | |
aoqi@0 | 55 | ParserFactory fac; |
aoqi@0 | 56 | DiagnosticSource diagSource; |
aoqi@0 | 57 | Map<JCTree, Entry> table; |
aoqi@0 | 58 | |
aoqi@0 | 59 | LazyDocCommentTable(ParserFactory fac) { |
aoqi@0 | 60 | this.fac = fac; |
aoqi@0 | 61 | diagSource = fac.log.currentSource(); |
aoqi@0 | 62 | table = new HashMap<JCTree, Entry>(); |
aoqi@0 | 63 | } |
aoqi@0 | 64 | |
aoqi@0 | 65 | public boolean hasComment(JCTree tree) { |
aoqi@0 | 66 | return table.containsKey(tree); |
aoqi@0 | 67 | } |
aoqi@0 | 68 | |
aoqi@0 | 69 | public Comment getComment(JCTree tree) { |
aoqi@0 | 70 | Entry e = table.get(tree); |
aoqi@0 | 71 | return (e == null) ? null : e.comment; |
aoqi@0 | 72 | } |
aoqi@0 | 73 | |
aoqi@0 | 74 | public String getCommentText(JCTree tree) { |
aoqi@0 | 75 | Comment c = getComment(tree); |
aoqi@0 | 76 | return (c == null) ? null : c.getText(); |
aoqi@0 | 77 | } |
aoqi@0 | 78 | |
aoqi@0 | 79 | public DCDocComment getCommentTree(JCTree tree) { |
aoqi@0 | 80 | Entry e = table.get(tree); |
aoqi@0 | 81 | if (e == null) |
aoqi@0 | 82 | return null; |
aoqi@0 | 83 | if (e.tree == null) |
aoqi@0 | 84 | e.tree = new DocCommentParser(fac, diagSource, e.comment).parse(); |
aoqi@0 | 85 | return e.tree; |
aoqi@0 | 86 | } |
aoqi@0 | 87 | |
aoqi@0 | 88 | public void putComment(JCTree tree, Comment c) { |
aoqi@0 | 89 | table.put(tree, new Entry(c)); |
aoqi@0 | 90 | } |
aoqi@0 | 91 | |
aoqi@0 | 92 | } |