tags as empty
Reviewed-by: darcy

! src/share/classes/com/sun/tools/doclint/Checker.java
+ test/tools/doclint/EmptyPreTest.java

Changeset: 356feec37282
Author:    wmdietl
Date:      2013-03-20 18:42 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/356feec37282

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools

! make/build.xml
! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Lower.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/jvm/Target.java
! src/share/classes/javax/lang/model/AnnotatedConstruct.java
! src/share/classes/javax/lang/model/type/ExecutableType.java


From wdietl at gmail.com  Wed Mar 20 10:45:34 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Wed, 20 Mar 2013 17:45:34 +0000
Subject: hg: type-annotations/type-annotations/hotspot: 43 new changesets
Message-ID: <20130320174832.BA905482AA@hg.openjdk.java.net>

Changeset: 7d202919fb2b
Author:    wmdietl
Date:      2013-03-17 11:51 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/7d202919fb2b

Automated merge with http://hg.openjdk.java.net/jdk8/tl/hotspot

! .hgtags

Changeset: 2db7bda23878
Author:    wmdietl
Date:      2013-03-20 18:44 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2db7bda23878

Automated merge with http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot


Changeset: 8196357e95b5
Author:    amurillo
Date:      2013-03-08 08:22 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8196357e95b5

8009688: new hotspot build - hs25-b23
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: 255c0a4cb4eb
Author:    sla
Date:      2013-03-05 08:50 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/255c0a4cb4eb

8009287: [parfait] Uninitialised variable in hotspot/agent/src/os/linux/ps_core.c
Reviewed-by: dholmes, kvn, mikael, morris

! agent/src/os/linux/ps_core.c

Changeset: 9058789475af
Author:    iklam
Date:      2013-03-05 13:55 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9058789475af

7107135: Stack guard pages are no more protected after loading a shared library with executable stack
Summary: Detect the execstack attribute of the loaded library and attempt to fix the stack guard using Safepoint op.
Reviewed-by: dholmes, zgu
Contributed-by: ioi.lam at oracle.com

! src/os/linux/vm/globals_linux.hpp
! src/os/linux/vm/os_linux.cpp
! src/os/linux/vm/os_linux.hpp
! src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
! src/os_cpu/linux_x86/vm/os_linux_x86.cpp
! src/share/vm/runtime/thread.hpp
! src/share/vm/runtime/vm_operations.hpp
! src/share/vm/utilities/elfFile.cpp
! src/share/vm/utilities/elfFile.hpp
+ test/runtime/7107135/Test.java
+ test/runtime/7107135/Test7107135.sh
+ test/runtime/7107135/TestMT.java
+ test/runtime/7107135/test.c

Changeset: 6b803ba47588
Author:    zgu
Date:      2013-03-07 14:06 -0500
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6b803ba47588

8008257: NMT: assert(new_rec->is_allocation_record()) failed when running with shared memory option
Summary: Corrected virtual memory recording and tagging code when large pages are used
Reviewed-by: coleenp, ccheung

! src/os/bsd/vm/os_bsd.cpp
! src/os/linux/vm/os_linux.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os/windows/vm/os_windows.cpp

Changeset: 3efdfd6ddbf2
Author:    coleenp
Date:      2013-03-08 11:47 -0500
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3efdfd6ddbf2

8003553: NPG: metaspace objects should be zeroed in constructors
Summary: Zero metadata in constructors, not in allocation (and some in constructors)
Reviewed-by: jmasa, sspitsyn

! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/memory/metablock.cpp
! src/share/vm/memory/metaspace.cpp
! src/share/vm/oops/constMethod.cpp
! src/share/vm/oops/cpCache.cpp
! src/share/vm/oops/cpCache.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/klass.cpp
! src/share/vm/oops/klass.hpp
! src/share/vm/oops/method.cpp
! src/share/vm/oops/methodData.cpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: 252ad8d5f22b
Author:    dcubed
Date:      2013-03-08 17:14 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/252ad8d5f22b

Merge

! src/os/bsd/vm/os_bsd.cpp

Changeset: 35ef86296a5d
Author:    dcubed
Date:      2013-03-08 17:49 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/35ef86296a5d

Merge

! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp

Changeset: 5939f5953b45
Author:    coleenp
Date:      2013-03-13 09:10 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5939f5953b45

8009836: nsk/regression/b4222717 fails with empty stack trace
Summary: Some zeroing was missed for bug 8003553, causing empty stack traces and Xcom crashes, add back zeroing to metablock
Reviewed-by: dholmes, rbackman

! src/share/vm/memory/metablock.cpp
! src/share/vm/oops/constMethod.cpp
! src/share/vm/oops/method.cpp

Changeset: 96480359523a
Author:    coleenp
Date:      2013-03-11 14:00 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/96480359523a

8008965: @Contended fails with classes having static fields
Summary: Disable @Contended support for static fields
Reviewed-by: coleenp, kvn
Contributed-by: Aleksey Shipilev 

! src/share/vm/classfile/classFileParser.cpp
+ test/runtime/8003985/Test8003985.java

Changeset: d6320e955c89
Author:    coleenp
Date:      2013-03-13 13:47 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d6320e955c89

Merge


Changeset: 0ede345ec7c9
Author:    coleenp
Date:      2013-03-13 15:15 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0ede345ec7c9

8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
Summary: -Xshare:dump was creating a Symbol in C_heap.  There's an assert there that jdk jprt wasn't hitting because it was only done in product
Reviewed-by: dholmes, hseigel, iklam

! src/share/vm/classfile/symbolTable.cpp

Changeset: c8b31b461e1a
Author:    coleenp
Date:      2013-03-13 17:34 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c8b31b461e1a

8003419: NPG: Clean up metadata created during class loading if failure
Summary: Store metadata on ClassFileParser instance to be cleaned up by destructor.  This enabled some refactoring of the enormous parseClassFile function.
Reviewed-by: jmasa, acorn

! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/classfile/classFileParser.hpp
! src/share/vm/oops/constMethod.cpp
! src/share/vm/oops/constMethod.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp

Changeset: fad90b102190
Author:    jprovino
Date:      2013-03-06 13:38 -0500
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/fad90b102190

8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
Summary: Changes to arguments.cpp for warnings vs. errors.  Changes for CDS arguments.
Reviewed-by: coleenp, cjplummer

! make/excludeSrc.make
! src/share/vm/memory/filemap.hpp
! src/share/vm/runtime/arguments.cpp

Changeset: 47bc9800972c
Author:    jprovino
Date:      2013-03-06 13:46 -0500
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/47bc9800972c

8006498: #if  is wrong in the code.
Summary: ASSERT and other symbols used incorrectly with #if are supposed to be defined or not.
Reviewed-by: dholmes, mikael

! src/cpu/x86/vm/frame_x86.cpp
! src/cpu/x86/vm/frame_x86.hpp
! src/share/vm/c1/c1_LIR.hpp
! src/share/vm/ci/ciTypeFlow.cpp
! src/share/vm/code/compressedStream.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/prims/jvmtiImpl.cpp
! src/share/vm/prims/jvmtiTrace.hpp

Changeset: 67342b960b47
Author:    jprovino
Date:      2013-03-06 13:50 -0500
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/67342b960b47

8008474: Add -Wundef to warning flags.
Summary: Force use of undefined macros to be and error.
Reviewed-by: dholmes, mikael

! make/bsd/makefiles/gcc.make
! make/linux/makefiles/gcc.make
! make/solaris/makefiles/gcc.make

Changeset: cb75b67f04fb
Author:    jprovino
Date:      2013-03-08 12:35 -0500
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cb75b67f04fb

Merge

! make/bsd/makefiles/gcc.make

Changeset: 69ffa4ac9e53
Author:    jprovino
Date:      2013-03-12 00:02 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/69ffa4ac9e53

8009835: Only produce a warning when -Xshare:auto is explicitly requested
Summary: The minimal JVM is printing a warning message for default settings when it should quitely ignore them.
Reviewed-by: coleenp, dholmes

! src/share/vm/runtime/arguments.cpp

Changeset: 9102c4111564
Author:    jprovino
Date:      2013-03-14 10:37 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9102c4111564

