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 | /* |
jjg@695 | 2 | * Copyright (c) 1999, 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.parser; |
duke@1 | 27 | |
jjg@695 | 28 | import java.nio.CharBuffer; |
duke@1 | 29 | |
jjg@50 | 30 | import com.sun.tools.javac.code.Source; |
jjg@695 | 31 | import com.sun.tools.javac.util.Context; |
jjg@695 | 32 | import com.sun.tools.javac.util.Log; |
jjg@695 | 33 | import com.sun.tools.javac.util.Names; |
duke@1 | 34 | |
duke@1 | 35 | |
jjg@695 | 36 | /** |
jjg@695 | 37 | * A factory for creating scanners. |
duke@1 | 38 | * |
jjg@581 | 39 | * <p><b>This is NOT part of any supported API. |
jjg@695 | 40 | * If you write code that depends on this, you do so at your own |
jjg@695 | 41 | * risk. This code and its internal interfaces are subject to change |
jjg@695 | 42 | * or deletion without notice.</b> |
duke@1 | 43 | */ |
jjg@695 | 44 | public class ScannerFactory { |
jjg@695 | 45 | /** The context key for the scanner factory. */ |
jjg@695 | 46 | public static final Context.Key<ScannerFactory> scannerFactoryKey = |
jjg@695 | 47 | new Context.Key<ScannerFactory>(); |
duke@1 | 48 | |
jjg@695 | 49 | /** Get the Factory instance for this context. */ |
jjg@695 | 50 | public static ScannerFactory instance(Context context) { |
jjg@695 | 51 | ScannerFactory instance = context.get(scannerFactoryKey); |
jjg@695 | 52 | if (instance == null) |
jjg@695 | 53 | instance = new ScannerFactory(context); |
jjg@695 | 54 | return instance; |
jjg@695 | 55 | } |
duke@1 | 56 | |
jjg@695 | 57 | final Log log; |
jjg@695 | 58 | final Names names; |
jjg@695 | 59 | final Source source; |
mcimadamore@1113 | 60 | final Tokens tokens; |
duke@1 | 61 | |
jjg@695 | 62 | /** Create a new scanner factory. */ |
jjg@695 | 63 | protected ScannerFactory(Context context) { |
jjg@695 | 64 | context.put(scannerFactoryKey, this); |
jjg@695 | 65 | this.log = Log.instance(context); |
jjg@695 | 66 | this.names = Names.instance(context); |
jjg@695 | 67 | this.source = Source.instance(context); |
mcimadamore@1113 | 68 | this.tokens = Tokens.instance(context); |
jjg@695 | 69 | } |
duke@1 | 70 | |
jjg@695 | 71 | public Scanner newScanner(CharSequence input, boolean keepDocComments) { |
jjg@695 | 72 | if (input instanceof CharBuffer) { |
jjg@695 | 73 | CharBuffer buf = (CharBuffer) input; |
jjg@695 | 74 | if (keepDocComments) |
mcimadamore@1113 | 75 | return new Scanner(this, new JavadocTokenizer(this, buf)); |
jjg@695 | 76 | else |
jjg@695 | 77 | return new Scanner(this, buf); |
jjg@695 | 78 | } else { |
jjg@695 | 79 | char[] array = input.toString().toCharArray(); |
jjg@695 | 80 | return newScanner(array, array.length, keepDocComments); |
duke@1 | 81 | } |
duke@1 | 82 | } |
duke@1 | 83 | |
jjg@695 | 84 | public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) { |
jjg@695 | 85 | if (keepDocComments) |
mcimadamore@1113 | 86 | return new Scanner(this, new JavadocTokenizer(this, input, inputLength)); |
jjg@695 | 87 | else |
jjg@695 | 88 | return new Scanner(this, input, inputLength); |
duke@1 | 89 | } |
duke@1 | 90 | } |