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
duke@1 | 1 | /* |
ohair@798 | 2 | * Copyright (c) 2003, 2010, 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.javac.util; |
duke@1 | 27 | |
mcimadamore@795 | 28 | import com.sun.tools.javac.code.Lint.LintCategory; |
duke@1 | 29 | import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
mcimadamore@795 | 30 | import java.util.EnumSet; |
duke@1 | 31 | |
duke@1 | 32 | /** |
duke@1 | 33 | * An interface to support optional warnings, needed for support of |
duke@1 | 34 | * unchecked conversions and unchecked casts. |
duke@1 | 35 | * |
jjg@581 | 36 | * <p><b>This is NOT part of any supported API. |
jjg@333 | 37 | * If you write code that depends on this, you do so at your own risk. |
jjg@333 | 38 | * This code and its internal interfaces are subject to change or |
jjg@333 | 39 | * deletion without notice.</b> |
duke@1 | 40 | */ |
duke@1 | 41 | public class Warner { |
duke@1 | 42 | |
duke@1 | 43 | private DiagnosticPosition pos = null; |
mcimadamore@795 | 44 | protected boolean warned = false; |
mcimadamore@795 | 45 | private EnumSet<LintCategory> nonSilentLintSet = EnumSet.noneOf(LintCategory.class); |
mcimadamore@795 | 46 | private EnumSet<LintCategory> silentLintSet = EnumSet.noneOf(LintCategory.class); |
duke@1 | 47 | |
duke@1 | 48 | public DiagnosticPosition pos() { |
duke@1 | 49 | return pos; |
duke@1 | 50 | } |
duke@1 | 51 | |
mcimadamore@795 | 52 | public void warn(LintCategory lint) { |
mcimadamore@795 | 53 | nonSilentLintSet.add(lint); |
duke@1 | 54 | } |
mcimadamore@795 | 55 | |
mcimadamore@795 | 56 | public void silentWarn(LintCategory lint) { |
mcimadamore@795 | 57 | silentLintSet.add(lint); |
duke@1 | 58 | } |
duke@1 | 59 | |
duke@1 | 60 | public Warner(DiagnosticPosition pos) { |
duke@1 | 61 | this.pos = pos; |
duke@1 | 62 | } |
duke@1 | 63 | |
mcimadamore@795 | 64 | public boolean hasSilentLint(LintCategory lint) { |
mcimadamore@795 | 65 | return silentLintSet.contains(lint); |
mcimadamore@795 | 66 | } |
mcimadamore@795 | 67 | |
mcimadamore@795 | 68 | public boolean hasNonSilentLint(LintCategory lint) { |
mcimadamore@795 | 69 | return nonSilentLintSet.contains(lint); |
mcimadamore@795 | 70 | } |
mcimadamore@795 | 71 | |
mcimadamore@795 | 72 | public boolean hasLint(LintCategory lint) { |
mcimadamore@795 | 73 | return hasSilentLint(lint) || |
mcimadamore@795 | 74 | hasNonSilentLint(lint); |
mcimadamore@795 | 75 | } |
mcimadamore@795 | 76 | |
mcimadamore@795 | 77 | public void clear() { |
mcimadamore@795 | 78 | nonSilentLintSet.clear(); |
mcimadamore@795 | 79 | silentLintSet.clear(); |
mcimadamore@795 | 80 | this.warned = false; |
mcimadamore@795 | 81 | } |
mcimadamore@795 | 82 | |
duke@1 | 83 | public Warner() { |
duke@1 | 84 | this(null); |
duke@1 | 85 | } |
duke@1 | 86 | } |