Merge


Changeset: ed53b50794d7
Author:    vladidan
Date:      2013-03-14 12:49 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ed53b50794d7

Merge


Changeset: 0094485b46c7
Author:    roland
Date:      2013-03-13 09:44 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0094485b46c7

8009761: Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
Summary: deoptimization doesn't set up callee frames so that they restore caller frames correctly.
Reviewed-by: kvn

! src/cpu/sparc/vm/cppInterpreter_sparc.cpp
! src/cpu/sparc/vm/templateInterpreter_sparc.cpp
! src/cpu/x86/vm/cppInterpreter_x86.cpp
! src/cpu/x86/vm/templateInterpreter_x86_32.cpp
! src/cpu/x86/vm/templateInterpreter_x86_64.cpp
! src/cpu/zero/vm/cppInterpreter_zero.cpp
! src/share/vm/interpreter/abstractInterpreter.hpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/vframeArray.cpp
! src/share/vm/runtime/vframeArray.hpp
+ test/compiler/8009761/Test8009761.java

Changeset: 056ab43544a4
Author:    neliasso
Date:      2013-03-13 10:56 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/056ab43544a4

8009721: Make PhaseLive independent from regalloc
Summary: Moved class definition of LRG_List from chaitin.hpp to live.hpp
Reviewed-by: kvn, rbackman, roland
Contributed-by: niclas.adlertz at oracle.com

! src/share/vm/opto/chaitin.hpp
! src/share/vm/opto/live.hpp

Changeset: 6d98efabf3ba
Author:    neliasso
Date:      2013-03-13 13:44 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6d98efabf3ba

Merge


Changeset: b7c2c5b2572c
Author:    neliasso
Date:      2013-02-13 10:25 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b7c2c5b2572c

8005772: Stubs report compile id -1 in phase events
Summary: Use 0 to indicate id is NA, -1 for error or uninitalized
Reviewed-by: kvn, twisti

! src/share/vm/compiler/compileBroker.cpp
! src/share/vm/opto/compile.cpp

Changeset: 71f13276159d
Author:    morris
Date:      2013-03-14 07:44 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/71f13276159d

8008560: [parfait] Null pointer deference in hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
Summary: add null pointer check in signal handler
Reviewed-by: kvn

! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp

Changeset: fba788946616
Author:    morris
Date:      2013-03-14 16:16 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/fba788946616

Merge


Changeset: 9def4075da6d
Author:    tamao
Date:      2013-03-05 15:36 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9def4075da6d

8008079: G1: Add nextObject routine to CMBitMapRO and replace nextWord
Summary: Update the task local finger to the start of the next object when marking aborts, in order to avoid the redundant scanning of all 0's when the marking task restarts, if otherwise updating to the next word. In addition, reuse the routine nextObject() in routine iterate().
Reviewed-by: johnc, ysr
Contributed-by: tamao 

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.hpp
! src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp

Changeset: 209f8ba5020b
Author:    tamao
Date:      2013-03-07 10:44 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/209f8ba5020b

8008368: Deprecate MaxGCMinorPauseMillis
Summary: Deprecate MaxGCMinorPauseMillis and emit a warning if set by users
Reviewed-by: brutisso, johnc
Contributed-by: tamao 

! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/arguments.hpp

Changeset: 1f3354851c91
Author:    stefank
Date:      2013-03-11 08:49 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1f3354851c91

Merge


Changeset: 167812fe00bb
Author:    kevinw
Date:      2013-03-11 12:56 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/167812fe00bb

8009723: CMS logs "concurrent mode failure" twice when using (disabling) -XX:-UseCMSCompactAtFullCollection
Reviewed-by: jwilhelm, ehelin, brutisso

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

Changeset: 71f619500f9b
Author:    kevinw
Date:      2013-03-11 15:37 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/71f619500f9b

Merge


Changeset: 1c88b99a2b01
Author:    mgerdin
Date:      2013-03-12 09:42 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1c88b99a2b01

8009282: Assertion "assert(used_and_free == capacity_bytes) failed: Accounting is wrong" failed with -XX:+Verbose -XX:+TraceMetadataChunkAllocation
Summary: Assertion is only valid when at a safepoint, adjust accordingly.
Reviewed-by: stefank, jmasa, tamao

! src/share/vm/memory/metaspace.cpp

Changeset: ca9580859cf4
Author:    stefank
Date:      2013-03-11 02:24 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ca9580859cf4

8004697: SIGSEGV on Solaris sparc with -XX:+UseNUMA
Summary: Don't scan pages outside the given range.
Reviewed-by: jwilhelm, jmasa

! src/os/solaris/vm/os_solaris.cpp
! src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp

Changeset: 62609ffa2fc6
Author:    tschatzl
Date:      2013-03-12 15:10 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/62609ffa2fc6

8008684: CMS: concurrent phase start markers should always be printed
Summary: Print the concurrent phase start markers for CMS when PrintGCDetails is enabled, not only if both PrintGCDetails and PrintGCTimeStamps are.
Reviewed-by: mgerdin, jmasa

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

Changeset: eac371996b44
Author:    brutisso
Date:      2013-03-12 08:33 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/eac371996b44

8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
Summary: Take the initial heap size into account when checking the heap size for compressed oops
Reviewed-by: jmasa, kvn, hseigel, ctornqvi

! src/share/vm/memory/universe.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/arguments.hpp

Changeset: 993d878108d9
Author:    brutisso
Date:      2013-03-13 05:14 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/993d878108d9

Merge


Changeset: 82657b6a8cc0
Author:    jmasa
Date:      2013-03-12 11:00 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/82657b6a8cc0

6976528: PS: assert(!limit_exceeded || softrefs_clear) failed: Should have been cleared
Reviewed-by: johnc

! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
! src/share/vm/memory/collectorPolicy.cpp

Changeset: 15401203db6b
Author:    stefank
Date:      2013-03-15 08:57 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/15401203db6b

Merge

! src/os/solaris/vm/os_solaris.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/memory/metaspace.cpp
! src/share/vm/runtime/arguments.cpp

Changeset: a10dc1469c3f
Author:    stefank
Date:      2013-03-15 04:39 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a10dc1469c3f

Merge


Changeset: 0631ebcc45f0
Author:    amurillo
Date:      2013-03-15 11:18 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0631ebcc45f0

Merge

! src/share/vm/runtime/arguments.cpp

Changeset: 3db4ab0e12f4
Author:    amurillo
Date:      2013-03-15 11:18 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3db4ab0e12f4

Added tag hs25-b23 for changeset 0631ebcc45f0

! .hgtags

Changeset: 619bb6437e84
Author:    wmdietl
Date:      2013-03-20 18:45 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/619bb6437e84

Automated merge with http://hg.openjdk.java.net/jdk8/tl/hotspot

! .hgtags


From wdietl at gmail.com  Wed Mar 20 10:47:07 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Wed, 20 Mar 2013 17:47:07 +0000
Subject: hg: type-annotations/type-annotations/jdk: 11 new changesets
Message-ID: <20130320175209.AF0AA482AB@hg.openjdk.java.net>

Changeset: a0275a47fa78
Author:    sla
Date:      2013-03-19 09:53 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a0275a47fa78

8006637: Failure to filter out native frame events on Solaris
Summary: Test is confused by other threads calling String.intern(). Add a thread filter to avoid this.
Reviewed-by: sspitsyn, alanb

! test/com/sun/jdi/NativeInstanceFilter.java

Changeset: e766da5575fa
Author:    dholmes
Date:      2013-03-19 06:01 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e766da5575fa

8009426: "profiles" target fails due to nashorn if "images" is not built first
Reviewed-by: alanb

! makefiles/CreateJars.gmk
! makefiles/Profiles.gmk
! makefiles/profile-includes.txt

Changeset: 4103eb6b2137
Author:    jzavgren
Date:      2013-03-18 14:21 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4103eb6b2137

8007607: security native code doesn't always use malloc, realloc, and calloc correctly
Reviewed-by: chegar, dsamersoff, valeriep

! src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
! src/share/native/sun/security/jgss/wrapper/NativeUtil.c
! src/solaris/native/com/sun/security/auth/module/Solaris.c
! src/solaris/native/com/sun/security/auth/module/Unix.c
! src/solaris/native/sun/security/smartcardio/pcsc_md.c

Changeset: 2241a2d34085
Author:    mduigou
Date:      2013-03-19 16:05 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2241a2d34085

8001642: Add Optional, OptionalDouble, OptionalInt, OptionalLong
Reviewed-by: mduigou, darcy, alanb, jjb
Contributed-by: Brian Goetz 

+ src/share/classes/java/util/Optional.java
+ src/share/classes/java/util/OptionalDouble.java
+ src/share/classes/java/util/OptionalInt.java
+ src/share/classes/java/util/OptionalLong.java
+ test/java/util/Optional/Basic.java
+ test/java/util/Optional/BasicDouble.java
+ test/java/util/Optional/BasicInt.java
+ test/java/util/Optional/BasicLong.java

Changeset: fb23896a01f5
Author:    uta
Date:      2013-03-20 13:21 +0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/fb23896a01f5

8006193: (process) Clean-up java.lang.ProcessImpl.finalize, does not need to be public
Reviewed-by: alanb

! src/windows/classes/java/lang/ProcessImpl.java

Changeset: 3070b7363853
Author:    chegar
Date:      2013-03-20 14:39 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3070b7363853

8010282: sun.net.www.protocol.jar.JarFileFactory.close(JarFile) should be thread-safe
Reviewed-by: khazra, alanb

! src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
! src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
! src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java

Changeset: 38116bfe5323
Author:    mullan
Date:      2013-03-20 10:58 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/38116bfe5323

8010112: NullPointerException in sun.security.provider.certpath.CertId()
Reviewed-by: vinnie

! src/share/classes/sun/security/provider/certpath/CertId.java
! src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
! src/share/classes/sun/security/provider/certpath/RevocationChecker.java
! src/share/classes/sun/security/x509/X509CertImpl.java

Changeset: 9859856920ed
Author:    mullan
Date:      2013-03-20 11:23 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9859856920ed

Merge

- src/share/classes/sun/security/util/KeyLength.java

Changeset: 38c1d0c2d6a6
Author:    mullan
Date:      2013-03-20 12:06 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/38c1d0c2d6a6

Merge


Changeset: ccd9f53377c4
Author:    mchung
Date:      2013-03-20 09:50 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ccd9f53377c4

8006104: Improve tests to test ".useParentHandlers" property set in the logging configuration
Reviewed-by: alanb

! test/java/util/logging/CustomLogManager.java
! test/java/util/logging/CustomLogManagerTest.java

Changeset: 83f85e6f9fe1
Author:    wmdietl
Date:      2013-03-20 18:46 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/83f85e6f9fe1

Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk



From wdietl at gmail.com  Wed Mar 20 11:50:30 2013
From: wdietl at gmail.com (Werner Dietl)
Date: Wed, 20 Mar 2013 19:50:30 +0100
Subject: Implemented receiver parameters for constructors of nested types
Message-ID: 

All,

I've just pushed the implementation for receiver parameters for
constructors of nested types.
A few tests are in referenceinfos/Constructors.java and I worked
through a few expected failures on the command-line.

Steve/SQE, please test this feature, in particular whether I'm
handling all error cases correctly.

Jon, I added a JCReceiverVariableDecl to handle variables with the
"Outer.Inner.this" parameter name, which wasn't previously possible.
Please have a look at this code. Do you see a nicer alternative?
Should we add a tree tag for this?

I updated javac.code.Printer to correctly output AnnotatedType. I
currently still output "@A java.lang.Object" instead of "java.lang. @A
Object".
Could somebody look at
com.sun.tools.javac.code.Printer.visitAnnotatedType(AnnotatedType,
Locale) and suggest a way to split on package names?

I will next work on fixing the last bug reported by Steve.

Please do let me know if something is not working as you would expect.
Thanks,
cu, WMD.

-- 
http://www.google.com/profiles/wdietl

From steve.sides at oracle.com  Fri Mar 22 16:55:32 2013
From: steve.sides at oracle.com (Steve Sides)
Date: Fri, 22 Mar 2013 16:55:32 -0700
Subject: fix for failing new javap output test
Message-ID: <514CEF74.6080808@oracle.com>

A couple things,

I notice a new javap output test that recently went in to tl/langtools 
was merged into type-annotations where it fails. I fixed the test 
(updated expected output according to changes in type-annotations not 
yet in tl/langtools),  http://cr.openjdk.java.net/~ssides/8010686/

There are also a handful of other failing tests, some are passing in 
tl/langtools:
   tools/javac/lambda/TargetType24.java
   tools/javac/diags/CheckResourceKeys.java
and
   tools/javac/processing/model/type/BasicAnnoTests.java
which went back with Initial support for new javax.lang.model API and 
has been failing since(2/21).

-steve

From wdietl at gmail.com  Fri Mar 22 17:40:09 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Sat, 23 Mar 2013 00:40:09 +0000
Subject: hg: type-annotations/type-annotations/jdk: 8 new changesets
Message-ID: <20130323004211.E47AF48368@hg.openjdk.java.net>

Changeset: cf0049037deb
Author:    darcy
Date:      2013-03-20 15:21 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cf0049037deb

8010427: Refine Method.isDefault implementation
Reviewed-by: acorn, dlsmith

! src/share/classes/java/lang/reflect/Method.java

Changeset: 3c1a4966d901
Author:    dholmes
Date:      2013-03-20 22:39 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3c1a4966d901

8006818: SunEC and SunPKCS11 providers should be in all profiles
Reviewed-by: dholmes, alanb, valeriep
Contributed-by: Jen Dority 

! makefiles/profile-includes.txt

Changeset: 9ee1aff76498
Author:    sundar
Date:      2013-03-21 19:19 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9ee1aff76498

8009869: Need to modify java.security property package.access to include nashorn packages
Reviewed-by: ahgross, jlaskey, lagergren

! src/share/lib/security/java.security-linux
! src/share/lib/security/java.security-macosx
! src/share/lib/security/java.security-solaris
! src/share/lib/security/java.security-windows

Changeset: 3f8fbb0ab155
Author:    robm
Date:      2013-03-21 17:33 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3f8fbb0ab155

8009251: Add proxy handling and keep-alive fixes to jsse
Reviewed-by: chegar

! src/share/classes/sun/net/www/http/HttpClient.java
! src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
! src/share/classes/sun/net/www/protocol/https/HttpsClient.java

Changeset: 93cd7052d306
Author:    weijun
Date:      2013-03-22 19:59 +0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/93cd7052d306

8010531: Add BadKdc* tests to problem list for solaris-sparcv9
Reviewed-by: alanb

! test/ProblemList.txt

Changeset: 470232a8e89d
Author:    stefank
Date:      2013-03-22 15:01 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/470232a8e89d

8005116: NPG: Rename -permstat option for jmap in jdk8 to -clstats
Reviewed-by: jmasa, sla
Contributed-by: Erik Helin 

! src/share/classes/sun/tools/jmap/JMap.java

Changeset: 518d6087e01f
Author:    stefank
Date:      2013-03-22 15:01 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/518d6087e01f

8004172: Update jstat counter names to reflect metaspace changes
Reviewed-by: mchung
Contributed-by: Erik Helin 

! src/share/classes/sun/tools/jstat/resources/jstat_options
! test/sun/tools/jstat/gcCapacityOutput1.awk
! test/sun/tools/jstat/gcCauseOutput1.awk
+ test/sun/tools/jstat/gcMetaCapacityOutput1.awk
! test/sun/tools/jstat/gcOldOutput1.awk
! test/sun/tools/jstat/gcOutput1.awk
- test/sun/tools/jstat/gcPermCapacityOutput1.awk
+ test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh
- test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh
! test/sun/tools/jstat/lineCounts1.awk
! test/sun/tools/jstat/lineCounts2.awk
! test/sun/tools/jstat/lineCounts3.awk
! test/sun/tools/jstat/lineCounts4.awk
! test/sun/tools/jstat/options1.out
! test/sun/tools/jstat/options2.out
! test/sun/tools/jstat/timeStamp1.awk
! test/sun/tools/jstatd/jstatGcutilOutput1.awk

Changeset: 33d3a95b1645
Author:    wmdietl
Date:      2013-03-23 01:40 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/33d3a95b1645

Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk



From wdietl at gmail.com  Fri Mar 22 17:39:18 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Sat, 23 Mar 2013 00:39:18 +0000
Subject: hg: type-annotations/type-annotations/langtools: 9 new changesets
Message-ID: <20130323003945.276F148367@hg.openjdk.java.net>

Changeset: 972474640b7d
Author:    darcy
Date:      2013-03-20 17:41 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/972474640b7d

8010364: Clarify javax.lang.model API for Type Annotations
Reviewed-by: jjg, abuckley

! src/share/classes/javax/lang/model/AnnotatedConstruct.java
! src/share/classes/javax/lang/model/type/ExecutableType.java

Changeset: cc38a6723663
Author:    mcimadamore
Date:      2013-03-22 12:38 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cc38a6723663

8009649: Lambda back-end should generate invokespecial for method handles referring to private instance methods
Summary: Private lambda methods should be accessed through invokespecial
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+ test/tools/javac/lambda/bytecode/TestLambdaBytecode.java

Changeset: f3814edefb33
Author:    mcimadamore
Date:      2013-03-22 12:39 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f3814edefb33

8010101: Intersection type cast issues redundant unchecked warning
Summary: Code for checking intersection type cast is incorrectly swapping operands, leading to spurious warnings
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/lambda/Intersection02.java
+ test/tools/javac/lambda/Intersection02.out

Changeset: b6cf07c54c29
Author:    mcimadamore
Date:      2013-03-22 12:41 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/b6cf07c54c29

8009820: AssertionError when compiling java code with two identical static imports
Summary: Speculative attribution is carried out twice with same method symbol in case of static imports
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
+ test/tools/javac/lambda/DoubleStaticImport.java

Changeset: c6728c9addff
Author:    mcimadamore
Date:      2013-03-22 12:43 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c6728c9addff

8010303: Graph inference: missing incorporation step causes spurious inference error
Summary: Multiple equality constraints on inference vars are not used to generate new inference constraints
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! test/tools/javac/lambda/TargetType28.out
+ test/tools/javac/lambda/TargetType67.java
+ test/tools/javac/lambda/TargetType68.java
+ test/tools/javac/lambda/TargetType69.java

Changeset: 5da12e8a59ba
Author:    mcimadamore
Date:      2013-03-22 12:44 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/5da12e8a59ba

8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
Summary: Rich formatter doesn't preprocess supertypes of an anonymous inner class
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
+ test/tools/javac/Diagnostics/8010387/T8010387.java
+ test/tools/javac/Diagnostics/8010387/T8010387.out

Changeset: f4500abff1fd
Author:    darcy
Date:      2013-03-22 10:08 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f4500abff1fd

7080464: langtools regression test failures when assertions are enabled
Reviewed-by: jjg

! test/tools/javac/api/TestJavacTaskScanner.java
! test/tools/javac/diags/MessageFile.java
! test/tools/javac/diags/MessageInfo.java

Changeset: 03102c640d53
Author:    wmdietl
Date:      2013-03-23 01:35 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/03102c640d53

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools

! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
! src/share/classes/javax/lang/model/AnnotatedConstruct.java
! src/share/classes/javax/lang/model/type/ExecutableType.java

Changeset: e5e49c572fe2
Author:    wmdietl
Date:      2013-03-23 01:37 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e5e49c572fe2

langtools_8010686.patch by Steve Sides: update expected test output.

! test/tools/javap/output/RepeatingTypeAnnotations.java


From wdietl at gmail.com  Fri Mar 22 17:42:52 2013
From: wdietl at gmail.com (Werner Dietl)
Date: Sat, 23 Mar 2013 01:42:52 +0100
Subject: fix for failing new javap output test
In-Reply-To: <514CEF74.6080808@oracle.com>
References: <514CEF74.6080808@oracle.com>
Message-ID: 

Hi Steve,

thanks for that patch! I've applied it in type-annotations, and
updated and pushed all repositories.

I'll look into the other errors and will see whether I can fix them. I
probably broke the error key test, but have to look at what the other
tests do.

cu, WMD.

On Sat, Mar 23, 2013 at 12:55 AM, Steve Sides  wrote:
> A couple things,
>
> I notice a new javap output test that recently went in to tl/langtools was
> merged into type-annotations where it fails. I fixed the test (updated
> expected output according to changes in type-annotations not yet in
> tl/langtools),  http://cr.openjdk.java.net/~ssides/8010686/
>
> There are also a handful of other failing tests, some are passing in
> tl/langtools:
>   tools/javac/lambda/TargetType24.java
>   tools/javac/diags/CheckResourceKeys.java
> and
>   tools/javac/processing/model/type/BasicAnnoTests.java
> which went back with Initial support for new javax.lang.model API and has
> been failing since(2/21).
>
> -steve



-- 
http://www.google.com/profiles/wdietl

From steve.sides at oracle.com  Mon Mar 25 16:39:48 2013
From: steve.sides at oracle.com (Steve Sides)
Date: Mon, 25 Mar 2013 16:39:48 -0700
Subject: test for AssertionError bug
Message-ID: <5150E044.7000200@oracle.com>

Hi Werner,
  I was running through tests and found that the test T8009360.java 
posted earlier in this changeset 
 passes as it is.
It needed a few changes to make it fail, 
http://cr.openjdk.java.net/~ssides/8009360/*
*
sorry 'bout that,

-steve*
*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130325/fbd24306/attachment.html 

From alex.buckley at oracle.com  Tue Mar 26 13:18:10 2013
From: alex.buckley at oracle.com (Alex Buckley)
Date: Tue, 26 Mar 2013 13:18:10 -0700
Subject: Status of retrieving annotations on type parameters?
In-Reply-To: <5151DA28.2020000@oracle.com>
References: <5151DA28.2020000@oracle.com>
Message-ID: <51520282.4040700@oracle.com>

On 3/26/2013 10:26 AM, Joe Darcy wrote:
> Related to updating the annotation processing specification to account
> for JSR 308, I wanted to quickly double-check on the implementation
> status of retrieving declaration annotations on type parameters.
>
> Is this functionally currently supported in either the javax.lang.model
> API or in core reflection?

The JBS bugs for type annotations reflection are:

   JDK-8004698 Implement Core Reflection for Type Annotations
   JDK-8007803 Implement javax.lang.model API for Type Annotations

For core reflection, the actions called for in [1] have been 
implemented. j.l.r.TypeVariable has a new method getAnnotatedBounds(), 
and the implementation of TypeVariable implements AnnotatedElement fully.

For the language model, the actions called for in [1] are still 
applicable even with the placement of annotations directly on Element's 
and TypeMirror's [2]. I don't see changes to getTypeParameters() in the 
langtools changeset linked from JDK-8007803.

Alex

[1] 
http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2012-September/000001.html 


[2] 
http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2013-February/000064.html

From joe.darcy at oracle.com  Tue Mar 26 14:10:14 2013
From: joe.darcy at oracle.com (Joe Darcy)
Date: Tue, 26 Mar 2013 14:10:14 -0700
Subject: Status of retrieving annotations on type parameters?
In-Reply-To: <51520282.4040700@oracle.com>
References: <5151DA28.2020000@oracle.com> <51520282.4040700@oracle.com>
Message-ID: <51520EB6.7060007@oracle.com>

On 03/26/2013 01:18 PM, Alex Buckley wrote:
> On 3/26/2013 10:26 AM, Joe Darcy wrote:
>> Related to updating the annotation processing specification to account
>> for JSR 308, I wanted to quickly double-check on the implementation
>> status of retrieving declaration annotations on type parameters.
>>
>> Is this functionally currently supported in either the javax.lang.model
>> API or in core reflection?
>
> The JBS bugs for type annotations reflection are:
>
>   JDK-8004698 Implement Core Reflection for Type Annotations
>   JDK-8007803 Implement javax.lang.model API for Type Annotations
>
> For core reflection, the actions called for in [1] have been 
> implemented. j.l.r.TypeVariable has a new method getAnnotatedBounds(), 
> and the implementation of TypeVariable implements AnnotatedElement fully.
>
> For the language model, the actions called for in [1] are still 
> applicable even with the placement of annotations directly on 
> Element's and TypeMirror's [2]. I don't see changes to 
> getTypeParameters() in the langtools changeset linked from JDK-8007803.
>
> Alex
>
> [1] 
> http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2012-September/000001.html 
>
>
> [2] 
> http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2013-February/000064.html


When using the tip of TL with some local changes, the behavior I'm 
seeing is that declaration annotations on type parameters are *not* 
being retrieved from the AnnotedConstruct methods when called on a 
TypeParameterElement. I wanted to double check if this was the expected 
behavior right now or if I should continue to look for operator error on 
my part. (I see there are some langtools tests which reference 
TYPE_PARAMETER, but I haven't traced through what they test.)

-Joe

From joel.franck at oracle.com  Wed Mar 27 01:43:46 2013
From: joel.franck at oracle.com (=?ISO-8859-1?Q?Joel_Borggr=E9n-Franck?=)
Date: Wed, 27 Mar 2013 09:43:46 +0100
Subject: Status of retrieving annotations on type parameters?
In-Reply-To: <51520EB6.7060007@oracle.com>
References: <5151DA28.2020000@oracle.com> <51520282.4040700@oracle.com>
	<51520EB6.7060007@oracle.com>
Message-ID: <5152B142.8080605@oracle.com>

Hi Joe,

While I haven't looked into this in detail I'm not surprised if the behavior 
for declaration annotations on Type Parameters isn't behaving 100% just yet. 
It feels like the odd case.

cheers
/Joel

On 03/26/2013 10:10 PM, Joe Darcy wrote:
> On 03/26/2013 01:18 PM, Alex Buckley wrote:
>> On 3/26/2013 10:26 AM, Joe Darcy wrote:
>>> Related to updating the annotation processing specification to account
>>> for JSR 308, I wanted to quickly double-check on the implementation
>>> status of retrieving declaration annotations on type parameters.
>>>
>>> Is this functionally currently supported in either the javax.lang.model
>>> API or in core reflection?
>>
>> The JBS bugs for type annotations reflection are:
>>
>>   JDK-8004698 Implement Core Reflection for Type Annotations
>>   JDK-8007803 Implement javax.lang.model API for Type Annotations
>>
>> For core reflection, the actions called for in [1] have been implemented.
>> j.l.r.TypeVariable has a new method getAnnotatedBounds(), and the
>> implementation of TypeVariable implements AnnotatedElement fully.
>>
>> For the language model, the actions called for in [1] are still applicable
>> even with the placement of annotations directly on Element's and
>> TypeMirror's [2]. I don't see changes to getTypeParameters() in the
>> langtools changeset linked from JDK-8007803.
>>
>> Alex
>>
>> [1]
>> http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2012-September/000001.html
>>
>>
>> [2]
>> http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2013-February/000064.html
>>
>
>
> When using the tip of TL with some local changes, the behavior I'm seeing is
> that declaration annotations on type parameters are *not* being retrieved
> from the AnnotedConstruct methods when called on a TypeParameterElement. I
> wanted to double check if this was the expected behavior right now or if I
> should continue to look for operator error on my part. (I see there are some
> langtools tests which reference TYPE_PARAMETER, but I haven't traced through
> what they test.)
>
> -Joe

From joel.franck at oracle.com  Thu Mar 28 07:59:37 2013
From: joel.franck at oracle.com (=?iso-8859-1?Q?Joel_Borggr=E9n-Franck?=)
Date: Thu, 28 Mar 2013 15:59:37 +0100
Subject: Status of retrieving annotations on type parameters?
In-Reply-To: <5152B142.8080605@oracle.com>
References: <5151DA28.2020000@oracle.com> <51520282.4040700@oracle.com>
	<51520EB6.7060007@oracle.com> <5152B142.8080605@oracle.com>
Message-ID: <13943707-19A4-4C41-8CB0-7A4A5D0E81ED@oracle.com>

Hi All,

On 27 mar 2013, at 09:43, Joel Borggr?n-Franck  wrote:
> 
> On 03/26/2013 10:10 PM, Joe Darcy wrote:

>> When using the tip of TL with some local changes, the behavior I'm seeing is
>> that declaration annotations on type parameters are *not* being retrieved
>> from the AnnotedConstruct methods when called on a TypeParameterElement. I
>> wanted to double check if this was the expected behavior right now or if I
>> should continue to look for operator error on my part. (I see there are some
>> langtools tests which reference TYPE_PARAMETER, but I haven't traced through
>> what they test.)
>> 
>> -Joe

This is due to type annotations being stored as

1)  type attributes since they are going to be emitted in Runtime[In}VisibleTypeAnnotations

and

2) the type attributes are stored on the owning class or method symbol.

I made a quick fix for this, see inline patch. I'm not sure this is the proper way and I don't have time at the moment to find out, but if it is urgent to you you should be able to work with this patch. If it isn't that urgent I will fix this week after next.

cheers
/Joel

diff -r 33b6a52f0037 src/share/classes/com/sun/tools/javac/code/Symbol.java

--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Tue Mar 26 18:15:24 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Mar 28 15:51:33 2013 +0100
@@ -466,7 +466,7 @@
      * This is the implementation for {@code
      * javax.lang.model.element.Element.getAnnotationMirrors()}.
      */
-    public final List getAnnotationMirrors() {
+    public List getAnnotationMirrors() {
         return getRawAttributes();
     }
 
@@ -474,7 +474,7 @@
      * TODO: Should there be a {@code
      * javax.lang.model.element.Element.getTypeAnnotationMirrors()}.
      */
-    public final List getTypeAnnotationMirrors() {
+    public List getTypeAnnotationMirrors() {
         return getRawTypeAttributes();
     }
 
@@ -658,6 +658,22 @@
                 return ct.interfaces_field;
             }
         }
+
+        @Override
+        public List getAnnotationMirrors() {
+            return onlyTypeParameterAnnos(owner.getRawTypeAttributes());
+        }
+ 
+        private List onlyTypeParameterAnnos(List candidates) {
+            // Declaration annotations on TypeParameters are stored in type attributes
+            List res = List.nil();
+            for (Attribute.TypeCompound a : candidates)
+                if (a.position.type == TargetType.CLASS_TYPE_PARAMETER ||
+                    a.position.type == TargetType.METHOD_TYPE_PARAMETER)
+                    res = res.prepend(a);
+
+            return res = res.reverse();
+        }
     }
 
     /** A class for package symbols
diff -r 33b6a52f0037 src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java
--- a/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java	Tue Mar 26 18:15:24 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java	Thu Mar 28 15:51:33 2013 +0100
@@ -33,10 +33,13 @@
 import com.sun.tools.javac.code.Kinds;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.code.Symbol.TypeSymbol;
+import com.sun.tools.javac.code.TargetType;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Type.AnnotatedType;
 import com.sun.tools.javac.util.ListBuffer;
 import static com.sun.tools.javac.code.TypeTag.CLASS;
+import com.sun.tools.javac.util.List;
 
 /**
  * Utility methods for operating on annotated constructs.
@@ -61,8 +64,12 @@
             throw new IllegalArgumentException("Not an annotation type: "
                                                + annoType);
         Attribute.Compound c;
-        if (annotated.kind == Kinds.TYP && annotated instanceof ClassSymbol) {
+        if (annotated.kind == Kinds.TYP &&
+                annotated instanceof ClassSymbol) {
             c = getAttributeOnClass((ClassSymbol)annotated, annoType);
+        } else if (annotated.kind == Kinds.TYP &&
+                   annotated instanceof TypeSymbol) {
+            c = getAttributeOnTypeSym((TypeSymbol)annotated, annoType);
         } else {
             c = getAttribute(annotated, annoType);
         }
@@ -83,8 +90,32 @@
     }
 
     // Helper to getAnnotation[s]
+    private static  Attribute.Compound
+            getAttributeOnTypeSym(TypeSymbol annotated, Class annoType) {
+        String name = annoType.getName();
+ 
+        // Declaration annotations on TypeParameters are stored in type attributes
+        // on the owner of the TypeSymbol
+        List res = List.nil();
+        List candidates = annotated.owner.getRawTypeAttributes();
+        for (Attribute.TypeCompound a : candidates)
+            if (a.position.type == TargetType.CLASS_TYPE_PARAMETER ||
+                a.position.type == TargetType.METHOD_TYPE_PARAMETER)
+                res = res.prepend(a);
+
+        res = res.reverse();
+
+        for (Attribute.Compound anno : res) {
+            if (name.equals(anno.type.tsym.flatName().toString()))
+                return anno;
+        }
+
+        return null;
+    }
+    
+    // Helper to getAnnotation[s]
     private static  Attribute.Compound getAttributeOnClass(ClassSymbol annotated,
-                                                                Class annoType) {
+            Class annoType) {
         boolean inherited = annoType.isAnnotationPresent(Inherited.class);
         Attribute.Compound result = null;
         while (annotated.name != annotated.name.table.names.java_lang_Object) {

From joe.darcy at oracle.com  Thu Mar 28 11:49:16 2013
From: joe.darcy at oracle.com (Joe Darcy)
Date: Thu, 28 Mar 2013 11:49:16 -0700
Subject: Status of retrieving annotations on type parameters?
In-Reply-To: <13943707-19A4-4C41-8CB0-7A4A5D0E81ED@oracle.com>
References: <5151DA28.2020000@oracle.com> <51520282.4040700@oracle.com>
	<51520EB6.7060007@oracle.com> <5152B142.8080605@oracle.com>
	<13943707-19A4-4C41-8CB0-7A4A5D0E81ED@oracle.com>
Message-ID: <515490AC.8060701@oracle.com>

On 03/28/2013 07:59 AM, Joel Borggr?n-Franck wrote:
> Hi All,
>
> On 27 mar 2013, at 09:43, Joel Borggr?n-Franck  wrote:
>> On 03/26/2013 10:10 PM, Joe Darcy wrote:
>>> When using the tip of TL with some local changes, the behavior I'm seeing is
>>> that declaration annotations on type parameters are *not* being retrieved
>>> from the AnnotedConstruct methods when called on a TypeParameterElement. I
>>> wanted to double check if this was the expected behavior right now or if I
>>> should continue to look for operator error on my part. (I see there are some
>>> langtools tests which reference TYPE_PARAMETER, but I haven't traced through
>>> what they test.)
>>>
>>> -Joe
> This is due to type annotations being stored as
>
> 1)  type attributes since they are going to be emitted in Runtime[In}VisibleTypeAnnotations
>
> and
>
> 2) the type attributes are stored on the owning class or method symbol.
>
> I made a quick fix for this, see inline patch. I'm not sure this is the proper way and I don't have time at the moment to find out, but if it is urgent to you you should be able to work with this patch. If it isn't that urgent I will fix this week after next.

Hi Joel,

Thanks for the patch! With the patch and some quick hacks to the javac 
implementation of javax.lang.model.util.Elements, I'm able to make 
progress on coding up the annotation processing machinery to account for 
annotations on type parameters.

-Joe



From wdietl at gmail.com  Sun Mar 31 11:35:41 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Sun, 31 Mar 2013 18:35:41 +0000
Subject: hg: type-annotations/type-annotations/langtools: 14 new changesets
Message-ID: <20130331183631.ABB86484EB@hg.openjdk.java.net>

Changeset: d9dfab2045f4
Author:    wmdietl
Date:      2013-03-25 15:22 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d9dfab2045f4

Improve output of nested types.

! src/share/classes/com/sun/tools/javac/code/Printer.java

Changeset: d052c5306df2
Author:    wmdietl
Date:      2013-03-26 18:27 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d052c5306df2

Maintain declaration and type annotations through conversion of lambdas to methods.

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

Changeset: fdf30b225e1c
Author:    mfang
Date:      2013-03-25 16:55 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/fdf30b225e1c

8010521: jdk8 l10n resource file translation update 2
Reviewed-by: naoto, yhuang

! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
! src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
! src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
! src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
! src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
! src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties
! src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
! src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
! src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties

Changeset: 65e1ca8dcdc7
Author:    mfang
Date:      2013-03-25 18:08 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/65e1ca8dcdc7

Merge


Changeset: 9d59efc8cb4f
Author:    wmdietl
Date:      2013-03-26 18:28 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9d59efc8cb4f

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools

! src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
! src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties

Changeset: 0830284d56fb
Author:    wmdietl
Date:      2013-03-26 18:32 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0830284d56fb

jdk-8009360 by Steve Sides: make a test case actually fail.

! test/tools/javac/annotations/typeAnnotations/failures/T8009360.java

Changeset: 0826f546fbdd
Author:    wmdietl
Date:      2013-03-31 11:33 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0826f546fbdd

Simplify handling of anonymous class - preventing an assertion violation and still passing previous tests.
Expand test case to not depend on repeating annotations.

! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! test/tools/javac/annotations/typeAnnotations/failures/T8009360.java

Changeset: 330b35b27e68
Author:    darcy
Date:      2013-03-26 17:17 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/330b35b27e68

7041251: Use j.u.Objects utility methods in langtools
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/util/Pair.java
! src/share/classes/javax/annotation/processing/AbstractProcessor.java

Changeset: 33b6a52f0037
Author:    darcy
Date:      2013-03-26 18:15 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/33b6a52f0037

7059170: Assume availablility of URLClassLoader.close
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
- src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java

Changeset: 7bebe17ff323
Author:    mcimadamore
Date:      2013-03-28 11:38 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7bebe17ff323

8010469: Bad assertion in LambdaToMethod
Summary: Add assertion in LambdaToMethod.serializedLambdaName
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

Changeset: a200d8ccfe47
Author:    mcimadamore
Date:      2013-03-28 11:39 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a200d8ccfe47

8010490: FindBugs: double assignments in LambdaToMethod.visitIdent
Summary: Remove dead code from LambdaToMethod
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

Changeset: 991f11e13598
Author:    jjg
Date:      2013-03-28 10:49 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/991f11e13598

8006346: doclint should make allowance for headers generated by standard doclet
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/doclint/Checker.java
! src/share/classes/com/sun/tools/doclint/DocLint.java
! src/share/classes/com/sun/tools/doclint/Env.java
! src/share/classes/com/sun/tools/javac/main/Main.java
! src/share/classes/com/sun/tools/javadoc/DocEnv.java
+ test/tools/javac/doclint/ImplicitHeadersTest.java
+ test/tools/javadoc/doclint/ImplicitHeadersTest.java

Changeset: d3648557391b
Author:    jjg
Date:      2013-03-28 10:58 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d3648557391b

8010511: Tests are creating files in /tmp
Reviewed-by: darcy

! test/tools/javac/T6558476.java
! test/tools/javac/T6900149.java
! test/tools/javac/diags/CheckExamples.java
! test/tools/javac/diags/RunExamples.java

Changeset: a41491fd7864
Author:    wmdietl
Date:      2013-03-31 11:34 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a41491fd7864

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/share/classes/javax/annotation/processing/AbstractProcessor.java


From wdietl at gmail.com  Sun Mar 31 11:36:44 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Sun, 31 Mar 2013 18:36:44 +0000
Subject: hg: type-annotations/type-annotations/nashorn: 7 new changesets
Message-ID: <20130331183650.981B4484EC@hg.openjdk.java.net>

Changeset: 3b0a0d9d51f0
Author:    sundar
Date:      2013-03-18 21:03 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/3b0a0d9d51f0

8010199: javax.script.Invocable implementation for nashorn does not return null when matching functions are missing
Reviewed-by: lagergren, jlaskey

! bin/jjs
! bin/jjssecure
! bin/nashorn
! bin/nashornsecure
! src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+ test/script/basic/JDK-8010199.js
! test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java

Changeset: 606a1946e3e2
Author:    jlaskey
Date:      2013-03-19 11:03 -0300
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/606a1946e3e2

8009969: CodeCoverage should use template
Reviewed-by: jlaskey, sundar
Contributed-by: pavel.stepanov at oracle.com

! make/build.xml
! make/code_coverage.xml
! make/project.properties

Changeset: 4be452026847
Author:    attila
Date:      2013-03-23 00:58 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/4be452026847

8010652: Eliminate non-child references in Block/FunctionNode, and make few node types immutable
Reviewed-by: jlaskey, lagergren

! make/project.properties
! src/jdk/nashorn/internal/codegen/Attr.java
! src/jdk/nashorn/internal/codegen/ClassEmitter.java
! src/jdk/nashorn/internal/codegen/CodeGenerator.java
! src/jdk/nashorn/internal/codegen/CompilationPhase.java
! src/jdk/nashorn/internal/codegen/Compiler.java
! src/jdk/nashorn/internal/codegen/FinalizeTypes.java
! src/jdk/nashorn/internal/codegen/FoldConstants.java
! src/jdk/nashorn/internal/codegen/FunctionSignature.java
! src/jdk/nashorn/internal/codegen/Lower.java
! src/jdk/nashorn/internal/codegen/MethodEmitter.java
! src/jdk/nashorn/internal/codegen/Splitter.java
! src/jdk/nashorn/internal/codegen/WeighNodes.java
! src/jdk/nashorn/internal/ir/AccessNode.java
! src/jdk/nashorn/internal/ir/Assignment.java
! src/jdk/nashorn/internal/ir/BaseNode.java
! src/jdk/nashorn/internal/ir/BinaryNode.java
! src/jdk/nashorn/internal/ir/Block.java
! src/jdk/nashorn/internal/ir/BreakNode.java
! src/jdk/nashorn/internal/ir/CallNode.java
! src/jdk/nashorn/internal/ir/CaseNode.java
! src/jdk/nashorn/internal/ir/CatchNode.java
! src/jdk/nashorn/internal/ir/ContinueNode.java
! src/jdk/nashorn/internal/ir/DoWhileNode.java
! src/jdk/nashorn/internal/ir/EmptyNode.java
! src/jdk/nashorn/internal/ir/ExecuteNode.java
! src/jdk/nashorn/internal/ir/ForNode.java
! src/jdk/nashorn/internal/ir/FunctionNode.java
! src/jdk/nashorn/internal/ir/IdentNode.java
! src/jdk/nashorn/internal/ir/IfNode.java
! src/jdk/nashorn/internal/ir/IndexNode.java
! src/jdk/nashorn/internal/ir/LabelNode.java
+ src/jdk/nashorn/internal/ir/LexicalContext.java
! src/jdk/nashorn/internal/ir/LineNumberNode.java
! src/jdk/nashorn/internal/ir/LiteralNode.java
! src/jdk/nashorn/internal/ir/Location.java
! src/jdk/nashorn/internal/ir/Node.java
! src/jdk/nashorn/internal/ir/ObjectNode.java
! src/jdk/nashorn/internal/ir/PropertyNode.java
- src/jdk/nashorn/internal/ir/ReferenceNode.java
! src/jdk/nashorn/internal/ir/ReturnNode.java
! src/jdk/nashorn/internal/ir/RuntimeNode.java
! src/jdk/nashorn/internal/ir/SplitNode.java
! src/jdk/nashorn/internal/ir/SwitchNode.java
! src/jdk/nashorn/internal/ir/Symbol.java
! src/jdk/nashorn/internal/ir/TernaryNode.java
! src/jdk/nashorn/internal/ir/ThrowNode.java
! src/jdk/nashorn/internal/ir/TryNode.java
! src/jdk/nashorn/internal/ir/TypeOverride.java
! src/jdk/nashorn/internal/ir/UnaryNode.java
! src/jdk/nashorn/internal/ir/VarNode.java
! src/jdk/nashorn/internal/ir/WhileNode.java
! src/jdk/nashorn/internal/ir/WithNode.java
! src/jdk/nashorn/internal/ir/debug/JSONWriter.java
! src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
! src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
! src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
! src/jdk/nashorn/internal/parser/Parser.java
! src/jdk/nashorn/internal/runtime/Context.java
! src/jdk/nashorn/internal/runtime/resources/Messages.properties
! test/script/basic/JDK-8006755.js
! test/script/basic/NASHORN-837.js
! test/src/jdk/nashorn/internal/codegen/CompilerTest.java

Changeset: ae4ef3102d9c
Author:    lagergren
Date:      2013-03-25 12:01 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/ae4ef3102d9c

8017010: index evaluation to a temporary location for index operator much change temporaries to slots, but never scoped vars
Reviewed-by: hannesw, sundar

! src/jdk/nashorn/internal/codegen/Attr.java
! src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
! src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java
+ test/script/basic/JDK-8017010.js
+ test/script/basic/JDK-8017010.js.EXPECTED
! test/script/basic/NASHORN-258.js
! test/script/basic/NASHORN-258.js.EXPECTED

Changeset: 15dac7439921
Author:    sundar
Date:      2013-03-25 18:20 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/15dac7439921

8010709: org on the top level doesn't resolve
Reviewed-by: lagergren, hannesw

! src/jdk/nashorn/internal/objects/Global.java
+ test/script/basic/JDK-8010709.js

Changeset: 43e40c08e7f8
Author:    lagergren
Date:      2013-03-26 08:42 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/43e40c08e7f8

8010706: -Dnashorn.args system property to create command lines to wrapped nashorn.jar:s
Reviewed-by: hannesw, sundar

! docs/DEVELOPER_README
! src/jdk/nashorn/internal/runtime/options/Options.java

Changeset: ed60078f0a80
Author:    sundar
Date:      2013-03-26 18:26 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/ed60078f0a80

8010720: Linkage problem with java.lang.String.length()
Reviewed-by: hannesw, lagergren

! src/jdk/nashorn/internal/objects/NativeString.java
! src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+ test/script/basic/JDK-8010720.js


From wdietl at gmail.com  Sun Mar 31 11:37:24 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Sun, 31 Mar 2013 18:37:24 +0000
Subject: hg: type-annotations/type-annotations/corba: 3 new changesets
Message-ID: <20130331183729.B8590484ED@hg.openjdk.java.net>

Changeset: c3ec80715805
Author:    mfang
Date:      2013-03-25 16:53 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/c3ec80715805

8010521: jdk8 l10n resource file translation update 2
Reviewed-by: naoto, yhuang

! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
! src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp
! src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp
! src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp
! src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp

Changeset: 910af9c3f338
Author:    mfang
Date:      2013-03-25 18:03 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/910af9c3f338

Merge


Changeset: 925a697da0bf
Author:    wmdietl
Date:      2013-03-31 11:37 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/925a697da0bf

Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba



From wdietl at gmail.com  Sun Mar 31 11:35:43 2013
From: wdietl at gmail.com (wdietl at gmail.com)
Date: Sun, 31 Mar 2013 18:35:43 +0000
Subject: hg: type-annotations/type-annotations/jdk: 16 new changesets
Message-ID: <20130331184208.1F36D484EE@hg.openjdk.java.net>

Changeset: 3470101fae58
Author:    weijun
Date:      2013-03-23 11:49 +0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3470101fae58

8009970: Several LoginModule classes need extra permission to load AuthResources
Reviewed-by: mullan

! src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
! src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
! src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java

Changeset: ed63cace1d30
Author:    weijun
Date:      2013-03-23 11:49 +0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ed63cace1d30

8009875: Provide a default udp_preference_limit for krb5.conf
Reviewed-by: valeriep

! src/share/classes/sun/security/krb5/KdcComm.java
! src/share/classes/sun/security/krb5/internal/Krb5.java
! test/sun/security/krb5/auto/KDC.java
+ test/sun/security/krb5/config/DefUdpLimit.java

Changeset: d92a96dcbfe1
Author:    sundar
Date:      2013-03-25 19:25 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d92a96dcbfe1

8010704: The test closed/java/lang/SecurityManager/CheckPackageDefinition.java failed after fix for 8009869
Reviewed-by: lagergren, hannesw

! src/share/lib/security/java.security-linux
! src/share/lib/security/java.security-solaris

Changeset: 5d0c891264bf
Author:    chegar
Date:      2013-03-25 14:29 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5d0c891264bf

8010668: builtin JNI libraries should not be unloaded
Reviewed-by: chegar, alanb
Contributed-by: Bill Pittore 

! src/share/native/java/lang/ClassLoader.c

Changeset: 5e383a73386a
Author:    mchung
Date:      2013-03-25 17:19 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5e383a73386a

8007703: Remove com.sun.servicetag API
Reviewed-by: dholmes, alanb, erikj

! make/com/sun/Makefile
! make/common/Release.gmk
! makefiles/CopyFiles.gmk
! makefiles/CopyIntoClasses.gmk
! makefiles/CreateJars.gmk
! makefiles/GensrcProperties.gmk
! makefiles/profile-includes.txt
! makefiles/profile-rtjar-includes.txt
! test/Makefile

Changeset: 335d2156222e
Author:    mchung
Date:      2013-03-25 18:14 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/335d2156222e

8010787: changeset for 8007703 is missing the deleted files
Reviewed-by: dholmes, alanb, erikj

- make/com/sun/servicetag/Makefile
- src/share/classes/com/sun/servicetag/BrowserSupport.java
- src/share/classes/com/sun/servicetag/Installer.java
- src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java
- src/share/classes/com/sun/servicetag/RegistrationData.java
- src/share/classes/com/sun/servicetag/RegistrationDocument.java
- src/share/classes/com/sun/servicetag/Registry.java
- src/share/classes/com/sun/servicetag/ServiceTag.java
- src/share/classes/com/sun/servicetag/SolarisServiceTag.java
- src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java
- src/share/classes/com/sun/servicetag/SunConnection.java
- src/share/classes/com/sun/servicetag/SystemEnvironment.java
- src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java
- src/share/classes/com/sun/servicetag/Util.java
- src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java
- src/share/classes/com/sun/servicetag/package.html
- src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt
- src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties
- src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties
- src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties
- src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties
- src/share/classes/com/sun/servicetag/resources/jdk_header.png
- src/share/classes/com/sun/servicetag/resources/product_registration.xsd
- src/share/classes/com/sun/servicetag/resources/register.html
- src/share/classes/com/sun/servicetag/resources/register_ja.html
- src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
- test/com/sun/servicetag/DeleteServiceTag.java
- test/com/sun/servicetag/DuplicateNotFound.java
- test/com/sun/servicetag/FindServiceTags.java
- test/com/sun/servicetag/InstanceUrnCheck.java
- test/com/sun/servicetag/InvalidRegistrationData.java
- test/com/sun/servicetag/InvalidServiceTag.java
- test/com/sun/servicetag/JavaServiceTagTest.java
- test/com/sun/servicetag/JavaServiceTagTest1.java
- test/com/sun/servicetag/NewRegistrationData.java
- test/com/sun/servicetag/SvcTagClient.java
- test/com/sun/servicetag/SystemRegistryTest.java
- test/com/sun/servicetag/TestLoadFromXML.java
- test/com/sun/servicetag/UpdateServiceTagTest.java
- test/com/sun/servicetag/Util.java
- test/com/sun/servicetag/ValidRegistrationData.java
- test/com/sun/servicetag/environ.properties
- test/com/sun/servicetag/missing-environ-field.xml
- test/com/sun/servicetag/newer-registry-version.xml
- test/com/sun/servicetag/registration.xml
- test/com/sun/servicetag/servicetag1.properties
- test/com/sun/servicetag/servicetag2.properties
- test/com/sun/servicetag/servicetag3.properties
- test/com/sun/servicetag/servicetag4.properties
- test/com/sun/servicetag/servicetag5.properties

Changeset: 3b56ef8e1ce1
Author:    martin
Date:      2013-03-26 13:34 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3b56ef8e1ce1

8007905: To add a system property to create zip file without using ZIP64 end table when entry count > 64k
Summary: Provide a system property to inhibit ZIP64 mode for >64k entries
Reviewed-by: alanb, sherman

! src/share/classes/java/util/zip/ZipOutputStream.java
+ test/java/util/zip/EntryCount64k.java

Changeset: 266b43683a2c
Author:    martin
Date:      2013-03-26 13:36 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/266b43683a2c

8010316: Improve handling of char sequences containing surrogates
Summary: Fix and optimize codePointAt, codePointBefore and similar methods
Reviewed-by: sherman, okutsu, ulfzibis, kizune

! src/share/classes/java/lang/AbstractStringBuilder.java
! src/share/classes/java/lang/Character.java
! test/java/lang/StringBuilder/Supplementary.java

Changeset: caafe6dca35d
Author:    ehelin
Date:      2013-03-21 20:35 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/caafe6dca35d

8009427: Re-enable tests that were disable to ease complicated push
Reviewed-by: sla, mchung, dcubed
Contributed-by: Erik Helin 

! test/ProblemList.txt

Changeset: 49602f599c08
Author:    dxu
Date:      2013-03-27 09:00 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/49602f599c08

8010837: FileInputStream.available() throw IOException when encountering negative available values
Summary: Remove the check in the native code to allow negative values
Reviewed-by: mchung

! src/solaris/native/java/io/io_util_md.c
+ test/java/io/FileInputStream/NegativeAvailable.java

Changeset: ae03282ba501
Author:    darcy
Date:      2013-03-27 09:38 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ae03282ba501

7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations
Reviewed-by: mduigou, jfranck

! src/share/classes/sun/reflect/annotation/AnnotationType.java

Changeset: d254a5f9b93f
Author:    acorn
Date:      2013-03-27 13:40 -0400
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d254a5f9b93f

8010846: Update the corresponding test in test/vm/verifier/TestStaticIF.java
Summary: Remove test flag -XX:-UseSplitVerifier, not supported classfile 52
Reviewed-by: acorn, hseigel

! test/vm/verifier/TestStaticIF.java

Changeset: 811c771acf65
Author:    sundar
Date:      2013-03-28 14:36 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/811c771acf65

8010991: Enable test/javax/script/GetInterfaceTest.java again
Reviewed-by: lagergren, hannesw

! test/javax/script/GetInterfaceTest.java

Changeset: a87fac00915e
Author:    weijun
Date:      2013-03-28 20:27 +0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a87fac00915e

8010125: keytool -importkeystore could create a pkcs12 keystore with different storepass and keypass
Reviewed-by: vinnie

! src/share/classes/sun/security/tools/keytool/Main.java
! src/share/classes/sun/security/tools/keytool/Resources.java
+ test/sun/security/tools/keytool/p12importks.sh

Changeset: e433ed08b733
Author:    mchung
Date:      2013-03-28 13:14 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e433ed08b733

8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level
Reviewed-by: mchung
Contributed-by: peter.levart at gmail.com, bourges.laurent at gmail.com

! src/share/classes/sun/util/logging/PlatformLogger.java
! test/sun/util/logging/PlatformLoggerTest.java

Changeset: db6491d48403
Author:    wmdietl
Date:      2013-03-31 11:35 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/db6491d48403

Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk



From wdietl at gmail.com  Sun Mar 31 12:35:28 2013
From: wdietl at gmail.com (Werner Dietl)
Date: Sun, 31 Mar 2013 12:35:28 -0700
Subject: Problem in jdk8/tl: defined in an inaccessible class or interface
Message-ID: 

Take this simple example:

public class IterableTest {
    interface Data extends Iterable { }

    void test(Iterable t) {
        for(Object a: t.iterator().next());
    }
}

It compiles without errors using javac 1.6.0_27, 1.7.0_15, and 1.8.0 b82.
However, using the current jdk8/tl version results in:

IterableTest.java:5: error: iterator() in Iterable is defined in an
inaccessible class or interface
        for(Object a: t.iterator().next());
                                       ^
  where T is a type-variable:
    T extends Object declared in interface Iterable
1 error

Is this a desired error?
Can the error message be improved to highlight better what is wrong?

Thanks for any help,
cu, WMD.

-- 
http://www.google.com/profiles/wdietl

