From alex.buckley at oracle.com Tue Sep 3 12:56:11 2013 From: alex.buckley at oracle.com (Alex Buckley) Date: Tue, 03 Sep 2013 12:56:11 -0700 Subject: Request for comments: type annotations on nested types In-Reply-To: References: <51BF6A42.9000106@oracle.com> Message-ID: <52263EDB.3070103@oracle.com> Given: class Top { static class Outer { class Inner {} static class SInner {} interface IInner {} } } I realized that the draft 308 JLS was not in agreement with: @TB Outer f1; @TB Outer.Inner f1a; @TB Outer.SInner f2a; // err @TB Outer.IInner f3a; // err Each of these is a local variable declaration that provides a "type context" where a type is used. This makes sense if you consider that the LocalVariableDeclaration production uses Type, not TypeName. The spec allows @TB in all the positions shown above. However, we want to say that parts of a nested type may not be annotated if the type overall refers to a static member. I need to add that in the draft. (This is different than a field access like "Outer.SInner.f". The locations where it can appear are not deemed to be type contexts, so no part of the TypeName "Outer.SInner" can be annotated by TYPE_USE annotations.) Alex On 6/18/2013 3:55 PM, Werner Dietl wrote: > Thanks for these comments, Alex. > > In the language model, there is no TypeMirror for some of these, so > you would have a TYPE_USE annotation according to the bytecode which > is not represented in the language model. > (I found javac inconsistent in when Outer had a Type and when not. > I'll write up a small test case and send that out separately.) > > I will not push my updates until the EG decided the desired behavior. > > Failing tests T8008762.java and TestAnonInnerClasses.java are waiting > on this discussion: > http://mail.openjdk.java.net/pipermail/type-annotations-dev/2013-April/000782.html > > There are some refactorings of the Annotations code in the pipeline > and I suggest we look at these issues again after those refactorings. > > cu, WMD. > > On Mon, Jun 17, 2013 at 12:57 PM, Alex Buckley wrote: >> // For simplicity, sending solely to type-annotations-dev. >> >> In what follows, I intend to be precise in talking about _names_ rather than >> _types_. I am not even going to say "type use" because without some >> forthcoming JLS changes, it's not precise enough. I am going to speak solely >> about qualified names composed of simple names. >> >> The goal of JSR 308 is that a simple name that acts merely as a "scoping >> mechanism" may not be annotated. >> >> Thus, in a qualified package name like "java.lang", neither the simple >> package name "java" nor the simple package name "lang" may be annotated. >> >> And, in a qualified type name like "A.B", the simple type name "A" may not >> be annotated if the simple type name "B" refers to a static member. That is, >> "A" may not be annotated if the type referred to by "B" does not have an >> enclosing instance. >> >> As I look through the fine scenarios in CantAnnotateStaticClass2 (since >> CantAnnotateStaticClass3 is just a demo that all member declarations in an >> interface are static), javac looks to be applying the rules correctly: >> >> @TB Outer f1; >> @TB Outer.Inner f1a; >> @TB Outer.SInner f2a; // err >> @TB Outer.IInner f3a; // err >> >> The problem is, it's rather subtle for the language to work like this: >> >> @TB Outer. @TC Inner f1c; >> @TB Outer. @TC SInner f2c; // err >> @TB Outer. @TC IInner f3c; // err >> >> The ClassFile representation of annotations on qualified type names does not >> care whether the underlying declarations are static. Personally, I am >> inclined to drop the "scoping mechanism" rule and allow a TYPE_USE >> annotation on any simple type name. (I would not, at this stage of the JSR, >> extend such freedom to simple type names in class-oriented expressions like >> class literals and qualified this expressions, because storing annotations >> thereon would require ClassFile changes.) I intend to discuss this with the >> EG when practical. >> >> Alex >> >> >> On 6/16/2013 4:06 PM, Werner Dietl wrote: >>> >>> Dear all, >>> >>> I've been working on type annotations on nested types and want to make >>> sure I'm implementing the right checks. >>> >>> Find three test classes attached that should contain all legal >>> combinations of nesting of types. >>> Instead of a .out file, see "// err" markers for the lines that I expect >>> errors. >>> CantAnnotateStaticClass.java contains only legal combinations; see >>> tests 2 and 3 for error cases. >>> My interpretation is basically that, if it is possible to refer to a >>> "Outer.this" object, it should be possible to have a type annotation >>> on that type use. >>> >>> Does everybody agree with this interpretation? >>> Do you see any errors in my test cases? >>> Do you see a way to write the test cases in a more succinct and complete >>> way? >>> >>> I have a few local changes that refactor this part of the compiler. >>> I'll push once we agree on the checks. >>> >>> Thanks for all comments! >>> cu, WMD. >>> >>> -- >>> http://www.google.com/profiles/wdietl >>> >> > > > From steve.sides at oracle.com Wed Sep 4 12:40:37 2013 From: steve.sides at oracle.com (Steve Sides) Date: Wed, 04 Sep 2013 12:40:37 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <522120AD.8080506@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> Message-ID: <52278CB5.4030005@oracle.com> .after screwing up the webrev a little (it didn't scp like I thought it would), I created a new one: http://cr.openjdk.java.net/~ssides/8010225.2/ with this changes: >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java I made the sorta unnecessary changes, since these are supposed to test test-annotations. Like you said, they're not wrong. :) >test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java added positive test case of @compile AnnotationVersion.java >test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java I agree, these are kind of bad syntax with or without any anntations, so I deleted the test. >test/tools/javac/annotations/typeAnnotations/failures/OldArray.java added out file and ref= to test file. >test/tools/javac/annotations/typeAnnotations/failures/Scopes.java I didn't mean to do more. Since I had them all loaded into an editor, as I clicked through them, I made it a 4 space indent. It's a superfluous but not incorrect change. >test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java corrected usage (compile with no annotations) and added other static contexts and updated .out file. >test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java deleted in lieue of above changes. -steve On 8/30/2013 3:46 PM, Jonathan Gibbons wrote: > On 08/08/2013 05:48 PM, Steve Sides wrote: >> Some changes for JDK-8010225 : test in typeAnnotations/failures do >> not test TYPE_USE >> Bug: http://bugs.sun.com/view_bug.do?bug_id=8010225 >> webrev: http://cr.openjdk.java.net/~ssides/8010225/ >> >> This fix is for tl/langtools but since it's all type-annotations test >> I've posted it here. >> >> -steve > > > Here's the list of files: > > test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java > > OK. Edit is sorta unnecessary, but not wrong. > > test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java > > OK. Edit is sorta unnecessary, but not wrong. > > test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java > > OK. Edit is sorta unnecessary, but not wrong. > > test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java > > test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out > > test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out > > Test is only negative for 6, 7. Would be better to add positive test > without -source as well > > test/tools/javac/annotations/typeAnnotations/failures/BadCast.java > test/tools/javac/annotations/typeAnnotations/failures/BadCast.out > OK > > test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java > > test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out > > OK > > test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java > > test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out > OK > > test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java > > test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out > > *** There's no varargs in this test, so this test is kinda weird > As it stands, it's sort of a random syntax error test. > > test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java > test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out > OK > > test/tools/javac/annotations/typeAnnotations/failures/OldArray.java > *** The test passes without changing the golden file. This is unexpected. > The answer is because there is no /ref=...OldArray.out on line 29. > This should be fixed, and then, you'll need to create a golden file! > Also, remove the legal header and substitute /nodynamiccopyright/. > > test/tools/javac/annotations/typeAnnotations/failures/Scopes.java > *** You've just removed a space from the line, nothing more. > Did you mean to do more? > > test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java > test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out > *** Sorta OK, but not really. The test runs the risk of false positive > because f is not itself declared static. Thus, quite apart from the > annotation, you are trying to do static access to a non-static field, > which is guaranteed to fail. > > test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java > test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out > This test is kinda pointless because the code fails even without the > annotation. > i.e. remove the annotation and the test still fails to compile. From steve.sides at oracle.com Thu Sep 5 10:04:17 2013 From: steve.sides at oracle.com (Steve Sides) Date: Thu, 05 Sep 2013 10:04:17 -0700 Subject: type-annotations/jdk ws out of sync Message-ID: <5228B991.7000606@oracle.com> Hi Werner, The type-annotations/jdk workspace seems to be a little out of date and need to be sync'd up. I notice tests failing in nightly testing (we still test type-anntations nightly builds) from jdk/test/tools that should not be there. thanks, -steve From wdietl at gmail.com Thu Sep 5 14:58:08 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 05 Sep 2013 21:58:08 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 2 new changesets Message-ID: <20130905215811.A4773625E0@hg.openjdk.java.net> Changeset: b5ff11e00050 Author: sundar Date: 2013-09-04 14:29 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/b5ff11e00050 8024120: Setting __proto__ to null removes the __proto__ property Reviewed-by: lagergren, attila ! src/jdk/nashorn/internal/runtime/ScriptObject.java ! src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js ! test/script/basic/JDK-8023368.js ! test/script/basic/JDK-8023368.js.EXPECTED + test/script/basic/JDK-8024120.js ! test/script/basic/circular_proto.js ! test/script/basic/nonextensible_proto_assign.js Changeset: e43ab4062636 Author: sundar Date: 2013-09-04 19:58 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/e43ab4062636 8024174: Setting __proto__ property in Object literal should be supported Reviewed-by: jlaskey, lagergren ! src/jdk/nashorn/internal/codegen/CodeGenerator.java ! src/jdk/nashorn/internal/runtime/ScriptObject.java + test/script/basic/JDK-8024174.js From wdietl at gmail.com Thu Sep 5 14:56:41 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 05 Sep 2013 21:56:41 +0000 Subject: hg: type-annotations/type-annotations: 2 new changesets Message-ID: <20130905215642.464BA625DF@hg.openjdk.java.net> Changeset: 6d7f27953da6 Author: mduigou Date: 2013-09-03 15:23 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/6d7f27953da6 8024200: handle hg wrapper with space after #! Reviewed-by: tbell ! common/bin/hgforest.sh Changeset: da11a0dc8ec7 Author: wmdietl Date: 2013-09-05 14:56 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/da11a0dc8ec7 Automated merge with http://hg.openjdk.java.net/jdk8/tl/ From wdietl at gmail.com Thu Sep 5 14:59:02 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 05 Sep 2013 21:59:02 +0000 Subject: hg: type-annotations/type-annotations/corba: 2 new changesets Message-ID: <20130905215905.263EF625E1@hg.openjdk.java.net> Changeset: af8e5bc3a150 Author: coffeys Date: 2013-09-03 22:35 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/af8e5bc3a150 8017195: Introduce option to setKeepAlive parameter on CORBA sockets Reviewed-by: chegar, msheppar ! src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java Changeset: 66779fbebe03 Author: wmdietl Date: 2013-09-05 14:58 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/66779fbebe03 Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba From wdietl at gmail.com Thu Sep 5 14:54:38 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 05 Sep 2013 21:54:38 +0000 Subject: hg: type-annotations/type-annotations/jdk: 25 new changesets Message-ID: <20130905220024.9BD2A625E3@hg.openjdk.java.net> Changeset: 5b01c851bb1d Author: dxu Date: 2013-08-30 16:45 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5b01c851bb1d 8023765: Improve MaxPathLength.java testcase and reduce its test load 7160013: java/io/File/MaxPathLength.java fails Reviewed-by: alanb ! test/ProblemList.txt ! test/java/io/File/MaxPathLength.java Changeset: ead6babac5a9 Author: xuelei Date: 2013-09-01 20:00 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ead6babac5a9 8024068: sun/security/ssl/javax/net/ssl/ServerName/IllegalSNIName.java fails Reviewed-by: weijun ! test/sun/security/ssl/javax/net/ssl/ServerName/IllegalSNIName.java Changeset: 441da45931fa Author: chegar Date: 2013-09-02 14:02 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/441da45931fa 8024103: AtomicLongArray getAndAccumulate/accumulateAndGet have int type for new value arg Reviewed-by: alanb, psandoz ! src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java Changeset: 92d594a938ff Author: dfuchs Date: 2013-09-02 18:28 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/92d594a938ff 8016127: NLS: logging.properties translatability recommendation 8024131: Issues with cached localizedLevelName in java.util.logging.Level Summary: This fix updates logging.properties resource bundles to follow internationalization guidelines. It also fixes a caching issue with localizedLevelName. The regression test that was added needs both fixes to pass. Reviewed-by: mchung, alanb ! src/share/classes/java/util/logging/Level.java ! src/share/classes/sun/util/logging/resources/logging.properties ! src/share/classes/sun/util/logging/resources/logging_de.properties ! src/share/classes/sun/util/logging/resources/logging_es.properties ! src/share/classes/sun/util/logging/resources/logging_fr.properties ! src/share/classes/sun/util/logging/resources/logging_it.properties ! src/share/classes/sun/util/logging/resources/logging_ja.properties ! src/share/classes/sun/util/logging/resources/logging_ko.properties ! src/share/classes/sun/util/logging/resources/logging_pt_BR.properties ! src/share/classes/sun/util/logging/resources/logging_sv.properties ! src/share/classes/sun/util/logging/resources/logging_zh_CN.properties ! src/share/classes/sun/util/logging/resources/logging_zh_TW.properties + test/java/util/logging/LocalizedLevelName.java Changeset: a7d463f5a5b9 Author: egahlin Date: 2013-09-02 16:03 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a7d463f5a5b9 7172176: java/jconsole test/sun/tools/jconsole/ImmutableResourceTest.sh failing Reviewed-by: mchung, mfang ! src/share/classes/sun/tools/jconsole/Resources.java ! test/ProblemList.txt - test/sun/tools/jconsole/ImmutableResourceTest.java - test/sun/tools/jconsole/ImmutableResourceTest.sh ! test/sun/tools/jconsole/ResourceCheckTest.java ! test/sun/tools/jconsole/ResourceCheckTest.sh Changeset: 4bdbe25b1e04 Author: mduigou Date: 2013-09-03 11:29 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4bdbe25b1e04 8024015: TEST.groups: move jdk/lambda tests from jdk_other to jdk_lang Reviewed-by: alanb, mchung ! test/TEST.groups Changeset: 77a8c4ad516c Author: henryjen Date: 2013-08-28 14:13 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/77a8c4ad516c 8022176: Weaken contract of java.lang.AutoCloseable Reviewed-by: alanb, martin, mduigou, psandoz Contributed-by: brian.goetz at oracle.com ! src/share/classes/java/lang/AutoCloseable.java Changeset: 3db3ae4e0853 Author: henryjen Date: 2013-09-03 11:44 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3db3ae4e0853 8024178: Difference in Stream.collect(Collector) methods located in jdk8 and jdk8-lambda repos Reviewed-by: mduigou ! src/share/classes/java/util/stream/DelegatingStream.java ! src/share/classes/java/util/stream/ReferencePipeline.java ! src/share/classes/java/util/stream/Stream.java Changeset: 2e8d51a5596b Author: henryjen Date: 2013-09-03 12:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2e8d51a5596b 8017513: Support for closeable streams 8022237: j.u.s.BaseStream.onClose() has an issue in implementation or requires spec clarification 8022572: Same exception instances thrown from j.u.stream.Stream.onClose() handlers are not listed as suppressed Summary: BaseStream implements AutoCloseable; Remove CloseableStream and DelegatingStream Reviewed-by: alanb, mduigou, psandoz Contributed-by: brian.goetz at oracle.com ! src/share/classes/java/nio/file/Files.java ! src/share/classes/java/util/stream/AbstractPipeline.java ! src/share/classes/java/util/stream/BaseStream.java - src/share/classes/java/util/stream/CloseableStream.java - src/share/classes/java/util/stream/DelegatingStream.java ! src/share/classes/java/util/stream/DoublePipeline.java ! src/share/classes/java/util/stream/DoubleStream.java ! src/share/classes/java/util/stream/IntPipeline.java ! src/share/classes/java/util/stream/IntStream.java ! src/share/classes/java/util/stream/LongPipeline.java ! src/share/classes/java/util/stream/LongStream.java ! src/share/classes/java/util/stream/ReferencePipeline.java ! src/share/classes/java/util/stream/Stream.java ! src/share/classes/java/util/stream/Streams.java ! test/java/nio/file/Files/StreamTest.java ! test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestScenario.java ! test/java/util/stream/bootlib/java/util/stream/IntStreamTestScenario.java ! test/java/util/stream/bootlib/java/util/stream/LongStreamTestScenario.java ! test/java/util/stream/bootlib/java/util/stream/StreamTestScenario.java + test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java Changeset: 5920155dd080 Author: coffeys Date: 2013-09-03 22:37 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5920155dd080 8017195: Introduce option to setKeepAlive parameter on CORBA sockets Reviewed-by: chegar, msheppar + test/com/sun/corba/transport/KeepAliveSockets.java Changeset: 06b01083ebd7 Author: henryjen Date: 2013-09-03 16:05 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/06b01083ebd7 8023997: j.l.String.join(java.lang.CharSequence, java.lang.Iterable) sample doesn't compile and is incorrect Reviewed-by: alanb ! src/share/classes/java/lang/String.java Changeset: 2cdd1078f45b Author: dholmes Date: 2013-09-03 23:47 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2cdd1078f45b 8024140: [TESTBUG] Profile based regression test groups for jdk repo Reviewed-by: alanb, chegar ! test/TEST.groups Changeset: 4bdbd1fabea4 Author: rfield Date: 2013-09-03 21:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4bdbd1fabea4 8008688: Make MethodHandleInfo public Summary: A major overhaul to MethodHandleInfo and method handles in general. Reviewed-by: vlivanov, twisti Contributed-by: john.r.rose at oracle.com ! src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java + src/share/classes/java/lang/invoke/InfoFromMemberName.java ! src/share/classes/java/lang/invoke/Invokers.java ! src/share/classes/java/lang/invoke/MemberName.java ! src/share/classes/java/lang/invoke/MethodHandle.java ! src/share/classes/java/lang/invoke/MethodHandleImpl.java ! src/share/classes/java/lang/invoke/MethodHandleInfo.java ! src/share/classes/java/lang/invoke/MethodHandleNatives.java ! src/share/classes/java/lang/invoke/MethodHandles.java ! src/share/classes/java/lang/invoke/SerializedLambda.java ! test/java/lang/invoke/7087570/Test7087570.java + test/java/lang/invoke/RevealDirectTest.java + test/java/lang/invoke/jtreg.security.policy Changeset: 462c5589bc1a Author: psandoz Date: 2013-08-12 12:22 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/462c5589bc1a 8024182: test/java/util/Arrays/SetAllTest.java fails to compile due to recent compiler changes Summary: Use explicit lambda due to javac simplfying rules for overload resolution with implicit lambdas Reviewed-by: alanb, mduigou ! test/java/util/Arrays/SetAllTest.java Changeset: d62c911aebbb Author: psandoz Date: 2013-09-04 09:34 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d62c911aebbb 8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black) 8012913: LinkedHashMap key/value/entry spliterators should report ORDERED Reviewed-by: mduigou, forax, bchristi, alanb Contributed-by: Doug Lea
, Paul Sandoz ! src/share/classes/java/util/HashMap.java ! src/share/classes/java/util/LinkedHashMap.java ! test/java/lang/reflect/Generics/Probe.java ! test/java/util/Map/CheckRandomHashSeed.java ! test/java/util/Map/InPlaceOpsCollisions.java + test/java/util/Map/MapBinToFromTreeTest.java - test/java/util/Map/TreeBinSplitBackToEntries.java ! test/java/util/Spliterator/SpliteratorCharacteristics.java Changeset: 336784cd60c3 Author: alanb Date: 2013-09-04 11:40 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/336784cd60c3 8008981: Deprecate SecurityManager checkTopLevelWindow, checkSystemClipboardAccess, checkAwtEventQueueAccess Reviewed-by: anthony, art, mchung ! src/macosx/classes/sun/lwawt/LWToolkit.java ! src/share/classes/java/awt/TextComponent.java ! src/share/classes/java/awt/Toolkit.java ! src/share/classes/java/awt/Window.java ! src/share/classes/java/awt/event/InputEvent.java ! src/share/classes/java/lang/SecurityManager.java ! src/share/classes/sun/applet/AppletSecurity.java ! src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java ! src/share/classes/sun/swing/SwingUtilities2.java ! src/solaris/classes/sun/awt/X11/XToolkit.java ! src/windows/classes/sun/awt/windows/WToolkit.java + test/java/awt/security/Permissions.java Changeset: ac6e99af2056 Author: dfuchs Date: 2013-09-04 15:32 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ac6e99af2056 6823527: java.util.logging.Handler has thread safety issues Reviewed-by: dholmes, mchung ! src/share/classes/java/util/logging/ConsoleHandler.java ! src/share/classes/java/util/logging/FileHandler.java ! src/share/classes/java/util/logging/Handler.java ! src/share/classes/java/util/logging/MemoryHandler.java ! src/share/classes/java/util/logging/SocketHandler.java ! src/share/classes/java/util/logging/StreamHandler.java Changeset: b3d6953b9829 Author: dfuchs Date: 2013-09-04 16:22 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b3d6953b9829 8019853: Break logging and AWT circular dependency Summary: Break logging and AWT circular dependency, which was at the root cause for 8023258 - Logger.getLogger() after ImageIO.read() returns different logger instance Reviewed-by: mchung, art ! src/share/classes/java/util/logging/LogManager.java ! src/share/classes/sun/awt/AppContext.java ! src/share/classes/sun/misc/JavaAWTAccess.java ! src/share/classes/sun/misc/SharedSecrets.java ! test/java/util/logging/TestAppletLoggerContext.java + test/java/util/logging/TestLoggingWithMainAppContext.java Changeset: 478afc30679b Author: sherman Date: 2013-09-04 12:35 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/478afc30679b 6341345: (spec) Console.reader() should make it clear that the reader requires line termination Summary: to clarify the spec Reviewed-by: alanb ! src/share/classes/java/io/Console.java Changeset: c6a4df06d57e Author: sherman Date: 2013-09-04 12:37 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c6a4df06d57e 7186632: NLS t13y issue on jar.properties file Summary: to remove the redundant backslash Reviewed-by: naoto ! src/share/classes/sun/tools/jar/resources/jar.properties Changeset: bd6fcc5eebb8 Author: rfield Date: 2013-09-04 19:47 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bd6fcc5eebb8 8020816: Metafactory crashes on code with method reference 8021050: MethodHandleInfo throws exception when method handle is to a method with @CallerSensitive Summary: Fixed by 8008688 - this is a test to confirm the above fixed Reviewed-by: vlivanov + test/jdk/lambda/MethodReferenceTestCallerSensitive.java Changeset: af1b08ff48ae Author: jbachorik Date: 2013-09-05 13:04 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/af1b08ff48ae 8023464: test/closed/sun/tracing/ProviderProxyTest.java failing Summary: Don't rely on assertions when an Exception suits better Reviewed-by: alanb, dfuchs, sjiang ! src/share/classes/sun/tracing/ProviderSkeleton.java Changeset: 9522b5e836d3 Author: jbachorik Date: 2013-09-05 14:34 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9522b5e836d3 8004179: Few of test/java/lang/management/ThreadMXBean/* tests don't clean up the created threads Summary: Just run those tests in "othervm" mode. Reviewed-by: alanb, dfuchs, sjiang ! test/java/lang/management/ThreadMXBean/LockedMonitors.java ! test/java/lang/management/ThreadMXBean/LockedSynchronizers.java ! test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java ! test/java/lang/management/ThreadMXBean/SharedSynchronizer.java ! test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java Changeset: 4c711ef41bfa Author: naoto Date: 2013-09-05 10:14 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4c711ef41bfa 8023943: Method description fix for String.toLower/UpperCase() methods Reviewed-by: okutsu ! src/share/classes/java/lang/String.java Changeset: ce5e0af4b1f5 Author: wmdietl Date: 2013-09-05 14:54 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ce5e0af4b1f5 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From wdietl at gmail.com Thu Sep 5 14:48:23 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 05 Sep 2013 21:48:23 +0000 Subject: hg: type-annotations/type-annotations/langtools: 26 new changesets Message-ID: <20130905214950.C7349625DE@hg.openjdk.java.net> Changeset: 2d42e2fe1729 Author: wmdietl Date: 2013-08-28 17:23 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2d42e2fe1729 Patch http://cr.openjdk.java.net/~jjg/8023722/webrev.00/langtools.patch by Jon. ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java ! src/share/classes/com/sun/tools/javac/code/Types.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/javadoc/AnnotatedTypeImpl.java ! src/share/classes/com/sun/tools/javadoc/TypeMaker.java ! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Changeset: 7de7100c30ce Author: henryjen Date: 2013-08-28 10:17 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7de7100c30ce 8014566: Remove @ignore tags from MethodReference66 and InInterface when 8013875 is fixed Reviewed-by: briangoetz, jjg ! test/tools/javac/lambda/MethodReference66.java ! test/tools/javac/lambda/lambdaExecution/InInterface.java Changeset: 189942cdf585 Author: jjg Date: 2013-08-28 15:40 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/189942cdf585 8010310: [javadoc] Error processing sources with -private Reviewed-by: vromero, mcimadamore ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java + test/tools/javadoc/nonConstExprs/Test.java Changeset: 0e6577980181 Author: jjg Date: 2013-08-29 11:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0e6577980181 8001669: javadoc internal DocletAbortException should set cause when appropriate Reviewed-by: darcy ! src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java ! src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Changeset: b0b25c1f6cbd Author: jjg Date: 2013-08-29 11:57 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/b0b25c1f6cbd 8023522: tools/javac/tree/TypeAnnotationsPretty.java test cases with @TA newline fail on windows only Reviewed-by: darcy ! test/tools/javac/tree/TypeAnnotationsPretty.java Changeset: 9c0e192c0926 Author: jjg Date: 2013-08-29 12:03 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9c0e192c0926 8013384: Potential infinite loop in javadoc Reviewed-by: darcy ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Changeset: 96b6865eda94 Author: jjg Date: 2013-08-29 12:11 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/96b6865eda94 8022744: javac -Xpkginfo command's documentation is sparse Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/main/Option.java Changeset: 23f0f3c9c44a Author: jjg Date: 2013-08-29 19:19 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/23f0f3c9c44a 8023833: Replace direct use of AnnotatedType in javadoc code Reviewed-by: darcy ! src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java ! src/share/classes/com/sun/tools/javadoc/TypeMaker.java ! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Changeset: 240f424cc0d5 Author: jjg Date: 2013-08-30 11:48 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/240f424cc0d5 8023700: Use non breaking space in various labels Reviewed-by: bpatel ! src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java ! test/com/sun/javadoc/testNavigation/TestNavigation.java ! test/com/sun/javadoc/testProfiles/TestProfiles.java Changeset: 3dd40e5715fb Author: jjg Date: 2013-08-30 15:14 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/3dd40e5715fb 8024093: Two *.rej files checked in to langtools/test directory Reviewed-by: mchung - test/tools/javac/diags/examples/MrefStat.java.rej - test/tools/javac/diags/examples/MrefStat1.java.rej Changeset: dd64288f5659 Author: bpatel Date: 2013-08-30 15:59 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/dd64288f5659 7198273: RFE : Javadoc Accessibility : Hyperlinks should contain text or an image with alt text Reviewed-by: jjg ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css ! test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java ! test/com/sun/javadoc/testNavigation/TestNavigation.java Changeset: 7a2fe98cb0e6 Author: bpatel Date: 2013-08-30 16:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7a2fe98cb0e6 8015882: Javadoc prints NPE when using Taglet Reviewed-by: jjg ! src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java ! test/com/sun/javadoc/testLegacyTaglet/C.java + test/com/sun/javadoc/testLegacyTaglet/Check.java ! test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Changeset: 4eb8e0c0f3cc Author: wmdietl Date: 2013-08-30 16:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4eb8e0c0f3cc Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/TypeMaker.java ! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Changeset: f050c714b556 Author: jjg Date: 2013-08-30 16:27 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f050c714b556 8008367: Sub-packages missing from Profiles javadoc Reviewed-by: bpatel ! src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Changeset: b25e387481dc Author: bpatel Date: 2013-08-30 16:38 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/b25e387481dc 8022738: doclet should only generate functional interface text if source >= 8 Reviewed-by: jjg ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/DocEnv.java ! test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java + test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java Changeset: 7993cfab8610 Author: jjg Date: 2013-08-30 17:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7993cfab8610 8015663: Need to supply tests to provide javadoc for profiles support code coverage Reviewed-by: jjg Contributed-by: evgeniya.stepanova at oracle.com ! test/com/sun/javadoc/testProfiles/TestProfiles.java + test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java ! test/com/sun/javadoc/testProfiles/pkg2/Class1Pkg2.java + test/com/sun/javadoc/testProfiles/pkg2/ClassError.java + test/com/sun/javadoc/testProfiles/pkg2/ClassException.java + test/com/sun/javadoc/testProfiles/pkgDeprecated/Class1PkgDeprecated.java + test/com/sun/javadoc/testProfiles/pkgDeprecated/package-info.java ! test/com/sun/javadoc/testProfiles/profile-rtjar-includes.txt Changeset: e8ecac296b50 Author: wmdietl Date: 2013-08-31 13:44 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e8ecac296b50 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Changeset: 4a6acc42c3a1 Author: vromero Date: 2013-09-02 22:38 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4a6acc42c3a1 8016177: structural most specific and stuckness Reviewed-by: jjg, vromero Contributed-by: maurizio.cimadamore at oracle.com ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/code/Lint.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java ! src/share/classes/com/sun/tools/javac/comp/Infer.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/util/GraphUtils.java ! src/share/classes/com/sun/tools/javac/util/List.java ! test/tools/javac/Diagnostics/compressed/T8012003c.out ! test/tools/javac/diags/examples/BadArgTypesInLambda.java - test/tools/javac/diags/examples/CyclicInference.java ! test/tools/javac/diags/examples/IncompatibleArgTypesInMethodRef.java + test/tools/javac/diags/examples/PotentiallyAmbiguousOverload.java + test/tools/javac/lambda/8016177/T8016177a.java + test/tools/javac/lambda/8016177/T8016177a.out + test/tools/javac/lambda/8016177/T8016177b.java + test/tools/javac/lambda/8016177/T8016177b.out + test/tools/javac/lambda/8016177/T8016177c.java + test/tools/javac/lambda/8016177/T8016177c.out + test/tools/javac/lambda/8016177/T8016177d.java + test/tools/javac/lambda/8016177/T8016177e.java + test/tools/javac/lambda/8016177/T8016177f.java + test/tools/javac/lambda/8016177/T8016177g.java + test/tools/javac/lambda/8016177/T8016177g.out ! test/tools/javac/lambda/BadRecovery.out ! test/tools/javac/lambda/ErroneousLambdaExpr.java + test/tools/javac/lambda/ErroneousLambdaExpr.out ! test/tools/javac/lambda/MethodReference22.out ! test/tools/javac/lambda/MethodReference23.out ! test/tools/javac/lambda/MethodReference41.java + test/tools/javac/lambda/MethodReference41.out ! test/tools/javac/lambda/MethodReference42.java + test/tools/javac/lambda/MethodReference42.out ! test/tools/javac/lambda/MethodReference43.java + test/tools/javac/lambda/MethodReference43.out ! test/tools/javac/lambda/MethodReference44.java + test/tools/javac/lambda/MethodReference44.out ! test/tools/javac/lambda/MethodReference46.java + test/tools/javac/lambda/MethodReference46.out ! test/tools/javac/lambda/MethodReference47.java ! test/tools/javac/lambda/MethodReference47.out ! test/tools/javac/lambda/MethodReference48.java + test/tools/javac/lambda/MethodReference48.out ! test/tools/javac/lambda/MethodReference70.out ! test/tools/javac/lambda/MethodReference71.out ! test/tools/javac/lambda/MostSpecific04.java + test/tools/javac/lambda/MostSpecific04.out ! test/tools/javac/lambda/MostSpecific05.java + test/tools/javac/lambda/MostSpecific05.out ! test/tools/javac/lambda/MostSpecific08.java + test/tools/javac/lambda/MostSpecific08.out ! test/tools/javac/lambda/TargetType01.java + test/tools/javac/lambda/TargetType01.out ! test/tools/javac/lambda/TargetType02.java + test/tools/javac/lambda/TargetType02.out ! test/tools/javac/lambda/TargetType10.java - test/tools/javac/lambda/TargetType10.out ! test/tools/javac/lambda/TargetType21.java ! test/tools/javac/lambda/TargetType21.out ! test/tools/javac/lambda/TargetType24.java ! test/tools/javac/lambda/TargetType24.out ! test/tools/javac/lambda/TargetType26.out ! test/tools/javac/lambda/TargetType27.out ! test/tools/javac/lambda/TargetType39.out ! test/tools/javac/lambda/TargetType43.out ! test/tools/javac/lambda/TargetType66.java ! test/tools/javac/lambda/TargetType66.out ! test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java - test/tools/javac/lambda/typeInference/InferenceTest5.java + test/tools/javac/lambda/typeInference/InferenceTest6.java ! test/tools/javac/lambda/typeInference/InferenceTest_neg1_2.out - test/tools/javac/lambda/typeInference/InferenceTest_neg5.java - test/tools/javac/lambda/typeInference/InferenceTest_neg5.out ! test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java Changeset: 2bf4c132bf90 Author: vromero Date: 2013-09-02 22:44 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2bf4c132bf90 8022162: Incorrect signature determination for certain inner class generics Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java + test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java Changeset: fb5a846c4a49 Author: vromero Date: 2013-09-03 23:31 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/fb5a846c4a49 8023389: Javac fails to infer type for lambda used with intersection type and wildcards Reviewed-by: jjg, vromero Contributed-by: maurizio.cimadamore at oracle.com ! src/share/classes/com/sun/tools/javac/comp/Attr.java + test/tools/javac/lambda/8023389/T8023389.java Changeset: 9be0afbdf244 Author: vromero Date: 2013-09-03 23:41 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9be0afbdf244 8023545: Misleading error message when using diamond operator with private constructor Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Resolve.java + test/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.java + test/tools/javac/T8023545/MisleadingErrorMsgDiamondPlusPrivateCtorTest.out Changeset: 438547d895dc Author: vromero Date: 2013-09-04 00:01 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/438547d895dc 8023549: Compiler emitting spurious errors when constructor reference type is inferred and explicit type arguments are supplied Reviewed-by: jjg, vromero Contributed-by: maurizio.cimadamore at oracle.com ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties + test/tools/javac/diags/examples/MrefInferAndExplicitParams.java + test/tools/javac/lambda/8023549/T8023549.java + test/tools/javac/lambda/8023549/T8023549.out Changeset: b94824ddcbb6 Author: vromero Date: 2013-09-04 11:53 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/b94824ddcbb6 8008275: javac.Main should be @Supported Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/Main.java Changeset: 044721d4d359 Author: jjg Date: 2013-09-04 14:44 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/044721d4d359 8024288: javadoc generated-by comment should always be present Reviewed-by: bpatel ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java ! test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Changeset: a76c663a9cac Author: jfranck Date: 2013-09-05 11:27 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a76c663a9cac 8023974: Drop 'implements Completer' and 'implements SourceCompleter' from ClassReader resp. JavaCompiler. Reviewed-by: jjg, jfranck Contributed-by: Andreas Lundblad ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javadoc/JavadocTool.java Changeset: a8c716a4a39f Author: wmdietl Date: 2013-09-05 14:48 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a8c716a4a39f Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/code/Lint.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/Infer.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/util/List.java From charlie.wang at oracle.com Fri Sep 6 00:11:51 2013 From: charlie.wang at oracle.com (Charlie Wang) Date: Fri, 06 Sep 2013 15:11:51 +0800 Subject: Review request for type annotation reflection test In-Reply-To: <521B9E2B.1000205@oracle.com> References: <51986CBC.2000107@oracle.com> <519AE246.80500@oracle.com> <519B4807.1040007@oracle.com> <519BBBE4.5020009@oracle.com> <519BE728.4050806@oracle.com> <519C214D.20802@oracle.com> <519C2582.6040401@oracle.com> <51AC3A30.6000706@oracle.com> <51AD1017.9050703@oracle.com> <51B93177.6050005@oracle.com> <51BFCB2D.6000706@oracle.com> <51C0D79A.3020105@oracle.com> <51C165FC.10300@oracle.com> <51C23CED.6050801@oracle.com> <51F9CFF1.3000304@oracle.com> <51FC46F5.7010101@oracle.com> <5201C3B3.3080708@oracle.com> <52027D5A.6030701@oracle.com> <52034881.1000108@oracle.com> <5203CFF0.80707@oracle.com> <52132F2D.80402@oracle.com> <52165BE3.8060703@oracle.com> <52173B11.6020503@oracle.com> <521B07A4.8020306@oracle.com> <521B9E2B.1000205@oracle.com> Message-ID: <52298037.4050408@oracle.com> Hi Sergey, I've updated my code according to your comments. Please take a look again. http://cr.openjdk.java.net/~pzhang/Charlie/TypeAnnotation1/webrev/ P.S. When updating Helper.isPkgInfoPresent with: return files.stream().map(JavaFileObject::getName).anyMatch(name -> name.contains("package-info") || name.contains("PkgAnno")); There is a compile error. So the code stays the original way. Due to the urgency of the test, I will file a RFE bug to track it and update the piece of code when time allows. - Charlie On 2013/8/27 2:27, Sergey Grinev wrote: > Hi Charlie, > > please, take a look at few inline comments. > > -- Sergey > > On 26-Aug-13 11:45, Charlie Wang wrote: >> Hi Alex, >> I think I will need to make update according to Sergey's comments >> before check in the code. >> >> Sergey, >> Thanks for the comments. My reply inline. >> >> On 2013/8/23 18:36, Sergey Grinev wrote: >>> Hi, all. >>> >>> Sorry if this review covers same issue I reported on reviewboard >>> one, but it seems few important point were not fixed: >>> >>> 1. public Map lhm = new LinkedHashMap<>(); >>> and >>> public synchronized static String genDeclaration( >>> Map input, Declaration... >>> srcType) >>> >>> - fields used as a method-local temporary variables are error-prone >>> and confusing. Users/readers of that code are not aware when this >>> field can be used or when this field can be cleared, also using such >>> field is not thread-safe. Imagine someone added one more ENUM value >>> to TestCase, used lhm and didn't call lhm.clear() -- things will >>> break and very different place this person didn't even touch. >>> >>> - Map claims it stores Objects but actually they are only String and >>> String[]. Thus your getDeclaration() has invalid signature and is >>> error-prone. Also you calls instanceof several times to resolve this >>> ambiguity which is considered to be an anti-pattern as well. >>> >>> You can solve these problems by introducing separate entity >>> responsible for declaration generation: >>> >>> public class DeclarationGenerator { >>> >>> private final Map lhm = new >>> LinkedHashMap<>(); >>> public void add(Helper.Declaration key, String... value) { >>> lhm.put(key, value); >>> } >>> public String genDeclaration(Declaration... srcType) { >>> //... >>> for (Declaration st : Declaration.values()) { >>> if (input.containsKey(st)) >>> result.append(st.getSrc(input.get(st))); >>> } >>> //... >>> } >>> } >>> >>> with this helper class instead of >>> >>> lhm.clear(); >>> lhm.put(Helper.Declaration.IMPORT, null); >>> lhm.put(Helper.Declaration.CLASS, str[0]); >>> testCode += Helper.genDeclaration(lhm); >>> >>> you can write >>> >>> DeclarationGenerator dg = new >>> DeclarationGenerator(); // not to reuse, create new one for each >>> generation >>> dg.put(Helper.Declaration.IMPORT, null); >>> dg.put(Helper.Declaration.CLASS, str[0]); >>> testCode += dg.genDeclaration(); >>> >>> having clean design without field used as temporary variable and >>> type ambiguity. >>> >> I agree with you. I will update the code accordingly. >> >>> >>> 2. several TestCase enum entries, especially TESTBASECLSSTART and >>> TESTBASECLS are copypasted in several places. >> I will remove the duplications. > > You may want to consider using separate enum for all your cases (or > one per package). > >> >>> >>> 3. public static Map testInput = new LinkedHashMap<>(); >>> >>> why this field in static? >>> >> Made it static for enum methods to access directly. > > Oh I missed usages of this field, sorry. Current approach isn't the > best from OOD point of view. You have static field cleaned in > constructor and field being reused from the code outside of the > AnnotationTest. This leads to uncontrollable logic flow and > impossibility of parallel invocation. > > The convenient approach would be > 1) either having this field non-static and provide instance of > AnnotationTest or testInput as parameter to each genTestCase() call. > 2) or using anonymous classes (or even lambdas) instead of enum, which > allows convenient access to "this" without statics: > > private final static TestCaseGenerator TESTBASECLSSTART1 = (String > str) -> { > testInput.put(null, null); // testInput not static > > // other code > > return ""; > }; > > P.S.: AnnotationTest.GenTestCode() method should be *g*enTestCode() by > common Java code guidelines. > >> >> >> And as to the other comments from you: >> >>> 1. Helper#getAnno() >>> >>> StringBuffer result = new StringBuffer(""); >>> >>> using StringBuilder is recommended for thread-safe methods >> Agree. >> >>> >>> 2. List Helper.getMultipleAT() >>> >>> this method uses List where List can be specified >> Good check. >> >>> >>> 3. Helper.compareAnnoWithDiffSeq() >>> >>> this can be done much shorted and without copying array to list: >>> >>> String[] split1 = anno1.trim().split("\\s+"); >>> String[] split2 = anno2.trim().split("\\s+"); >>> Arrays.sort(split1); >>> Arrays.sort(split2); >>> return Arrays.equals(split1, split2); >> OK. >> >>> >>> 4. Helper.compileCode():697-704 can be simplified using jdk8 streams: >>> >>> ok = diagnostics.getDiagnostics().stream().anyMatch(d -> d.getKind() >>> == Diagnostic.Kind.ERROR); >> I didn't adopt it because I wasn't sure if I supposed to use this new >> jdk8 feature in this jdk8 test. Bus since Tristan also suggested it >> is doable, I will update my code this way. >> >>> >>> 5. Same for Helper.isPkgInfoPresent: >>> >>> return files.stream().map(JavaFileObject::getName).anyMatch(name -> >>> name.contains("package-info") || name.contains("PkgAnno")); >> OK. >> >>> >>> 6. AnnotatedArrayTypeGetAnnotatedGenericComponentTypeTest:175 >>> >>> You are calling Helper.getArrAT(at) then split it by ";" and work >>> with result. >>> while Helper.getArrAT() takes a list and convert it into string: >>> return getAnno(annotations) + ";" + ret; >>> >>> It may be more efficient to work directly with lists. >> The expected results (to be compared with test results) also come as >> strings because they are directly extracted from the test input, >> which is why I made it "getAnno(annotations) + ";" + ret" - so I >> don't have to split the result into lists. Either way, the conversion >> has to be made. The present way is more direct. >> >>> >>> 7. DeclarationGenerator interface is never used as interface >> I don't think it hurts to put an interface there. At least it will >> help extension. > Agree. >> >>> >>> 8. Helper.Declaration.replaceAnnoStr should be static >> Isn't it static already. > > http://cr.openjdk.java.net/~pzhang/Charlie/TypeAnnotation1/webrev/raw_files/new/test/type-annotations/Helper.java > > > private String[] replaceAnnoStr(String ss, String temp, > > > Seems no. >> >>> >>> 9. Helper.Declaration.replaceAnnoStr/getFirstAnno return result as >>> String[] array, which is considered to be a bad practice (you are >>> using variable length structure to store exactly 2 values). It would >>> be cleaner to introduce intermediate structure of 2 string to store >>> return value. >> Then I will have to declare a new class for the two strings. > > But that's the point. It would be class with fields with meaningful > names instead of [0] and [1]. Anyone who will be > supporting/fixing/using your code in future would be grateful for > that. And you will avoid using array to store fixed length data which > considered to be a bad practice. > > Thanks, > > Sergey. > >> >> >> I will update my code according to most of your comments. Could you >> please reply to me asap if you think there's anything missing. >> Hopefully we can wrap things up within the week. >> >> >> >> - Charlie >> >> >>> >>> On 22-Aug-13 22:43, Alex Buckley wrote: >>>> I have no further comments. Thanks for all your work to test this >>>> new and expansive API. >>>> >>>> Alex >>>> >>>> On 8/20/2013 1:56 AM, Charlie Wang wrote: >>>>> Hi Alex, >>>>> I used testInput.size() instead of static int clsIdx as suffix >>>>> this >>>>> time. And other update according to your comments. >>>>> >>>>> Here's the link. Please review again. >>>>> http://cr.openjdk.java.net/~pzhang/Charlie/TypeAnnotation1/webrev/ >>>>> >>>>> >>>>> - Charlie >>>>> >>>>> On 2013/8/9 1:05, Alex Buckley wrote: >>>>>> - AnnotationTest.i/clsIdx: it wasn't the name of the variable I was >>>>>> objecting to. It was the fact that you're relying on a mutable >>>>>> public >>>>>> static variable at all. >>>>>> >>>>>> - GenTestCode should take Class, so you >>>>>> don't need to cast to TestCaseGenerator in GenTestCode. (Same >>>>>> comment >>>>>> for AnnotationTest.compileCode). >>>>>> >>>>>> - AnnotationTest.testInput is a Map but I'm sure you >>>>>> can do better than Object for keys.' >>>>>> >>>>>> - ExecutableGetAnnotatedParameterTypesTest.testInput hides >>>>>> AnnotationTest.testInput, but swaps the order of the type arguments! >>>>>> Map is either wrong, or should not use Object. >>>>>> >>>>>> Alex >>> >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130906/47e25645/attachment.html From wdietl at gmail.com Sat Sep 7 15:19:33 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:19:33 +0000 Subject: hg: type-annotations/type-annotations/corba: 4 new changesets Message-ID: <20130907221937.235F862658@hg.openjdk.java.net> Changeset: 2e3a056c84a7 Author: cl Date: 2013-08-29 09:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/2e3a056c84a7 Added tag jdk8-b105 for changeset 4e38de7c767e ! .hgtags Changeset: 23fc34133152 Author: cl Date: 2013-09-05 02:45 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/23fc34133152 Added tag jdk8-b106 for changeset 2e3a056c84a7 ! .hgtags Changeset: 4853dc082c7d Author: lana Date: 2013-09-06 14:15 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/4853dc082c7d Merge Changeset: c5678212dd26 Author: wmdietl Date: 2013-09-07 15:19 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/c5678212dd26 Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba ! .hgtags From wdietl at gmail.com Sat Sep 7 15:19:56 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:19:56 +0000 Subject: hg: type-annotations/type-annotations/jaxp: 3 new changesets Message-ID: <20130907222007.AE67162659@hg.openjdk.java.net> Changeset: d3be8e3b429d Author: cl Date: 2013-08-29 09:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/d3be8e3b429d Added tag jdk8-b105 for changeset 09a46ec11f88 ! .hgtags Changeset: d6a32e3831aa Author: cl Date: 2013-09-05 02:45 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/d6a32e3831aa Added tag jdk8-b106 for changeset d3be8e3b429d ! .hgtags Changeset: 6700c3ce1cdc Author: wmdietl Date: 2013-09-07 15:19 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/6700c3ce1cdc Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxp ! .hgtags From wdietl at gmail.com Sat Sep 7 15:20:32 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:20:32 +0000 Subject: hg: type-annotations/type-annotations/jaxws: 4 new changesets Message-ID: <20130907222045.0B6B96265A@hg.openjdk.java.net> Changeset: 01be6f93d0a4 Author: cl Date: 2013-08-29 09:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/01be6f93d0a4 Added tag jdk8-b105 for changeset 88390df7ed2c ! .hgtags Changeset: 6908370afe83 Author: lana Date: 2013-08-29 16:18 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/6908370afe83 Merge Changeset: e3c9328f7563 Author: cl Date: 2013-09-05 02:45 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/e3c9328f7563 Added tag jdk8-b106 for changeset 6908370afe83 ! .hgtags Changeset: c65cae9a42d6 Author: wmdietl Date: 2013-09-07 15:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/c65cae9a42d6 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxws ! .hgtags From wdietl at gmail.com Sat Sep 7 15:22:18 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:22:18 +0000 Subject: hg: type-annotations/type-annotations/jdk: 13 new changesets Message-ID: <20130907222621.19DCA6265B@hg.openjdk.java.net> Changeset: 9cc74675a854 Author: rfield Date: 2013-09-05 14:58 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9cc74675a854 8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError Summary: Fix pre-existing 292 bug tickled by combo of nashorn code and MethodHandleInfo changes Reviewed-by: jrose Contributed-by: vladimir.x.ivanov at oracle.com ! src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Changeset: f2487bb0c0d2 Author: rfield Date: 2013-09-06 00:43 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f2487bb0c0d2 8024260: 10 closed/java/lang/invoke/* tests failing after overhaul to MethodHandleInfo Reviewed-by: vlivanov, briangoetz Contributed-by: john.r.rose at oracle.com ! src/share/classes/java/lang/invoke/MethodHandle.java Changeset: da9de6f5cd6f Author: jbachorik Date: 2013-09-06 10:03 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/da9de6f5cd6f 6815130: Intermittent ThreadMXBean/Locks.java test failure Summary: Preventing stale reads from ThreadExecutionSynchronizer.waiting flag Reviewed-by: dholmes, mchung, dfuchs ! test/java/lang/management/ThreadMXBean/Locks.java ! test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java Changeset: 2064b2077a62 Author: jfranck Date: 2013-09-06 14:20 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2064b2077a62 5047859: (reflect) Class.getField can't find String[].length Reviewed-by: darcy, mchung ! src/share/classes/java/lang/Class.java + test/java/lang/Class/getField/ArrayLength.java Changeset: 0aba8b6232af Author: mullan Date: 2013-09-06 12:04 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0aba8b6232af 8023362: Don't allow soft-fail behavior if OCSP responder returns "unauthorized" Reviewed-by: vinnie, xuelei ! src/share/classes/java/security/cert/PKIXRevocationChecker.java ! src/share/classes/sun/security/provider/certpath/OCSPResponse.java + test/java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java Changeset: f23a84a1cf8e Author: mullan Date: 2013-09-06 12:10 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f23a84a1cf8e Merge - src/share/classes/java/util/stream/CloseableStream.java - src/share/classes/java/util/stream/DelegatingStream.java - test/java/util/Map/TreeBinSplitBackToEntries.java - test/sun/tools/jconsole/ImmutableResourceTest.java - test/sun/tools/jconsole/ImmutableResourceTest.sh Changeset: 0417358184a1 Author: omajid Date: 2013-08-22 16:00 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0417358184a1 8023480: Create a jvm.cfg for zero on 32 bit architectures Reviewed-by: dholmes, erikj ! makefiles/CopyFiles.gmk Changeset: 1fe211ae3d2b Author: katleman Date: 2013-08-26 17:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1fe211ae3d2b Merge Changeset: 1a2a8d143583 Author: cl Date: 2013-08-29 09:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1a2a8d143583 Added tag jdk8-b105 for changeset 1fe211ae3d2b ! .hgtags Changeset: c817276bd870 Author: lana Date: 2013-08-29 16:26 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c817276bd870 Merge - src/share/classes/sun/misc/Compare.java - src/share/classes/sun/misc/Sort.java Changeset: aafc0f332658 Author: cl Date: 2013-09-05 02:46 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/aafc0f332658 Added tag jdk8-b106 for changeset c817276bd870 ! .hgtags Changeset: 257de3e3a278 Author: lana Date: 2013-09-06 14:18 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/257de3e3a278 Merge Changeset: cc5624b7b89e Author: wmdietl Date: 2013-09-07 15:22 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cc5624b7b89e Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk ! .hgtags ! src/share/classes/java/lang/Class.java From wdietl at gmail.com Sat Sep 7 15:39:40 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:39:40 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 4 new changesets Message-ID: <20130907223947.F15996265D@hg.openjdk.java.net> Changeset: 824d33e678f2 Author: cl Date: 2013-08-29 09:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/824d33e678f2 Added tag jdk8-b105 for changeset f484bfb624dd ! .hgtags Changeset: bf70cbd2c836 Author: lana Date: 2013-08-29 16:34 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/bf70cbd2c836 Merge Changeset: f35e1255024b Author: cl Date: 2013-09-05 02:46 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/f35e1255024b Added tag jdk8-b106 for changeset bf70cbd2c836 ! .hgtags Changeset: 9e4acaa1bb7e Author: lana Date: 2013-09-06 14:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/9e4acaa1bb7e Merge From wdietl at gmail.com Sat Sep 7 15:40:25 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:40:25 +0000 Subject: hg: type-annotations/type-annotations/langtools: 9 new changesets Message-ID: <20130907224104.93B6D6265E@hg.openjdk.java.net> Changeset: e32a8a29643a Author: bpatel Date: 2013-09-05 16:35 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e32a8a29643a 8023608: method grouping tabs folding issue Reviewed-by: jjg ! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css ! test/com/sun/javadoc/testStylesheet/TestStylesheet.java Changeset: 7c7b4aea6d50 Author: vromero Date: 2013-09-06 09:53 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7c7b4aea6d50 8024039: javac, previous solution for JDK-8022186 was incorrect Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Lower.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java + test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java Changeset: 64328fe5e4a6 Author: jjg Date: 2013-09-06 15:31 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/64328fe5e4a6 8024434: problem running javadoc tests in samevm mode on Windows Reviewed-by: darcy ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java ! test/tools/javadoc/api/basic/APITest.java ! test/tools/javadoc/api/basic/GetTask_FileManagerTest.java Changeset: e431c9bfb171 Author: cl Date: 2013-08-29 09:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e431c9bfb171 Added tag jdk8-b105 for changeset 375834b5cf08 ! .hgtags Changeset: fcd768844b99 Author: lana Date: 2013-08-29 16:34 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/fcd768844b99 Merge - test/com/sun/javadoc/testNavagation/TestNavagation.java - test/com/sun/javadoc/testNavagation/pkg/A.java - test/com/sun/javadoc/testNavagation/pkg/C.java - test/com/sun/javadoc/testNavagation/pkg/E.java - test/com/sun/javadoc/testNavagation/pkg/I.java - test/tools/javac/8015701/AnonymousParameters.java Changeset: 3f274927ec18 Author: cl Date: 2013-09-05 02:46 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/3f274927ec18 Added tag jdk8-b106 for changeset fcd768844b99 ! .hgtags Changeset: c9d6f4749f87 Author: lana Date: 2013-09-06 14:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c9d6f4749f87 Merge Changeset: e84587462a47 Author: lana Date: 2013-09-06 17:10 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e84587462a47 Merge Changeset: 33b2650c7c31 Author: wmdietl Date: 2013-09-07 15:40 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/33b2650c7c31 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! .hgtags ! src/share/classes/com/sun/tools/javac/comp/Lower.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java From wdietl at gmail.com Sat Sep 7 15:38:40 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:38:40 +0000 Subject: hg: type-annotations/type-annotations/hotspot: 71 new changesets Message-ID: <20130907224119.E3F746265F@hg.openjdk.java.net> Changeset: 37165c3618a3 Author: amurillo Date: 2013-08-16 04:24 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/37165c3618a3 8023152: new hotspot build - hs25-b47 Reviewed-by: jcoomes ! make/hotspot_version Changeset: d96f52012aaa Author: rdurbin Date: 2013-08-14 15:12 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d96f52012aaa 8005073: [TESTBUG] remove crufty '_g' support from HS tests Summary: remove crufty '_g' support from HS tests Reviewed-by: dcubed, sla ! test/Makefile Changeset: 740e263c80c6 Author: hseigel Date: 2013-08-15 20:04 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/740e263c80c6 8003424: Enable Class Data Sharing for CompressedOops 8016729: ObjectAlignmentInBytes=16 now forces the use of heap based compressed oops 8005933: The -Xshare:auto option is ignored for -server Summary: Move klass metaspace above the heap and support CDS with compressed klass ptrs. Reviewed-by: coleenp, kvn, mgerdin, tschatzl, stefank ! src/cpu/sparc/vm/macroAssembler_sparc.cpp ! src/cpu/sparc/vm/macroAssembler_sparc.hpp ! src/cpu/sparc/vm/relocInfo_sparc.cpp ! src/cpu/sparc/vm/sparc.ad ! src/cpu/sparc/vm/vtableStubs_sparc.cpp ! src/cpu/x86/vm/macroAssembler_x86.cpp ! src/cpu/x86/vm/macroAssembler_x86.hpp ! src/cpu/x86/vm/relocInfo_x86.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/vtableStubs_x86_64.cpp ! src/cpu/x86/vm/x86_64.ad ! src/share/vm/memory/filemap.cpp ! src/share/vm/memory/filemap.hpp ! src/share/vm/memory/heap.cpp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/metaspace.hpp ! src/share/vm/memory/metaspaceShared.cpp ! src/share/vm/memory/universe.cpp ! src/share/vm/memory/universe.hpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/klass.inline.hpp ! src/share/vm/oops/oop.hpp ! src/share/vm/oops/oop.inline.hpp ! src/share/vm/oops/oopsHierarchy.hpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/init.cpp ! src/share/vm/utilities/globalDefinitions.hpp + test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java + test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java + test/runtime/CDSCompressedKPtrs/XShareAuto.java ! test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java Changeset: e5003079dfa5 Author: dcubed Date: 2013-08-16 10:06 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e5003079dfa5 Merge ! src/share/vm/utilities/globalDefinitions.hpp Changeset: b1fd869e7df0 Author: minqi Date: 2013-08-19 09:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b1fd869e7df0 8023188: Unsafe volatile double store on bsd is broken Reviewed-by: dcubed, dholmes Contributed-by: yumin.qi at oracle.com ! src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp Changeset: 1a8fb39bdbc4 Author: ehelin Date: 2013-08-07 16:47 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1a8fb39bdbc4 8014659: NPG: performance counters for compressed klass space Reviewed-by: mgerdin, coleenp, hseigel, jmasa, ctornqvi ! src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp ! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ! src/share/vm/memory/genCollectedHeap.cpp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/metaspace.hpp ! src/share/vm/memory/metaspaceCounters.cpp ! src/share/vm/memory/metaspaceCounters.hpp ! src/share/vm/memory/universe.cpp + test/gc/metaspace/TestMetaspacePerfCounters.java + test/testlibrary/AssertsTest.java + test/testlibrary/com/oracle/java/testlibrary/Asserts.java + test/testlibrary/com/oracle/java/testlibrary/ByteCodeLoader.java + test/testlibrary/com/oracle/java/testlibrary/InMemoryJavaCompiler.java + test/testlibrary/com/oracle/java/testlibrary/InputArguments.java + test/testlibrary/com/oracle/java/testlibrary/PerfCounter.java + test/testlibrary/com/oracle/java/testlibrary/PerfCounters.java Changeset: 878bb0b7e799 Author: ehelin Date: 2013-08-19 17:29 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/878bb0b7e799 Merge Changeset: 10c59b8021ec Author: kevinw Date: 2013-08-19 14:28 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/10c59b8021ec 8022655: ClassDump ignored jarStream setting Reviewed-by: minqi, sla ! agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java ! test/compiler/ciReplay/common.sh Changeset: 9011aa6843ce Author: kevinw Date: 2013-08-19 22:28 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9011aa6843ce Merge Changeset: e22ee8e7ae62 Author: jiangli Date: 2013-08-19 14:59 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e22ee8e7ae62 8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes. Summary: Change InstanceKlass::_source_file_name and _generic_signature to u2 fields. Reviewed-by: coleenp, iklam ! agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/classFileParser.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/prims/jvmtiRedefineClasses.cpp ! src/share/vm/runtime/vmStructs.cpp Changeset: aeebffb56606 Author: jiangli Date: 2013-08-20 00:48 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/aeebffb56606 Merge Changeset: 9d6c9b0a8f15 Author: dcubed Date: 2013-08-20 13:47 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9d6c9b0a8f15 8023287: HOTSPOT_BUILD_COMPILER needs to support "Sun Studio 12u3" Summary: Recognize 0x5120 as "Sun Studio 12u3". Reviewed-by: dholmes, coleenp ! src/share/vm/runtime/vm_version.cpp Changeset: afbe18ae0905 Author: bharadwaj Date: 2013-08-15 11:59 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/afbe18ae0905 8022441: Bad code generated for certain interpreted CRC intrinsics, 2 cases Summary: Corrected details Reviewed-by: kvn, twisti, rbackman Contributed-by: david.r.chase at oracle.com ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp Changeset: adb9a7d94cb5 Author: adlertz Date: 2013-08-16 10:23 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/adb9a7d94cb5 8023003: Cleanup the public interface to PhaseCFG Summary: public methods that don't need to be public should be private. Reviewed-by: kvn, twisti ! src/share/vm/opto/block.cpp ! src/share/vm/opto/block.hpp ! src/share/vm/opto/buildOopMap.cpp ! src/share/vm/opto/chaitin.cpp ! src/share/vm/opto/coalesce.cpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/domgraph.cpp ! src/share/vm/opto/gcm.cpp ! src/share/vm/opto/idealGraphPrinter.cpp ! src/share/vm/opto/ifg.cpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/live.cpp ! src/share/vm/opto/matcher.cpp ! src/share/vm/opto/matcher.hpp ! src/share/vm/opto/output.cpp ! src/share/vm/opto/phaseX.cpp ! src/share/vm/opto/postaloc.cpp ! src/share/vm/opto/reg_split.cpp ! src/share/vm/runtime/vmStructs.cpp Changeset: 6c72125a2f40 Author: iignatyev Date: 2013-08-16 17:34 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6c72125a2f40 8016456: ciReplay test assumes TIERED compilation is available Reviewed-by: vlivanov, kvn, dholmes ! test/compiler/ciReplay/common.sh Changeset: f99558245e5c Author: iignatyev Date: 2013-08-14 23:50 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f99558245e5c 8022832: Add WB APIs for OSR compilation Reviewed-by: kvn ! src/share/vm/oops/method.cpp ! src/share/vm/prims/whitebox.cpp ! src/share/vm/runtime/compilationPolicy.cpp ! src/share/vm/runtime/compilationPolicy.hpp ! test/compiler/whitebox/ClearMethodStateTest.java ! test/compiler/whitebox/CompilerWhiteBoxTest.java ! test/compiler/whitebox/DeoptimizeAllTest.java ! test/compiler/whitebox/DeoptimizeMethodTest.java ! test/compiler/whitebox/EnqueueMethodForCompilationTest.java ! test/compiler/whitebox/IsMethodCompilableTest.java ! test/compiler/whitebox/MakeMethodNotCompilableTest.java ! test/compiler/whitebox/SetDontInlineMethodTest.java ! test/compiler/whitebox/SetForceInlineMethodTest.java ! test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Changeset: d18b10b1fd09 Author: iignatyev Date: 2013-08-16 13:39 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d18b10b1fd09 Merge Changeset: 4b2838704fd5 Author: kvn Date: 2013-08-16 14:11 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4b2838704fd5 8021898: Broken JIT compiler optimization for loop unswitching Summary: fix method clone_projs() to clone all related MachProj nodes. Reviewed-by: roland, adlertz ! src/share/vm/opto/chaitin.cpp ! src/share/vm/opto/chaitin.hpp ! src/share/vm/opto/coalesce.cpp ! src/share/vm/opto/reg_split.cpp ! src/share/vm/runtime/frame.cpp ! src/share/vm/utilities/vmError.cpp Changeset: 6725044c5725 Author: rbackman Date: 2013-08-19 09:33 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6725044c5725 Merge ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/share/vm/oops/method.cpp Changeset: e16282db4946 Author: twisti Date: 2013-08-20 10:57 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e16282db4946 8022956: Clang: enable return type warnings on BSD Reviewed-by: coleenp, sla ! make/bsd/makefiles/gcc.make ! src/cpu/zero/vm/assembler_zero.cpp ! src/cpu/zero/vm/cppInterpreter_zero.cpp ! src/cpu/zero/vm/frame_zero.cpp ! src/cpu/zero/vm/frame_zero.inline.hpp ! src/cpu/zero/vm/icBuffer_zero.cpp ! src/cpu/zero/vm/interp_masm_zero.hpp ! src/cpu/zero/vm/interpreter_zero.cpp ! src/cpu/zero/vm/nativeInst_zero.hpp ! src/cpu/zero/vm/register_zero.cpp ! src/cpu/zero/vm/relocInfo_zero.cpp ! src/cpu/zero/vm/sharedRuntime_zero.cpp ! src/cpu/zero/vm/vtableStubs_zero.cpp ! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ! src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp ! src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp Changeset: acedd49a1bce Author: rbackman Date: 2013-08-08 03:16 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/acedd49a1bce 8022675: Redundant class init check Reviewed-by: kvn, twisti ! src/share/vm/opto/library_call.cpp Changeset: 4dece0730c50 Author: rbackman Date: 2013-08-22 18:37 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4dece0730c50 Merge ! src/share/vm/runtime/vmStructs.cpp ! test/compiler/ciReplay/common.sh Changeset: 5888334c9c24 Author: johnc Date: 2013-08-15 10:52 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5888334c9c24 7145569: G1: optimize nmethods scanning Summary: Add a list of nmethods to the RSet for a region that contain references into the region. Skip scanning the code cache during root scanning and scan the nmethod lists during RSet scanning instead. Reviewed-by: tschatzl, brutisso, mgerdin, twisti, kvn ! src/share/vm/c1/c1_Runtime1.cpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/code/nmethod.hpp ! src/share/vm/gc_implementation/g1/concurrentMark.cpp ! src/share/vm/gc_implementation/g1/concurrentMark.hpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp ! src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp ! src/share/vm/gc_implementation/g1/g1RemSet.cpp ! src/share/vm/gc_implementation/g1/g1RemSet.hpp ! src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/gc_implementation/g1/heapRegion.hpp ! src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp ! src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp ! src/share/vm/gc_interface/collectedHeap.cpp ! src/share/vm/gc_interface/collectedHeap.hpp ! src/share/vm/memory/iterator.cpp ! src/share/vm/runtime/sweeper.hpp ! src/share/vm/utilities/growableArray.hpp Changeset: 8088d93a63e6 Author: brutisso Date: 2013-08-15 13:02 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8088d93a63e6 Merge Changeset: 9720d338b1d5 Author: brutisso Date: 2013-08-16 11:26 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9720d338b1d5 8023145: G1: G1CollectedHeap::mark_strong_code_roots() needs to handle ParallelGCThreads=0 Reviewed-by: stefank, mgerdin ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Changeset: d0afbee540e0 Author: stefank Date: 2013-08-19 13:44 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d0afbee540e0 8023227: Enhance layout_helper_log2_element_size assert Reviewed-by: mgerdin, jmasa ! src/share/vm/oops/klass.hpp Changeset: 422920730903 Author: ehelin Date: 2013-08-19 18:17 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/422920730903 8023219: NPG: MetaspaceMemoryPool should report statistics for all of metaspace Reviewed-by: stefank, sjohanss ! src/share/vm/services/memoryPool.cpp Changeset: 57600c4aeabe Author: jmasa Date: 2013-08-19 08:58 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/57600c4aeabe Merge - src/os_cpu/bsd_x86/vm/bsd_x86_32.ad - src/os_cpu/bsd_x86/vm/bsd_x86_64.ad - src/os_cpu/linux_x86/vm/linux_x86_32.ad - src/os_cpu/linux_x86/vm/linux_x86_64.ad - src/os_cpu/solaris_sparc/vm/solaris_sparc.ad - src/os_cpu/solaris_x86/vm/solaris_x86_32.ad - src/os_cpu/solaris_x86/vm/solaris_x86_64.ad - src/os_cpu/windows_x86/vm/windows_x86_32.ad - src/os_cpu/windows_x86/vm/windows_x86_64.ad Changeset: 31f220c1f789 Author: jmasa Date: 2013-08-20 10:02 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/31f220c1f789 Merge Changeset: 61521bd65100 Author: tschatzl Date: 2013-08-21 10:32 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/61521bd65100 8022784: TaskQueue misses minimal documentation and references for analysis Summary: Add appropriate documentation and references to publication to allow easier analysis of the TaskQueue implementation. Reviewed-by: dholmes, ehelin ! src/share/vm/utilities/taskqueue.hpp Changeset: cb9da55b1990 Author: jmasa Date: 2013-08-14 19:52 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cb9da55b1990 8021809: Partitioning based on eden sampling during allocation not reset correctly Reviewed-by: ysr, hiroshi ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Changeset: b51aee2dd8bb Author: jmasa Date: 2013-08-22 11:13 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b51aee2dd8bb Merge ! src/share/vm/oops/klass.hpp Changeset: 8009adb44523 Author: jmasa Date: 2013-08-22 14:03 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8009adb44523 Merge Changeset: c1604d5885a6 Author: amurillo Date: 2013-08-23 03:01 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c1604d5885a6 Merge Changeset: acac3bde66b2 Author: amurillo Date: 2013-08-23 03:01 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/acac3bde66b2 Added tag hs25-b47 for changeset c1604d5885a6 ! .hgtags Changeset: b649cfa58604 Author: cl Date: 2013-08-29 09:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b649cfa58604 Added tag jdk8-b105 for changeset acac3bde66b2 ! .hgtags Changeset: 73921c720b94 Author: amurillo Date: 2013-08-23 03:14 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/73921c720b94 8023635: new hotspot build - hs25-b48 Reviewed-by: jcoomes ! make/hotspot_version Changeset: c6ec0a97b30a Author: sla Date: 2013-08-21 13:18 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c6ec0a97b30a 8022808: Kitchensink hangs on macos Summary: Use pthread_mach_thread_np() instead of mach_thread_self() to avoid leaking resources Reviewed-by: dholmes, rbackman ! src/os/bsd/vm/os_bsd.cpp Changeset: 3a57fa7a4cd0 Author: hseigel Date: 2013-08-22 11:52 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3a57fa7a4cd0 7121403: [TESTBUG] runtime/7051189/Xchecksig.sh fails on 64bit solaris 8023393: Need to suppress info message if -Xcheck:jni used with libjsig.dylab on Mac OSX Summary: Rewrite 7051189 test in Java, port Linux fix for 7051189 to Mac OSX. Reviewed-by: coleenp, dholmes, mseledtsov, ccheung ! src/os/bsd/vm/os_bsd.cpp - test/runtime/7051189/Xchecksig.sh + test/runtime/XCheckJniJsig/XCheckJSig.java Changeset: e37ab280bbce Author: allwin Date: 2013-07-23 14:32 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e37ab280bbce 8011888: sa.js: TypeError: [object JSAdapter] has no such function "__has__" Reviewed-by: sla, sundar, kmo Contributed-by: yunda.mly at taobao.com ! agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js Changeset: 669d9a235486 Author: sla Date: 2013-08-22 14:56 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/669d9a235486 Merge Changeset: c062a6e1fa33 Author: iklam Date: 2013-08-22 10:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c062a6e1fa33 8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1 Summary: Avoid dumping C++ vtable when BUILD_WIN_SA != 1 Reviewed-by: dcubed, sla, tbell ! make/windows/build_vm_def.sh ! make/windows/makefiles/debug.make ! make/windows/makefiles/fastdebug.make ! make/windows/makefiles/product.make ! make/windows/makefiles/projectcreator.make ! make/windows/makefiles/vm.make Changeset: 811aea34d5e7 Author: iklam Date: 2013-08-22 13:53 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/811aea34d5e7 Merge Changeset: ff2520b97b00 Author: jiangli Date: 2013-08-22 19:27 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ff2520b97b00 8023547: com/sun/jdi/RedefineMulti.sh fails with IllegalArgumentException after JDK-8021948 . Summary: Need to check if the constant pool mapping returns 0. Reviewed-by: coleenp, sspitsyn ! src/share/vm/prims/jvmtiRedefineClasses.cpp Changeset: 887db75613f8 Author: jiangli Date: 2013-08-22 17:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/887db75613f8 Merge Changeset: a70566600baf Author: poonam Date: 2013-08-21 22:12 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a70566600baf 8020530: Non heap memory size calculated incorrectly Reviewed-by: coleenp, sla Contributed-by: vladimir.kempik at oracle.com ! src/share/vm/services/management.cpp Changeset: 730210728146 Author: poonam Date: 2013-08-22 18:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/730210728146 Merge - test/runtime/7051189/Xchecksig.sh Changeset: 817e46dd5864 Author: poonam Date: 2013-08-22 21:23 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/817e46dd5864 Merge Changeset: 739c309fd729 Author: mgronlun Date: 2013-08-23 10:36 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/739c309fd729 8023457: Event based tracing framework needs a mutex for thread groups Reviewed-by: acorn, sla ! src/share/vm/runtime/mutexLocker.cpp ! src/share/vm/runtime/mutexLocker.hpp Changeset: cacc421f39d7 Author: dcubed Date: 2013-08-23 10:39 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cacc421f39d7 Merge - test/runtime/7051189/Xchecksig.sh Changeset: badf4244ceae Author: hseigel Date: 2013-08-25 21:21 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/badf4244ceae 8022183: GCC 4.6 change sdefault setting for omit-frame-pointer which breaks hotspot stack walking Summary: Explicitly specify -fno-omit-frame-pointer. Reviewed-by: coleenp, dholmes, dcubed ! make/linux/makefiles/amd64.make ! make/linux/makefiles/gcc.make Changeset: faf2631b9334 Author: dsimms Date: 2013-08-26 09:33 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/faf2631b9334 8022683: JNI GetStringUTFChars should return NULL on allocation failure not abort the VM Summary: Return NULL on OOM from GetStringChars, GetStringUTFChars and GetArrayElements family of functions. Reviewed-by: dholmes, coleenp ! src/share/vm/memory/allocation.hpp ! src/share/vm/prims/jni.cpp Changeset: 4c84d351cca9 Author: stefank Date: 2013-08-16 13:22 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4c84d351cca9 8007074: SIGSEGV at ParMarkBitMap::verify_clear() Summary: Replace the broken large pages implementation on Linux. New flag: -XX:+UseTransparentHugePages - Linux specific flag to turn on transparent huge page hinting with madvise(..., MAP_HUGETLB). Changed behavior: -XX:+UseLargePages - tries to use -XX:+UseTransparentHugePages before trying other large pages implementations (on Linux). Changed behavior: -XX:+UseHugeTLBFS - Use upfront allocation of Large Pages instead of using the broken implementation to dynamically committing large pages. Changed behavior: -XX:LargePageSizeInBytes - Turned off the ability to use this flag on Linux and provides warning to user if set to a value different than the OS chosen large page size. Changed behavior: Setting no large page size - Now defaults to use -XX:UseTransparentHugePages if the OS supports it. Previously, -XX:+UseHugeTLBFS was chosen if the OS was configured to use large pages. Reviewed-by: tschatzl, dcubed, brutisso ! src/os/bsd/vm/os_bsd.cpp ! src/os/linux/vm/globals_linux.hpp ! src/os/linux/vm/os_linux.cpp ! src/os/linux/vm/os_linux.hpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/memory/collectorPolicy.cpp ! src/share/vm/memory/genCollectedHeap.cpp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/universe.cpp ! src/share/vm/memory/universe.hpp ! src/share/vm/prims/jni.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/os.hpp ! src/share/vm/runtime/virtualspace.cpp ! src/share/vm/runtime/virtualspace.hpp ! src/share/vm/services/memTracker.hpp ! src/share/vm/utilities/globalDefinitions.hpp Changeset: 21ffbaa691b5 Author: stefank Date: 2013-08-26 07:01 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/21ffbaa691b5 Merge ! src/share/vm/prims/jni.cpp Changeset: 1bb10d3170fa Author: jmasa Date: 2013-08-16 06:12 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1bb10d3170fa 8022817: CMS should not shrink if compaction was not done Reviewed-by: ysr, mgerdin ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Changeset: f7d3b4387a16 Author: brutisso Date: 2013-08-21 22:35 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f7d3b4387a16 8022872: G1: Use correct GC cause for young GC triggered by humongous allocations Reviewed-by: tonyp, tschatzl ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Changeset: c31eb8c86a50 Author: brutisso Date: 2013-08-22 04:14 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c31eb8c86a50 Merge Changeset: ec145d04eda8 Author: jmasa Date: 2013-08-23 15:59 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ec145d04eda8 Merge Changeset: 1624a68007bd Author: jmasa Date: 2013-08-27 18:55 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1624a68007bd Merge ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Changeset: f92b82d454fa Author: bpittore Date: 2013-08-23 20:33 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f92b82d454fa 8014135: The JVMTI specification does not conform to recent changes in JNI specification Summary: Added support for statically linked agents Reviewed-by: sspitsyn, bobv, coleenp ! src/os/posix/vm/os_posix.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/prims/jvmti.xml ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/runtime/arguments.hpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/os.hpp ! src/share/vm/runtime/thread.cpp Changeset: 5fd8e2fbafd4 Author: cjplummer Date: 2013-08-23 12:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5fd8e2fbafd4 8020829: JT_HS: 2 runtime NMT tests fail on platforms if NMT detail is not supported Summary: Make tests query a new WhiteBox API to see if NMT detail is supported, and behave properly if it is not supported. Reviewed-by: dholmes, coleenp ! src/share/vm/prims/whitebox.cpp ! test/runtime/NMT/ThreadedVirtualAllocTestType.java ! test/runtime/NMT/VirtualAllocTestType.java ! test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Changeset: 7aa0c1fb6fdb Author: dholmes Date: 2013-08-27 22:05 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/7aa0c1fb6fdb 8006164: [TESTBUG] compact profile hotspot test issues Summary: Define profile-based test groups. Reviewed-by: dcubed, mchung ! test/TEST.ROOT + test/TEST.groups Changeset: 1fedf3c7f923 Author: bpittore Date: 2013-08-28 14:44 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1fedf3c7f923 8023580: Add jtreg test for 8004051 and 8005722 Summary: Tests checks an assertion dealing with the number of args passed in registers Reviewed-by: mseledtsov, kvn + test/compiler/8004051/Test8004051.java Changeset: b1fb293d92c4 Author: jiangli Date: 2013-08-28 12:01 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b1fb293d92c4 Merge Changeset: 2b113b65a051 Author: dholmes Date: 2013-08-28 19:25 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2b113b65a051 8023900: [TESTBUG] Initial compact profile test groups need adjusting Reviewed-by: dcubed, mchung, hseigel ! test/TEST.groups Changeset: 54dfd798deaf Author: dholmes Date: 2013-08-28 21:42 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/54dfd798deaf Merge Changeset: 62f527c674d2 Author: dholmes Date: 2013-08-29 00:22 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/62f527c674d2 Merge ! src/os/windows/vm/os_windows.cpp ! src/share/vm/runtime/os.hpp Changeset: 18b4798adbc4 Author: amurillo Date: 2013-08-30 00:19 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/18b4798adbc4 Merge - test/runtime/7051189/Xchecksig.sh Changeset: aed585cafc0d Author: amurillo Date: 2013-08-30 00:19 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/aed585cafc0d Added tag hs25-b48 for changeset 18b4798adbc4 ! .hgtags Changeset: 3f4392035ec7 Author: cl Date: 2013-09-05 02:45 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3f4392035ec7 Added tag jdk8-b106 for changeset aed585cafc0d ! .hgtags Changeset: 547df9eab1ea Author: wmdietl Date: 2013-09-07 15:38 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/547df9eab1ea Automated merge with http://hg.openjdk.java.net/jdk8/tl/hotspot ! .hgtags From wdietl at gmail.com Sat Sep 7 15:19:07 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 07 Sep 2013 22:19:07 +0000 Subject: hg: type-annotations/type-annotations: 12 new changesets Message-ID: <20130907221908.D918562656@hg.openjdk.java.net> Changeset: f8405a0fa69c Author: erikj Date: 2013-08-26 13:43 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/f8405a0fa69c 8023216: Feedback on README-builds.html Reviewed-by: anthony, robilad, tbell ! README-builds.html Changeset: 5166118c5917 Author: katleman Date: 2013-08-26 17:34 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/5166118c5917 Merge Changeset: 246cdbaa6c62 Author: cl Date: 2013-08-29 09:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/246cdbaa6c62 Added tag jdk8-b105 for changeset 5166118c5917 ! .hgtags Changeset: 4ac867c44467 Author: lana Date: 2013-08-29 16:18 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/4ac867c44467 Merge Changeset: 21198f51bc7e Author: erikj Date: 2013-08-29 15:47 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/21198f51bc7e 8003162: build-infra: Improve suggestions for missing packages on linux Reviewed-by: tbell, omajid ! common/autoconf/generated-configure.sh ! common/autoconf/help.m4 ! common/autoconf/libraries.m4 Changeset: 92facce22941 Author: erikj Date: 2013-08-30 10:13 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/92facce22941 8023957: Lock down version of autoconf Reviewed-by: chegar, dsamersoff, tbell, dholmes ! README-builds.html ! common/autoconf/autogen.sh ! common/autoconf/configure.ac ! common/autoconf/generated-configure.sh Changeset: 2aacc7080d36 Author: katleman Date: 2013-09-03 13:48 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/2aacc7080d36 Merge Changeset: 0f6dde6231bd Author: ihse Date: 2013-09-04 10:15 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/0f6dde6231bd 8024155: Fix 'make CONF= ' Reviewed-by: erikj, tbell ! NewMakefile.gmk ! common/makefiles/Main.gmk Changeset: 8e7b4d9fb00f Author: erikj Date: 2013-09-04 10:37 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/8e7b4d9fb00f Merge ! NewMakefile.gmk ! common/makefiles/Main.gmk Changeset: 58f1b6f32b47 Author: cl Date: 2013-09-05 02:45 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/58f1b6f32b47 Added tag jdk8-b106 for changeset 8e7b4d9fb00f ! .hgtags Changeset: 73355c4c1bc8 Author: lana Date: 2013-09-06 14:15 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/73355c4c1bc8 Merge Changeset: e62abbc008aa Author: wmdietl Date: 2013-09-07 15:18 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/e62abbc008aa Automated merge with http://hg.openjdk.java.net/jdk8/tl/ ! .hgtags From wdietl at gmail.com Sun Sep 8 19:00:56 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 09 Sep 2013 02:00:56 +0000 Subject: hg: type-annotations/type-annotations/langtools: 2 new changesets Message-ID: <20130909020108.860BB62671@hg.openjdk.java.net> Changeset: 2de3750d65a5 Author: vromero Date: 2013-09-08 11:54 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2de3750d65a5 8024398: javac, compiler crashes with try with empty body Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Lower.java + test/tools/javac/T8024398/NPETryTest.java Changeset: 72fbc57f0919 Author: wmdietl Date: 2013-09-08 19:00 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/72fbc57f0919 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/javac/comp/Lower.java From wdietl at gmail.com Sun Sep 8 19:01:55 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 09 Sep 2013 02:01:55 +0000 Subject: hg: type-annotations/type-annotations/jdk: 2 new changesets Message-ID: <20130909020301.D428862672@hg.openjdk.java.net> Changeset: 0f47f9f622d9 Author: xuelei Date: 2013-09-07 17:05 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0f47f9f622d9 7188657: There should be a way to reorder the JSSE ciphers Reviewed-by: weijun, wetmore ! src/share/classes/javax/net/ssl/SSLParameters.java ! src/share/classes/sun/security/ssl/Handshaker.java ! src/share/classes/sun/security/ssl/SSLEngineImpl.java ! src/share/classes/sun/security/ssl/SSLServerSocketImpl.java ! src/share/classes/sun/security/ssl/SSLSocketImpl.java ! src/share/classes/sun/security/ssl/ServerHandshaker.java + test/sun/security/ssl/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java Changeset: 553631660a98 Author: wmdietl Date: 2013-09-08 19:01 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/553631660a98 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From wdietl at gmail.com Mon Sep 9 17:40:46 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 10 Sep 2013 00:40:46 +0000 Subject: hg: type-annotations/type-annotations/jdk: 7 new changesets Message-ID: <20130910004249.88BFB626A4@hg.openjdk.java.net> Changeset: 6bfabb71ae1e Author: weijun Date: 2013-09-09 11:08 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/6bfabb71ae1e 8024046: Test sun/security/krb5/runNameEquals.sh failed on 7u45 Embedded linux-ppc* Reviewed-by: xuelei ! test/sun/security/krb5/runNameEquals.sh Changeset: 4afdf10de648 Author: dfuchs Date: 2013-09-09 13:59 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4afdf10de648 8023168: Cleanup LogManager class initialization and LogManager/LoggerContext relationship 8021003: java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java fails intermittently 8019945: test/java/util/logging/LogManagerInstanceTest.java failing intermittently Summary: This fix untangles the class initialization of Logger and LogManager, and also cleans up the relationship between LogManager, LoggerContext, and Logger, which were at the root cause of some intermittent test failures. Reviewed-by: mchung, martin, plevart ! src/share/classes/java/util/logging/LogManager.java ! src/share/classes/java/util/logging/Logger.java ! test/java/util/logging/Logger/getGlobal/TestGetGlobal.java ! test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java ! test/java/util/logging/Logger/getGlobal/policy ! test/java/util/logging/ParentLoggersTest.java ! test/java/util/logging/TestAppletLoggerContext.java Changeset: 02064634bc88 Author: msheppar Date: 2013-09-06 15:00 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/02064634bc88 8023326: [TESTBUG] java/net/CookieHandler/LocalHostCookie.java misplaced try/finally Summary: amended test to be more robust to set of potential exceptions thrown Reviewed-by: chegar, khazra ! test/java/net/CookieHandler/LocalHostCookie.java Changeset: 4fd7abaf0a5f Author: msheppar Date: 2013-09-09 13:44 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4fd7abaf0a5f 8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address Summary: amended src/windows/native/java/net/NetworkInterface_winXP.c to "properly" handle Ipv6IfIndex Reviewed-by: chegar, dsamersoff ! src/windows/native/java/net/NetworkInterface_winXP.c + test/java/net/NetworkInterface/UniqueMacAddressesTest.java Changeset: be0bcd6a904e Author: juh Date: 2013-09-09 10:52 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/be0bcd6a904e 8024432: Fix doclint issues in java.security Reviewed-by: darcy, mullan ! src/share/classes/java/security/AccessController.java ! src/share/classes/java/security/AlgorithmParameters.java ! src/share/classes/java/security/AlgorithmParametersSpi.java ! src/share/classes/java/security/KeyFactory.java ! src/share/classes/java/security/KeyFactorySpi.java ! src/share/classes/java/security/KeyStore.java ! src/share/classes/java/security/Principal.java ! src/share/classes/java/security/cert/CertPathBuilderSpi.java ! src/share/classes/java/security/cert/CertPathValidatorSpi.java ! src/share/classes/java/security/cert/PKIXRevocationChecker.java ! src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java ! src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java ! src/share/classes/java/security/interfaces/RSAPrivateKey.java ! src/share/classes/java/security/interfaces/RSAPublicKey.java Changeset: 6731ea9123f2 Author: smarks Date: 2013-09-09 14:11 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/6731ea9123f2 8023447: change specification to allow RMI activation to be optional Reviewed-by: darcy, alanb, olagneau ! src/share/classes/java/rmi/activation/Activatable.java ! src/share/classes/java/rmi/activation/ActivationDesc.java ! src/share/classes/java/rmi/activation/ActivationGroup.java ! src/share/classes/java/rmi/activation/ActivationGroupID.java ! src/share/classes/java/rmi/activation/ActivationID.java ! src/share/classes/java/rmi/activation/package.html Changeset: b3f9bb0ef8fe Author: wmdietl Date: 2013-09-09 17:40 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b3f9bb0ef8fe Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From wdietl at gmail.com Mon Sep 9 17:42:26 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 10 Sep 2013 00:42:26 +0000 Subject: hg: type-annotations/type-annotations/langtools: 6 new changesets Message-ID: <20130910004252.AA779626A5@hg.openjdk.java.net> Changeset: 6cffcd15a17e Author: jfranck Date: 2013-09-09 09:58 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6cffcd15a17e 8022260: Rename javac.code.Annotations to javac.code.SymbolMetadata Reviewed-by: jfranck, jjg Contributed-by: Andreas Lundblad - src/share/classes/com/sun/tools/javac/code/Annotations.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java + src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java ! test/tools/javac/lib/DPrinter.java Changeset: a4b9a8859e58 Author: vromero Date: 2013-09-09 16:32 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a4b9a8859e58 8024154: Fix for 8016177: structural most specific and stuckness breaks 6 langtools tests Reviewed-by: jjg, jfranck ! test/tools/javac/lambda/MethodReference41.java ! test/tools/javac/lambda/MethodReference41.out ! test/tools/javac/lambda/MethodReference42.java ! test/tools/javac/lambda/MethodReference42.out ! test/tools/javac/lambda/MethodReference43.java ! test/tools/javac/lambda/MethodReference43.out ! test/tools/javac/lambda/MethodReference44.java ! test/tools/javac/lambda/MethodReference44.out ! test/tools/javac/lambda/MethodReference46.java ! test/tools/javac/lambda/MethodReference46.out ! test/tools/javac/lambda/MethodReference48.java ! test/tools/javac/lambda/MethodReference48.out Changeset: f4efd6ef6e80 Author: emc Date: 2013-09-09 16:26 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f4efd6ef6e80 8022322: Reject default and static methods in annotation Summary: Causes javac to reject static and default method declarations inside an annotation Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/comp/Check.java + test/tools/javac/annotations/neg/NoDefault.java + test/tools/javac/annotations/neg/NoDefault.out + test/tools/javac/annotations/neg/NoDefaultAbstract.java + test/tools/javac/annotations/neg/NoDefaultAbstract.out + test/tools/javac/annotations/neg/NoStatic.java + test/tools/javac/annotations/neg/NoStatic.out + test/tools/javac/annotations/neg/NoStaticAbstract.java + test/tools/javac/annotations/neg/NoStaticAbstract.out Changeset: 67c5110c60fe Author: emc Date: 2013-09-09 17:11 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/67c5110c60fe 8015322: Javac template test framework Summary: Putback of the javac template test framework from the Lambda repository Reviewed-by: jjg Contributed-by: brian.goetz at oracle.com ! README + test/lib/combo/TEST.properties + test/lib/combo/tools/javac/combo/Diagnostics.java + test/lib/combo/tools/javac/combo/JavacTemplateTestBase.java + test/lib/combo/tools/javac/combo/Template.java + test/lib/combo/tools/javac/combo/TemplateTest.java + test/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java + test/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java + test/tools/javac/lambda/bridge/template_tests/TEST.properties Changeset: 7439356a7dc5 Author: jjg Date: 2013-09-09 17:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7439356a7dc5 8006972: jtreg test fails: test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java Reviewed-by: darcy ! test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java ! test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref Changeset: 5499e8a522eb Author: wmdietl Date: 2013-09-09 17:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/5499e8a522eb Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java From wdietl at gmail.com Mon Sep 9 17:45:45 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 10 Sep 2013 00:45:45 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 3 new changesets Message-ID: <20130910004550.E04D7626A7@hg.openjdk.java.net> Changeset: 7ae169639485 Author: sundar Date: 2013-09-05 21:17 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/7ae169639485 8024255: When a keyword is used as object property name, the property can not be deleted Reviewed-by: jlaskey, lagergren ! src/jdk/nashorn/internal/parser/Parser.java + test/script/basic/JDK-8024255.js Changeset: c3b6ce7b74bf Author: sundar Date: 2013-09-09 20:10 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/c3b6ce7b74bf 8024180: Incorrect handling of expression and parent scope in 'with' statements Reviewed-by: jlaskey, hannesw ! src/jdk/nashorn/api/scripting/NashornScriptEngine.java ! src/jdk/nashorn/api/scripting/ScriptObjectMirror.java ! src/jdk/nashorn/internal/objects/Global.java ! src/jdk/nashorn/internal/runtime/Context.java ! src/jdk/nashorn/internal/runtime/GlobalObject.java ! src/jdk/nashorn/internal/runtime/NativeJavaPackage.java ! src/jdk/nashorn/internal/runtime/ScriptObject.java ! src/jdk/nashorn/internal/runtime/ScriptRuntime.java ! src/jdk/nashorn/internal/runtime/WithObject.java ! src/jdk/nashorn/internal/runtime/resources/Messages.properties + test/script/basic/8024180/global_var_delete.js + test/script/basic/8024180/global_var_delete.js.EXPECTED + test/script/basic/8024180/global_var_shadow.js + test/script/basic/8024180/global_var_shadow.js.EXPECTED + test/script/basic/8024180/scope_no_such_prop.js + test/script/basic/8024180/scope_no_such_prop.js.EXPECTED + test/script/basic/8024180/with_expr_prop_add.js + test/script/basic/8024180/with_expr_prop_add.js.EXPECTED + test/script/basic/8024180/with_expr_proto_prop_add.js + test/script/basic/8024180/with_expr_proto_prop_add.js.EXPECTED + test/script/basic/8024180/with_java_object.js + test/script/basic/8024180/with_java_object.js.EXPECTED ! test/src/jdk/nashorn/internal/runtime/ContextTest.java Changeset: 1eca380a221f Author: sundar Date: 2013-09-09 20:16 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/1eca380a221f Merge From charlie.wang at oracle.com Tue Sep 10 19:45:49 2013 From: charlie.wang at oracle.com (Charlie Wang) Date: Wed, 11 Sep 2013 10:45:49 +0800 Subject: Fwd: Re: type anno test code check in In-Reply-To: <522F56DE.4040807@oracle.com> References: <522F56DE.4040807@oracle.com> Message-ID: <522FD95D.9040402@oracle.com> Hi, I'm looking for a committer to help me check in type annotation reflection test code. Could someone give me a hand? Thanks, Charlie -------- Original Message -------- Subject: Re: type anno test code check in Date: Tue, 10 Sep 2013 10:29:02 -0700 From: Alex Buckley Organization: Oracle Corporation To: Charlie Wang Ask on type-annotations-dev for a Committer in the Type Annotations Project to push the tests for you. The tests will go in the jdk repo. Alex On 9/10/2013 1:04 AM, Charlie Wang wrote: > Hi Alex, > I am trying to check in type annotation reflection test code. Could > you tell me which repo should it go to? And I don't have author > privilege. Could you refer me to someone to help me check in it? > > > Thanks, > Charlie -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130911/ac7e65a3/attachment.html From wdietl at gmail.com Tue Sep 10 20:05:32 2013 From: wdietl at gmail.com (Werner Dietl) Date: Tue, 10 Sep 2013 20:05:32 -0700 Subject: type anno test code check in In-Reply-To: <522FD95D.9040402@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> Message-ID: Hi Charlie, sure, I can do that; where is the most up-to-date patch? Jon, is there any OpenJDK administrativa to follow, e.g. to make Charlie an Author? cu, WMD. On Tue, Sep 10, 2013 at 7:45 PM, Charlie Wang wrote: > Hi, > I'm looking for a committer to help me check in type annotation > reflection test code. Could someone give me a hand? > > > > > Thanks, > Charlie > > -------- Original Message -------- Subject: Re: type anno test code > check in Date: Tue, 10 Sep 2013 10:29:02 -0700 From: Alex Buckley > Organization: Oracle > Corporation To: Charlie Wang > > Ask on type-annotations-dev for a Committer in the Type Annotations > Project to push the tests for you. The tests will go in the jdk repo. > > Alex > > On 9/10/2013 1:04 AM, Charlie Wang wrote: > > Hi Alex, > > I am trying to check in type annotation reflection test code. Could > > you tell me which repo should it go to? And I don't have author > > privilege. Could you refer me to someone to help me check in it? > > > > > > Thanks, > > Charlie > > > > -- http://www.google.com/profiles/wdietl -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130910/ceeb8197/attachment.html From charlie.wang at oracle.com Tue Sep 10 22:54:50 2013 From: charlie.wang at oracle.com (Charlie Wang) Date: Wed, 11 Sep 2013 13:54:50 +0800 Subject: type anno test code check in In-Reply-To: References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> Message-ID: <523005AA.705@oracle.com> Thank you for helping. I put the code in attached zip file. Let me know if you prefer that I put it somewhere for you to access. Here's the webrev link http://cr.openjdk.java.net/~pzhang/Charlie/TypeAnnotation1/webrev/ (There are some .txt files intended for reviewing only. Please exclude them if you want to copy the files from this path directly.) - Charlie On 2013/9/11 11:05, Werner Dietl wrote: > Hi Charlie, > > sure, I can do that; where is the most up-to-date patch? > > Jon, is there any OpenJDK administrativa to follow, e.g. to make > Charlie an Author? > > cu, WMD. > > > > On Tue, Sep 10, 2013 at 7:45 PM, Charlie Wang > wrote: > > Hi, > I'm looking for a committer to help me check in type annotation > reflection test code. Could someone give me a hand? > > > > > Thanks, > Charlie > > -------- Original Message -------- > Subject: Re: type anno test code check in > Date: Tue, 10 Sep 2013 10:29:02 -0700 > From: Alex Buckley > > Organization: Oracle Corporation > To: Charlie Wang > > > > > Ask on type-annotations-dev for a Committer in the Type Annotations > Project to push the tests for you. The tests will go in the jdk repo. > > Alex > > On 9/10/2013 1:04 AM, Charlie Wang wrote: > > Hi Alex, > > I am trying to check in type annotation reflection test code. Could > > you tell me which repo should it go to? And I don't have author > > privilege. Could you refer me to someone to help me check in it? > > > > > > Thanks, > > Charlie > > > > > > > -- > http://www.google.com/profiles/wdietl -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130911/cc4f8a18/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: test.zip Type: application/x-zip-compressed Size: 70280 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130911/cc4f8a18/test-0001.zip From jonathan.gibbons at oracle.com Wed Sep 11 07:30:02 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 11 Sep 2013 07:30:02 -0700 Subject: type anno test code check in In-Reply-To: References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> Message-ID: <52307E6A.6080905@oracle.com> Contributors need to make a number of non-trivial contributions to become an Author. In general, we should now be looking to make commits into jdk8/tl in preference to type-annotations, assuming the code has been suitably reviewed. -- Jon On 09/10/2013 08:05 PM, Werner Dietl wrote: > Hi Charlie, > > sure, I can do that; where is the most up-to-date patch? > > Jon, is there any OpenJDK administrativa to follow, e.g. to make > Charlie an Author? > > cu, WMD. > > > > On Tue, Sep 10, 2013 at 7:45 PM, Charlie Wang > wrote: > > Hi, > I'm looking for a committer to help me check in type annotation > reflection test code. Could someone give me a hand? > > > > > Thanks, > Charlie > > -------- Original Message -------- > Subject: Re: type anno test code check in > Date: Tue, 10 Sep 2013 10:29:02 -0700 > From: Alex Buckley > > Organization: Oracle Corporation > To: Charlie Wang > > > > > Ask on type-annotations-dev for a Committer in the Type Annotations > Project to push the tests for you. The tests will go in the jdk repo. > > Alex > > On 9/10/2013 1:04 AM, Charlie Wang wrote: > > Hi Alex, > > I am trying to check in type annotation reflection test code. Could > > you tell me which repo should it go to? And I don't have author > > privilege. Could you refer me to someone to help me check in it? > > > > > > Thanks, > > Charlie > > > > > > > -- > http://www.google.com/profiles/wdietl -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130911/f1ecb99a/attachment.html From mernst at cs.washington.edu Wed Sep 11 07:38:30 2013 From: mernst at cs.washington.edu (Michael Ernst) Date: Wed, 11 Sep 2013 07:38:30 -0700 (PDT) Subject: type anno test code check in In-Reply-To: <52307E6A.6080905@oracle.com> References: <522FD95D.9040402@oracle.com> <52307E6A.6080905@oracle.com> Message-ID: <20130911.073830.1442363529935049530.mernst@cs.washington.edu> Jon- Does that mean you'll push the change instead of Werner? -Mike > Subject: Re: type anno test code check in > From: Jonathan Gibbons > To: Werner Dietl > Date: Wed, 11 Sep 2013 07:30:02 -0700 > > Contributors need to make a number of non-trivial contributions to > become an Author. > > In general, we should now be looking to make commits into jdk8/tl in > preference to type-annotations, assuming the code has been suitably > reviewed. > > -- Jon > > On 09/10/2013 08:05 PM, Werner Dietl wrote: > >> > Hi Charlie, >> > >> > >> > sure, I can do that; where is the most up-to-date patch? > >> > >> > >> > Jon, is there any OpenJDK administrativa to follow, e.g. to >> make Charlie an Author? > >> > >> > >> > >> > cu, WMD. > >> > >> > >> > >> > >> > >> > On Tue, Sep 10, 2013 at 7:45 PM, >> Charlie Wang >> wrote: > >> > > > > Hi, > > > I'm looking for a committer to help me check in > type > > annotation reflection test code. Could someone give > me a > > hand? > > > > > > > > > > > > > > > Thanks, > > > Charlie > > > > > > -------- Original Message -------- > > > > > > > Subject: > Re: type anno test code check in> > > > > Date: > Tue, 10 Sep 2013 10:29:02 -0700> > > > > From: > Alex Buckley > > > > > Organization: > Oracle Corporation> > > > > To: > Charlie Wang > > > > > > > > > > Ask on type-annotations-dev for a Committer in the Type > Annotations > Project to push the tests for you. The tests will go in > the jdk repo. > > Alex > > On 9/10/2013 1:04 AM, Charlie Wang wrote: > > > Hi Alex, > > I am trying to check in type annotation reflection test > code. Could > > you tell me which repo should it go to? And I don't have > author > > privilege. Could you refer me to someone to help me check in > it? > > > > > > Thanks, > > Charlie > > > > > > > > > > -- > http://www.google.com/profiles/wdietl From michel.trudeau at oracle.com Wed Sep 11 07:41:27 2013 From: michel.trudeau at oracle.com (Michel Trudeau) Date: Wed, 11 Sep 2013 07:41:27 -0700 Subject: type anno test code check in In-Reply-To: <52307E6A.6080905@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <52307E6A.6080905@oracle.com> Message-ID: <253A7664-CA93-4E63-9868-67F12662CDC2@oracle.com> Charlie, Please refer to the OpenJDK wiki in order to learn how to become an Author. http://openjdk.java.net/projects/#project-committer Michel On Sep 11, 2013, at 7:30 AM, Jonathan Gibbons wrote: Contributors need to make a number of non-trivial contributions to become an Author. In general, we should now be looking to make commits into jdk8/tl in preference to type-annotations, assuming the code has been suitably reviewed. -- Jon On 09/10/2013 08:05 PM, Werner Dietl wrote: > Hi Charlie, > > sure, I can do that; where is the most up-to-date patch? > > Jon, is there any OpenJDK administrativa to follow, e.g. to make Charlie an Author? > > cu, WMD. > > > > On Tue, Sep 10, 2013 at 7:45 PM, Charlie Wang wrote: > Hi, > I'm looking for a committer to help me check in type annotation reflection test code. Could someone give me a hand? > > > > > Thanks, > Charlie > > -------- Original Message -------- > Subject: Re: type anno test code check in > Date: Tue, 10 Sep 2013 10:29:02 -0700 > From: Alex Buckley > Organization: Oracle Corporation > To: Charlie Wang > > Ask on type-annotations-dev for a Committer in the Type Annotations > Project to push the tests for you. The tests will go in the jdk repo. > > Alex > > On 9/10/2013 1:04 AM, Charlie Wang wrote: > > Hi Alex, > > I am trying to check in type annotation reflection test code. Could > > you tell me which repo should it go to? And I don't have author > > privilege. Could you refer me to someone to help me check in it? > > > > > > Thanks, > > Charlie > > > > > > -- > http://www.google.com/profiles/wdietl -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130911/fa78d4d5/attachment.html From joel.franck at oracle.com Wed Sep 11 07:44:28 2013 From: joel.franck at oracle.com (Joel Borggren-Franck) Date: Wed, 11 Sep 2013 16:44:28 +0200 Subject: Fwd: Re: type anno test code check in In-Reply-To: <522FD95D.9040402@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> Message-ID: <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> Hi Charlie, These tests should go into TL, I can commit them there. The test review cycle should be on core-libs-dev at openjdk.java.net. However the test are not ready yet. If you run the tests vs jdk8-b106 or a recent copy of TL there is a few failures. How can I as a developer see the exact source which caused the failure? Further, there is an @author tag between two jtreg tags, @build and @run in almost every file. Please don't do that. As a user of these tests there needs to be a way for me to: 1) Understand the tests / ensure that the tests are correct 2) Run the tests 3) Understand what causes tests failures Out of these only 2) is currently easy. 1) is hard and 3) looks impossible. Here is what you need to do to bring this forward: - At a minimum you need to document how the tests work. It is not clear at the moment. - Please explain why are the helpers split out into 2 interfaces and 4 classes? - You also need to improve failure friendliness. If a tests fail, it must be possible to see the java source of the generated program that fails together with a decent explanation of what went wrong. If this is currently available, please indicate how to do it. cheers /Joel On 2013-09-11, Charlie Wang wrote: > Hi, > I'm looking for a committer to help me check in type annotation > reflection test code. Could someone give me a hand? > > > > Thanks, > Charlie > > -------- Original Message -------- > Subject: Re: type anno test code check in > Date: Tue, 10 Sep 2013 10:29:02 -0700 > From: Alex Buckley > Organization: Oracle Corporation > To: Charlie Wang > > > > Ask on type-annotations-dev for a Committer in the Type Annotations > Project to push the tests for you. The tests will go in the jdk repo. > > Alex > From jonathan.gibbons at oracle.com Wed Sep 11 08:19:03 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 11 Sep 2013 08:19:03 -0700 Subject: Fwd: Re: type anno test code check in In-Reply-To: <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> Message-ID: <523089E7.6050509@oracle.com> On 09/11/2013 07:44 AM, Joel Borggren-Franck wrote: > Further, there is an @author tag between two jtreg tags, @build and > @run in almost every file. Please don't do that. Charlie, To be clearer, you should generally list all information tags (@bug, @summary, @author, @library) after @test and before all action tags (like @build, @compile, @run) See the jtreg tag spec for more details. (Yes, it's old; there's a new version coming out real soon now.) -- Jon From steve.sides at oracle.com Wed Sep 11 09:47:47 2013 From: steve.sides at oracle.com (Steve Sides) Date: Wed, 11 Sep 2013 09:47:47 -0700 Subject: Fwd: Re: type anno test code check in In-Reply-To: <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> Message-ID: <52309EB3.8030706@oracle.com> A few things, - Charile can clean up the tags and add some comments, probably to the help class mostly. However, if you look at some of the recent tests going into jdk8, they're pretty darn hard to understand apart from some time of study. I think ease of test case extraction upon failure would help alleviate this. - The tests have been reviewed many times on this mailing list, resulting the somehow hard to understand current form. :/ - Ability to extract a test case may have been one of my initial list of items(at least is usually is), but I'm pretty sure ease of diagnosis got lost in the maze of review directions and rewritings. Charlie, see if there is a way to be able to more easily extract sample test case upon failure(have it spew the code for the particular test case under examination). It should be a bit easier to do since there appear to be some failures. -Jck just entered several bugs against these api's. You should check if your test failures match any open bugs. -Please enter bugs with some reproducible test case if test failures don't match current open bugs...afterall, that is the goal of the tests (that also may have gotten a bit lost). :) ; annotate the test(s) appropriately with @bug BUGID tags whether new or existing. ; Maybe even a separate smaller test case in the event of new failures. - I think they would eventually go into jdk8/tl/jdk, right? At this point, try to enter any new bugs with test cases as soon as you can. That alone may help facilitate much of the above(other than fixing test tags). Also, I do not think someone has to be an author to be a contributor(???) and have code which they have written put back. -steve On 9/11/2013 7:44 AM, Joel Borggren-Franck wrote: > Hi Charlie, > > These tests should go into TL, I can commit them there. The test review > cycle should be on core-libs-dev at openjdk.java.net. > > However the test are not ready yet. > > If you run the tests vs jdk8-b106 or a recent copy of TL there is a fe > failures. How can I as a developer see the exact source which caused the > failure? > > Further, there is an @author tag between two jtreg tags, @build and > @run in almost every file. Please don't do that. > > As ave a user of these tests there needs to be a way for me to: > > 1) Understand the tests / ensure that the tests are correct > 2) Run the tests > 3) Understand what causes tests failures > > Out of these only 2) is currently easy. 1) is hard and 3) looks > impossible. > > Here is what you need to do to bring this forward: > > - At a minimum you need to document how the tests work. It is not clear > at the moment. > > - Please explain why are the helpers split out into 2 interfaces and 4 > classes? > - You also need to improve failure friendliness. If a tests fail, it > must be possible to see the java source of the generated program that > fails together with a decent explanation of what went wrong. > > If this is currently available, please indicate how to do it. > > cheers > /Joel > > On 2013-09-11, Charlie Wang wrote: >> Hi, >> I'm looking for a committer to help me check in type annotation >> reflection test code. Could someone give me a hand? >> >> >> >> Thanks, >> Charlie >> >> -------- Original Message -------- >> Subject: Re: type anno test code check in >> Date: Tue, 10 Sep 2013 10:29:02 -0700 >> From: Alex Buckley >> Organization: Oracle Corporation >> To: Charlie Wang >> >> >> >> Ask on type-annotations-dev for a Committer in the Type Annotations >> Project to push the tests for you. The tests will go in the jdk repo. >> >> Alex >> From charlie.wang at oracle.com Thu Sep 12 04:05:18 2013 From: charlie.wang at oracle.com (Charlie Wang) Date: Thu, 12 Sep 2013 19:05:18 +0800 Subject: Fwd: Re: type anno test code check in In-Reply-To: <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> Message-ID: <52319FEE.3080703@oracle.com> Hi Joel, I ran the test on windows64, linux64, solaris32, mac64, and only found one failed test - ClassGetAnnotatedInterfacesTest. I think it is due to code change to Class.getAnnotatedInterfaces(). In the builds a while before b106 it didn't return null with primitive type class input, but now it does. I didn't find any bug to track this change when I searched with label "type-annotations" or "annotations". Besides that, I've made a little update to the comments of every tests explaining how the test code is constructed and run. By setting Helper.DEBUG = true/false, it displays/hides the test source code on the command line output, which is constructed for the test. I hope this doesn't seem overwhelmingly friendly. As suggested by Alex, the interfaces are introduced for extension. DeclarationGenerator is an interface for small code declarations. TestCaseGenerator is an interface for code generation of test cases. Helper constructs declarations and compile source code (better explanations are in Helper's comments). TestCodeGenerator is a utility class for test case generation. Attached are the updated test files. I will update the webrev link later. - Charlie On 2013/9/11 22:44, Joel Borggren-Franck wrote: > Hi Charlie, > > These tests should go into TL, I can commit them there. The test review > cycle should be on core-libs-dev at openjdk.java.net. > > However the test are not ready yet. > > If you run the tests vs jdk8-b106 or a recent copy of TL there is a few > failures. How can I as a developer see the exact source which caused the > failure? > > Further, there is an @author tag between two jtreg tags, @build and > @run in almost every file. Please don't do that. > > As a user of these tests there needs to be a way for me to: > > 1) Understand the tests / ensure that the tests are correct > 2) Run the tests > 3) Understand what causes tests failures > > Out of these only 2) is currently easy. 1) is hard and 3) looks > impossible. > > Here is what you need to do to bring this forward: > > - At a minimum you need to document how the tests work. It is not clear > at the moment. > > - Please explain why are the helpers split out into 2 interfaces and 4 > classes? > > - You also need to improve failure friendliness. If a tests fail, it > must be possible to see the java source of the generated program that > fails together with a decent explanation of what went wrong. > > If this is currently available, please indicate how to do it. > > cheers > /Joel > > On 2013-09-11, Charlie Wang wrote: >> Hi, >> I'm looking for a committer to help me check in type annotation >> reflection test code. Could someone give me a hand? >> >> >> >> Thanks, >> Charlie >> >> -------- Original Message -------- >> Subject: Re: type anno test code check in >> Date: Tue, 10 Sep 2013 10:29:02 -0700 >> From: Alex Buckley >> Organization: Oracle Corporation >> To: Charlie Wang >> >> >> >> Ask on type-annotations-dev for a Committer in the Type Annotations >> Project to push the tests for you. The tests will go in the jdk repo. >> >> Alex >> -------------- next part -------------- A non-text attachment was scrubbed... Name: test.zip Type: application/x-zip-compressed Size: 72947 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130912/d394068a/test-0001.zip From steve.sides at oracle.com Thu Sep 12 10:12:57 2013 From: steve.sides at oracle.com (Steve Sides) Date: Thu, 12 Sep 2013 10:12:57 -0700 Subject: Fwd: Re: type anno test code check in In-Reply-To: <52319FEE.3080703@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> <52319FEE.3080703@oracle.com> Message-ID: <5231F619.4070307@oracle.com> On 9/12/2013 4:05 AM, Charlie Wang wrote: > Hi Joel, > I ran the test on windows64, linux64, solaris32, mac64, and only > found one failed test - ClassGetAnnotatedInterfacesTest. I think it is > due to code change to Class.getAnnotatedInterfaces(). In the builds a > while before b106 it didn't return null with primitive type class > input, but now it does. I didn't find any bug to track this change > when I searched with label "type-annotations" or "annotations". > Besides that, I've made a little update to the comments of every > tests explaining how the test code is constructed and run. > By setting Helper.DEBUG = true/false, it displays/hides the test > source code on the command line output, which is constructed for the > test. I hope this doesn't seem overwhelmingly friendly. Can you make it so is displays or leave on disk the test source for failed test cases by default apart from DEBUG? Since we're really most interested in failed test cases and the ability to easily reproduce them with a small(er) test case, that would be the desired behavior. I.E., we don't want to say, "here's bug, to reproduce, run the whole test", or even "you can set DEBUG and go fish for the failed test case from the thousands in the debug output"....put in the most unfriendly terms. :) (I do smile when I write these things). -steve > As suggested by Alex, the interfaces are introduced for extension. > DeclarationGenerator is an interface for small code declarations. > TestCaseGenerator is an interface for code generation of test cases. > Helper constructs declarations and compile source code (better > explanations are in Helper's comments). TestCodeGenerator is a utility > class for test case generation. > > Attached are the updated test files. I will update the webrev link later. > > > > > > > - Charlie > > On 2013/9/11 22:44, Joel Borggren-Franck wrote: >> Hi Charlie, >> >> These tests should go into TL, I can commit them there. The test review >> cycle should be on core-libs-dev at openjdk.java.net. >> >> However the test are not ready yet. >> >> If you run the tests vs jdk8-b106 or a recent copy of TL there is a few >> failures. How can I as a developer see the exact source which caused the >> failure? >> >> Further, there is an @author tag between two jtreg tags, @build and >> @run in almost every file. Please don't do that. >> >> As a user of these tests there needs to be a way for me to: >> >> 1) Understand the tests / ensure that the tests are correct >> 2) Run the tests >> 3) Understand what causes tests failures >> >> Out of these only 2) is currently easy. 1) is hard and 3) looks >> impossible. >> >> Here is what you need to do to bring this forward: >> >> - At a minimum you need to document how the tests work. It is not clear >> at the moment. >> >> - Please explain why are the helpers split out into 2 interfaces and 4 >> classes? >> >> - You also need to improve failure friendliness. If a tests fail, it >> must be possible to see the java source of the generated program that >> fails together with a decent explanation of what went wrong. >> >> If this is currently available, please indicate how to do it. >> >> cheers >> /Joel >> >> On 2013-09-11, Charlie Wang wrote: >>> Hi, >>> I'm looking for a committer to help me check in type annotation >>> reflection test code. Could someone give me a hand? >>> >>> >>> >>> Thanks, >>> Charlie >>> >>> -------- Original Message -------- >>> Subject: Re: type anno test code check in >>> Date: Tue, 10 Sep 2013 10:29:02 -0700 >>> From: Alex Buckley >>> Organization: Oracle Corporation >>> To: Charlie Wang >>> >>> >>> >>> Ask on type-annotations-dev for a Committer in the Type Annotations >>> Project to push the tests for you. The tests will go in the jdk repo. >>> >>> Alex >>> > From jonathan.gibbons at oracle.com Thu Sep 12 10:20:44 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 12 Sep 2013 10:20:44 -0700 Subject: Fwd: Re: type anno test code check in In-Reply-To: <5231F619.4070307@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> <52319FEE.3080703@oracle.com> <5231F619.4070307@oracle.com> Message-ID: <5231F7EC.2000707@oracle.com> Charlie, As a general warning, note that jtreg limits the amount of output that is recorded from the console log. If you exceed the limit, jtreg will preserve the begnning of the output (to record start up messages) and the end of the output (to record summary messages, etc) and will omit text in between. Therefore, you may not want to record huge amounts of unnecessary output to the console log. Saving info to files in the scratch directory is fine. I endorse Steve's suggestion to make the default behavior be enough for initial debugging of failed test cases. This is good as a general practise for all tests, especially when it may be difficult to recreate the failure for environmental reasons. -- Jon On 09/12/2013 10:12 AM, Steve Sides wrote: > On 9/12/2013 4:05 AM, Charlie Wang wrote: >> Hi Joel, >> I ran the test on windows64, linux64, solaris32, mac64, and only >> found one failed test - ClassGetAnnotatedInterfacesTest. I think it >> is due to code change to Class.getAnnotatedInterfaces(). In the >> builds a while before b106 it didn't return null with primitive type >> class input, but now it does. I didn't find any bug to track this >> change when I searched with label "type-annotations" or "annotations". >> Besides that, I've made a little update to the comments of every >> tests explaining how the test code is constructed and run. >> By setting Helper.DEBUG = true/false, it displays/hides the test >> source code on the command line output, which is constructed for the >> test. I hope this doesn't seem overwhelmingly friendly. > Can you make it so is displays or leave on disk the test source for > failed test cases by default apart from DEBUG? > Since we're really most interested in failed test cases and the > ability to easily reproduce them with a small(er) test case, that > would be the desired behavior. > I.E., we don't want to say, "here's bug, to reproduce, run the whole > test", or even "you can set DEBUG and go fish for the failed test case > from the thousands in the debug output"....put in the most unfriendly > terms. :) (I do smile when I write these things). > > -steve > >> As suggested by Alex, the interfaces are introduced for extension. >> DeclarationGenerator is an interface for small code declarations. >> TestCaseGenerator is an interface for code generation of test cases. >> Helper constructs declarations and compile source code (better >> explanations are in Helper's comments). TestCodeGenerator is a >> utility class for test case generation. >> >> Attached are the updated test files. I will update the webrev link >> later. >> >> >> >> >> >> >> - Charlie >> >> On 2013/9/11 22:44, Joel Borggren-Franck wrote: >>> Hi Charlie, >>> >>> These tests should go into TL, I can commit them there. The test review >>> cycle should be on core-libs-dev at openjdk.java.net. >>> >>> However the test are not ready yet. >>> >>> If you run the tests vs jdk8-b106 or a recent copy of TL there is a few >>> failures. How can I as a developer see the exact source which caused >>> the >>> failure? >>> >>> Further, there is an @author tag between two jtreg tags, @build and >>> @run in almost every file. Please don't do that. >>> >>> As a user of these tests there needs to be a way for me to: >>> >>> 1) Understand the tests / ensure that the tests are correct >>> 2) Run the tests >>> 3) Understand what causes tests failures >>> >>> Out of these only 2) is currently easy. 1) is hard and 3) looks >>> impossible. >>> >>> Here is what you need to do to bring this forward: >>> >>> - At a minimum you need to document how the tests work. It is not clear >>> at the moment. >>> >>> - Please explain why are the helpers split out into 2 interfaces and 4 >>> classes? >>> >>> - You also need to improve failure friendliness. If a tests fail, it >>> must be possible to see the java source of the generated program >>> that >>> fails together with a decent explanation of what went wrong. >>> >>> If this is currently available, please indicate how to do it. >>> >>> cheers >>> /Joel >>> >>> On 2013-09-11, Charlie Wang wrote: >>>> Hi, >>>> I'm looking for a committer to help me check in type annotation >>>> reflection test code. Could someone give me a hand? >>>> >>>> >>>> >>>> Thanks, >>>> Charlie >>>> >>>> -------- Original Message -------- >>>> Subject: Re: type anno test code check in >>>> Date: Tue, 10 Sep 2013 10:29:02 -0700 >>>> From: Alex Buckley >>>> Organization: Oracle Corporation >>>> To: Charlie Wang >>>> >>>> >>>> >>>> Ask on type-annotations-dev for a Committer in the Type Annotations >>>> Project to push the tests for you. The tests will go in the jdk repo. >>>> >>>> Alex >>>> >> > From steve.sides at oracle.com Fri Sep 13 08:53:42 2013 From: steve.sides at oracle.com (Steve Sides) Date: Fri, 13 Sep 2013 08:53:42 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <52278CB5.4030005@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> Message-ID: <52333506.8020002@oracle.com> ..just pinging... On 9/4/2013 12:40 PM, Steve Sides wrote: > .after screwing up the webrev a little (it didn't scp like I thought > it would), I created a new one: > http://cr.openjdk.java.net/~ssides/8010225.2/ > with this changes: > > >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java > > >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java > > >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java > > I made the sorta unnecessary changes, since these are supposed to test > test-annotations. Like you said, they're not wrong. :) > > >test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java > > added positive test case of @compile AnnotationVersion.java > > >test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java > > I agree, these are kind of bad syntax with or without any anntations, > so I deleted the test. > > >test/tools/javac/annotations/typeAnnotations/failures/OldArray.java > added out file and ref= to test file. > > >test/tools/javac/annotations/typeAnnotations/failures/Scopes.java > I didn't mean to do more. Since I had them all loaded into an editor, > as I clicked through them, I made it a 4 space indent. > It's a superfluous but not incorrect change. > > >test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java > corrected usage (compile with no annotations) and added other static > contexts and updated .out file. > > >test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java > deleted in lieue of above changes. > > -steve > > On 8/30/2013 3:46 PM, Jonathan Gibbons wrote: >> On 08/08/2013 05:48 PM, Steve Sides wrote: >>> Some changes for JDK-8010225 : test in typeAnnotations/failures do >>> not test TYPE_USE >>> Bug: http://bugs.sun.com/view_bug.do?bug_id=8010225 >>> webrev: http://cr.openjdk.java.net/~ssides/8010225/ >>> >>> This fix is for tl/langtools but since it's all type-annotations >>> test I've posted it here. >>> >>> -steve >> >> >> Here's the list of files: >> >> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java >> >> OK. Edit is sorta unnecessary, but not wrong. >> >> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java >> >> OK. Edit is sorta unnecessary, but not wrong. >> >> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java >> >> OK. Edit is sorta unnecessary, but not wrong. >> >> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java >> >> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out >> >> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out >> >> Test is only negative for 6, 7. Would be better to add positive test >> without -source as well >> >> test/tools/javac/annotations/typeAnnotations/failures/BadCast.java >> test/tools/javac/annotations/typeAnnotations/failures/BadCast.out >> OK >> >> test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java >> >> test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out >> >> OK >> >> test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java >> >> test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out >> >> OK >> >> test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java >> >> test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out >> >> *** There's no varargs in this test, so this test is kinda weird >> As it stands, it's sort of a random syntax error test. >> >> test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java >> test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out >> OK >> >> test/tools/javac/annotations/typeAnnotations/failures/OldArray.java >> *** The test passes without changing the golden file. This is >> unexpected. >> The answer is because there is no /ref=...OldArray.out on line 29. >> This should be fixed, and then, you'll need to create a golden file! >> Also, remove the legal header and substitute /nodynamiccopyright/. >> >> test/tools/javac/annotations/typeAnnotations/failures/Scopes.java >> *** You've just removed a space from the line, nothing more. >> Did you mean to do more? >> >> test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java >> test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out >> *** Sorta OK, but not really. The test runs the risk of false positive >> because f is not itself declared static. Thus, quite apart from the >> annotation, you are trying to do static access to a non-static field, >> which is guaranteed to fail. >> >> test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java >> test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out >> This test is kinda pointless because the code fails even without the >> annotation. >> i.e. remove the annotation and the test still fails to compile. > From alex.buckley at oracle.com Fri Sep 13 10:42:09 2013 From: alex.buckley at oracle.com (Alex Buckley) Date: Fri, 13 Sep 2013 10:42:09 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <52333506.8020002@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> Message-ID: <52334E71.7050308@oracle.com> - AnnotationVersion: The @summary is imprecise - the test is about the receiver parameter 'this', not type annotations in general. In SE 6 and 7 and 8, the annotation type 'A' with no @Target is applicable to formal parameter declarations, so @A in front of a formal parameter would usually be a perfectly ordinary declaration annotation. However, a formal parameter called 'this' is not allowed in SE 6 or 7. In SE 8, 'this' is the receiver parameter (not a formal parameter!) and is legal syntax - but annotation type 'A' is not applicable to the type of the receiver parameter, so a different error is due than in 6/7. For completeness, there should be an accompanying test in this directory where 'A' has an explicit @Target(PARAMETER). AnnotationVersion is a poor name; good names would be AnnotatedReceiverParameter and AnnotatedReceiverParameterWithTarget. - Scopes: The @summary is inconsistent with the rest of the file. Also, line 15, the @Target meta-annotation which is commented out, should be deleted entirely, as the test relies on @Target _not_ being present. A commented-out line looks like someone forgot to change something. Alex On 9/13/2013 8:53 AM, Steve Sides wrote: > ..just pinging... > On 9/4/2013 12:40 PM, Steve Sides wrote: >> .after screwing up the webrev a little (it didn't scp like I thought >> it would), I created a new one: >> http://cr.openjdk.java.net/~ssides/8010225.2/ >> with this changes: >> >> >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java >> >> >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java >> >> >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java >> >> I made the sorta unnecessary changes, since these are supposed to test >> test-annotations. Like you said, they're not wrong. :) >> >> >test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java >> >> added positive test case of @compile AnnotationVersion.java >> >> >test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java >> >> I agree, these are kind of bad syntax with or without any anntations, >> so I deleted the test. >> >> >test/tools/javac/annotations/typeAnnotations/failures/OldArray.java >> added out file and ref= to test file. >> >> >test/tools/javac/annotations/typeAnnotations/failures/Scopes.java >> I didn't mean to do more. Since I had them all loaded into an editor, >> as I clicked through them, I made it a 4 space indent. >> It's a superfluous but not incorrect change. >> >> >test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java >> corrected usage (compile with no annotations) and added other static >> contexts and updated .out file. >> >> >test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java >> deleted in lieue of above changes. >> >> -steve >> >> On 8/30/2013 3:46 PM, Jonathan Gibbons wrote: >>> On 08/08/2013 05:48 PM, Steve Sides wrote: >>>> Some changes for JDK-8010225 : test in typeAnnotations/failures do >>>> not test TYPE_USE >>>> Bug: http://bugs.sun.com/view_bug.do?bug_id=8010225 >>>> webrev: http://cr.openjdk.java.net/~ssides/8010225/ >>>> >>>> This fix is for tl/langtools but since it's all type-annotations >>>> test I've posted it here. >>>> >>>> -steve >>> >>> >>> Here's the list of files: >>> >>> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java >>> >>> OK. Edit is sorta unnecessary, but not wrong. >>> >>> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java >>> >>> OK. Edit is sorta unnecessary, but not wrong. >>> >>> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java >>> >>> OK. Edit is sorta unnecessary, but not wrong. >>> >>> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java >>> >>> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out >>> >>> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out >>> >>> Test is only negative for 6, 7. Would be better to add positive test >>> without -source as well >>> >>> test/tools/javac/annotations/typeAnnotations/failures/BadCast.java >>> test/tools/javac/annotations/typeAnnotations/failures/BadCast.out >>> OK >>> >>> test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java >>> >>> test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out >>> >>> OK >>> >>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java >>> >>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out >>> >>> OK >>> >>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java >>> >>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out >>> >>> *** There's no varargs in this test, so this test is kinda weird >>> As it stands, it's sort of a random syntax error test. >>> >>> test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java >>> test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out >>> OK >>> >>> test/tools/javac/annotations/typeAnnotations/failures/OldArray.java >>> *** The test passes without changing the golden file. This is >>> unexpected. >>> The answer is because there is no /ref=...OldArray.out on line 29. >>> This should be fixed, and then, you'll need to create a golden file! >>> Also, remove the legal header and substitute /nodynamiccopyright/. >>> >>> test/tools/javac/annotations/typeAnnotations/failures/Scopes.java >>> *** You've just removed a space from the line, nothing more. >>> Did you mean to do more? >>> >>> test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java >>> test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out >>> *** Sorta OK, but not really. The test runs the risk of false positive >>> because f is not itself declared static. Thus, quite apart from the >>> annotation, you are trying to do static access to a non-static field, >>> which is guaranteed to fail. >>> >>> test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java >>> test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out >>> This test is kinda pointless because the code fails even without the >>> annotation. >>> i.e. remove the annotation and the test still fails to compile. >> > From wdietl at gmail.com Sun Sep 15 00:38:00 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sun, 15 Sep 2013 07:38:00 +0000 Subject: hg: type-annotations/type-annotations/langtools: 13 new changesets Message-ID: <20130915073858.26E5662846@hg.openjdk.java.net> Changeset: 3a3427ab11fb Author: wmdietl Date: 2013-09-15 00:23 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/3a3427ab11fb Make test case easier to debug by using two different type annotations. ! test/tools/javac/annotations/typeAnnotations/failures/TypeVariableCycleTest.java Changeset: 6f595e036db7 Author: wmdietl Date: 2013-09-15 00:27 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 Improve encapsulation of AnnotatedType - make fields private and only use accessor methods. ! src/share/classes/com/sun/tools/javac/code/Printer.java ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java ! src/share/classes/com/sun/tools/javac/code/Types.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/tree/JCTree.java ! test/tools/javac/annotations/typeAnnotations/failures/LintCast.out ! test/tools/javac/lib/DPrinter.java Changeset: e1772bcdf768 Author: wmdietl Date: 2013-09-15 00:30 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 Use the copied body instead of the input body. ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Changeset: 77d395862700 Author: jlahoda Date: 2013-09-09 23:13 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/77d395862700 8019521: Enhanced rethrow disabled in lambdas Summary: Fixing effectively final detection inside lambdas, small cleanup related to thrown types detection in lambdas Reviewed-by: mcimadamore, jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Flow.java ! src/share/classes/com/sun/tools/javac/tree/JCTree.java + test/tools/javac/lambda/EffectivelyFinalThrows.java Changeset: bb7271e64ef6 Author: jfranck Date: 2013-09-10 13:47 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bb7271e64ef6 8005222: Fixed bugs should have tests with bugid in @bug tag Reviewed-by: jfranck, jjg Contributed-by: Andreas Lundblad ! test/tools/javac/defaultMethods/ClassReaderTest/ClassReaderTest.java ! test/tools/javac/defaultMethods/Neg01.java ! test/tools/javac/defaultMethods/Neg02.java ! test/tools/javac/defaultMethods/Neg03.java ! test/tools/javac/defaultMethods/Neg04.java ! test/tools/javac/defaultMethods/Neg05.java ! test/tools/javac/defaultMethods/Neg06.java ! test/tools/javac/defaultMethods/Neg07.java ! test/tools/javac/defaultMethods/Neg08.java ! test/tools/javac/defaultMethods/Neg09.java ! test/tools/javac/defaultMethods/Neg10.java ! test/tools/javac/defaultMethods/Neg11.java ! test/tools/javac/defaultMethods/Neg12.java ! test/tools/javac/defaultMethods/Neg13.java ! test/tools/javac/defaultMethods/Neg14.java ! test/tools/javac/defaultMethods/Neg15.java ! test/tools/javac/defaultMethods/Neg16.java ! test/tools/javac/defaultMethods/Pos01.java ! test/tools/javac/defaultMethods/Pos02.java ! test/tools/javac/defaultMethods/Pos04.java ! test/tools/javac/defaultMethods/Pos05.java ! test/tools/javac/defaultMethods/Pos06.java ! test/tools/javac/defaultMethods/Pos07.java ! test/tools/javac/defaultMethods/Pos08.java ! test/tools/javac/defaultMethods/Pos10.java ! test/tools/javac/defaultMethods/Pos11.java ! test/tools/javac/defaultMethods/Pos12.java ! test/tools/javac/defaultMethods/Pos13.java ! test/tools/javac/defaultMethods/Pos14.java ! test/tools/javac/defaultMethods/Pos15.java ! test/tools/javac/defaultMethods/Pos16.java ! test/tools/javac/defaultMethods/TestDefaultBody.java ! test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java ! test/tools/javac/defaultMethods/crossCompile/CrossCompile.java ! test/tools/javac/defaultMethods/separate/Separate.java ! test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java ! test/tools/javac/lambda/EffectivelyFinalTest.java Changeset: d87f017ec217 Author: mcimadamore Date: 2013-09-10 16:47 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d87f017ec217 8024414: javac, should facilitate the use of the bootstrap compiler for debugging Reviewed-by: jjg ! make/netbeans/langtools/build.xml ! make/tools/anttasks/SelectToolTask.java Changeset: 65c218b25b61 Author: emc Date: 2013-09-11 08:30 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/65c218b25b61 8024510: lib/combo/tools/javac/combo/TemplateTest.java fails Summary: Edit regex in Template to allow "MAJOR." pattern. Reviewed-by: briangoetz ! test/lib/combo/tools/javac/combo/Template.java Changeset: cf37c3775397 Author: bpatel Date: 2013-09-11 14:50 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cf37c3775397 8015496: Information that package is deprecated is missing in profiles view Reviewed-by: jjg ! src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java ! src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java ! test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java + test/com/sun/javadoc/testProfiles/profile-rtjar-includes-nopkgs.txt Changeset: 5d2d484a1216 Author: emc Date: 2013-09-12 14:52 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/5d2d484a1216 8013846: javac fails to reject semantically equivalent generic method declarations Summary: Cause javac to consider intersection types with the same elements to be equal regardless of order. Reviewed-by: jjg, vromero ! src/share/classes/com/sun/tools/javac/comp/Check.java + test/tools/javac/generics/neg/OrderedIntersections.java + test/tools/javac/generics/neg/OrderedIntersections.out Changeset: 3ae1814f7c59 Author: vromero Date: 2013-09-12 22:40 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/3ae1814f7c59 8023558: Javac creates invalid bootstrap methods for complex lambda/methodref case Reviewed-by: jjg Contributed-by: maurizio.cimadamore at oracle.com, vicente.romero at oracle.com ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java + test/tools/javac/lambda/8023558/T8023558a.java + test/tools/javac/lambda/8023558/T8023558b.java + test/tools/javac/lambda/8023558/T8023558c.java Changeset: 03c26c60499c Author: vromero Date: 2013-09-14 15:23 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/03c26c60499c 8024207: javac crash in Flow.AssignAnalyzer.visitIdent Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Resolve.java + test/tools/javac/T8024207/FlowCrashTest.java + test/tools/javac/T8024207/FlowCrashTest.out Changeset: 4932bb04c4b8 Author: vromero Date: 2013-09-14 19:04 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4932bb04c4b8 7047734: javac, the LVT is not generated correctly in several scenarios Reviewed-by: jjg, mcimadamore ! src/share/classes/com/sun/tools/javac/code/Lint.java ! src/share/classes/com/sun/tools/javac/comp/Flow.java ! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.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/comp/TransTypes.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java ! src/share/classes/com/sun/tools/javac/jvm/Items.java + src/share/classes/com/sun/tools/javac/jvm/LVTRanges.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java ! src/share/classes/com/sun/tools/javac/util/Bits.java + test/tools/javac/flow/AliveRanges.java + test/tools/javac/flow/LVTHarness.java + test/tools/javac/flow/tests/TestCaseConditional.java + test/tools/javac/flow/tests/TestCaseDoLoop.java + test/tools/javac/flow/tests/TestCaseFor.java + test/tools/javac/flow/tests/TestCaseForEach.java + test/tools/javac/flow/tests/TestCaseIf.java + test/tools/javac/flow/tests/TestCaseIfElse.java + test/tools/javac/flow/tests/TestCaseSwitch.java + test/tools/javac/flow/tests/TestCaseTry.java + test/tools/javac/flow/tests/TestCaseWhile.java Changeset: 8894cf49ae1e Author: wmdietl Date: 2013-09-15 00:32 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8894cf49ae1e Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/javac/code/Lint.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/Flow.java ! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.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/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java From wdietl at gmail.com Sun Sep 15 00:45:29 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sun, 15 Sep 2013 07:45:29 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 11 new changesets Message-ID: <20130915074545.7091162847@hg.openjdk.java.net> Changeset: b6c7cd8b962b Author: jlaskey Date: 2013-09-09 13:35 -0300 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/b6c7cd8b962b 8024397: Nashorn FX Libraries need to be finalized. Reviewed-by: sundar, hannesw, lagergren Contributed-by: james.laskey at oracle.com ! src/jdk/nashorn/internal/runtime/resources/fx/base.js ! src/jdk/nashorn/internal/runtime/resources/fx/fxml.js ! src/jdk/nashorn/internal/runtime/resources/fx/graphics.js ! src/jdk/nashorn/internal/runtime/resources/fx/media.js ! src/jdk/nashorn/internal/runtime/resources/fx/swing.js ! src/jdk/nashorn/internal/runtime/resources/fx/swt.js ! src/jdk/nashorn/internal/runtime/resources/fx/web.js Changeset: 483b42e56da4 Author: jlaskey Date: 2013-09-10 14:21 -0300 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/483b42e56da4 8024539: FX Libraries update missing file Reviewed-by: sundar Contributed-by: james.laskey at oracle.com ! src/jdk/nashorn/internal/runtime/resources/fx/controls.js Changeset: badf750dda21 Author: attila Date: 2013-09-11 10:27 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/badf750dda21 8024130: We no longer need slots for temporaries in self-assign indices Reviewed-by: jlaskey, lagergren ! src/jdk/nashorn/internal/codegen/Attr.java Changeset: 2d4c8fa8a5f4 Author: sundar Date: 2013-09-11 20:49 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/2d4c8fa8a5f4 8024615: Refactor ScriptObjectMirror and JSObject to support external JSObject implementations Reviewed-by: jlaskey, hannesw ! src/jdk/nashorn/api/scripting/JSObject.java ! src/jdk/nashorn/api/scripting/NashornScriptEngine.java ! src/jdk/nashorn/api/scripting/ScriptObjectMirror.java ! src/jdk/nashorn/internal/ir/IdentNode.java ! src/jdk/nashorn/internal/lookup/MethodHandleFactory.java ! src/jdk/nashorn/internal/objects/NativeArray.java ! src/jdk/nashorn/internal/objects/NativeFunction.java ! src/jdk/nashorn/internal/runtime/ScriptRuntime.java ! src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java ! src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java + src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java + src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java - src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectMirrorIterator.java - src/jdk/nashorn/internal/runtime/arrays/ScriptObjectMirrorIterator.java ! src/jdk/nashorn/internal/runtime/linker/Bootstrap.java ! src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java + test/src/jdk/nashorn/api/scripting/PluggableJSObjectTest.java ! test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java Changeset: 66db7354e7e2 Author: sundar Date: 2013-09-11 22:51 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/66db7354e7e2 8024644: PluggableJSObject.iteratingJSObjectTest fails with jdk8-tl build Reviewed-by: jlaskey, hannesw ! test/src/jdk/nashorn/api/scripting/PluggableJSObjectTest.java Changeset: aa86166c6770 Author: sundar Date: 2013-09-11 22:53 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/aa86166c6770 Merge - src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectMirrorIterator.java - src/jdk/nashorn/internal/runtime/arrays/ScriptObjectMirrorIterator.java Changeset: e60f6add90d7 Author: hannesw Date: 2013-09-12 14:02 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/e60f6add90d7 8024476: Octane regression on Richards Reviewed-by: sundar, jlaskey ! src/jdk/nashorn/internal/runtime/JSType.java Changeset: 572a2e50ba9e Author: hannesw Date: 2013-09-12 17:13 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/572a2e50ba9e 8024512: Regex /[^\[]/ doesn't match Reviewed-by: jlaskey, sundar ! src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java + test/script/basic/JDK-8024512.js + test/script/basic/JDK-8024512.js.EXPECTED Changeset: 917b16e509bd Author: sundar Date: 2013-09-12 22:16 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/917b16e509bd 8024693: Various minor issues with JSONWriter used by script parser API Reviewed-by: jlaskey, hannesw ! make/build.xml ! src/jdk/nashorn/internal/ir/debug/JSONWriter.java ! test/script/basic/NASHORN-737.js ! test/script/basic/NASHORN-737.js.EXPECTED + test/script/basic/parser/assignmentExpr.js + test/script/basic/parser/assignmentExpr.js.EXPECTED + test/script/basic/parser/binaryExpr.js + test/script/basic/parser/binaryExpr.js.EXPECTED + test/script/basic/parser/breakStat.js + test/script/basic/parser/breakStat.js.EXPECTED + test/script/basic/parser/condExpr.js + test/script/basic/parser/condExpr.js.EXPECTED + test/script/basic/parser/continueStat.js + test/script/basic/parser/continueStat.js.EXPECTED + test/script/basic/parser/debuggerStat.js + test/script/basic/parser/debuggerStat.js.EXPECTED + test/script/basic/parser/functions.js + test/script/basic/parser/functions.js.EXPECTED + test/script/basic/parser/ifStat.js + test/script/basic/parser/ifStat.js.EXPECTED + test/script/basic/parser/labelledStat.js + test/script/basic/parser/labelledStat.js.EXPECTED + test/script/basic/parser/lhsExpr.js + test/script/basic/parser/lhsExpr.js.EXPECTED + test/script/basic/parser/loopStat.js + test/script/basic/parser/loopStat.js.EXPECTED + test/script/basic/parser/objectLitExpr.js + test/script/basic/parser/objectLitExpr.js.EXPECTED + test/script/basic/parser/parenExpr.js + test/script/basic/parser/parenExpr.js.EXPECTED + test/script/basic/parser/primaryExpr.js + test/script/basic/parser/primaryExpr.js.EXPECTED + test/script/basic/parser/returnStat.js + test/script/basic/parser/returnStat.js.EXPECTED + test/script/basic/parser/switchStat.js + test/script/basic/parser/switchStat.js.EXPECTED + test/script/basic/parser/throwStat.js + test/script/basic/parser/throwStat.js.EXPECTED + test/script/basic/parser/tryCatchStat.js + test/script/basic/parser/tryCatchStat.js.EXPECTED + test/script/basic/parser/unaryExpr.js + test/script/basic/parser/unaryExpr.js.EXPECTED + test/script/basic/parser/useStrict.js + test/script/basic/parser/useStrict.js.EXPECTED + test/script/basic/parser/util.js + test/script/basic/parser/varDecl.js + test/script/basic/parser/varDecl.js.EXPECTED + test/script/basic/parser/withStat.js + test/script/basic/parser/withStat.js.EXPECTED Changeset: 8b0914b25430 Author: sundar Date: 2013-09-13 16:45 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/8b0914b25430 8024619: JDBC java.sql.DriverManager is not usable from JS script Reviewed-by: jlaskey, lagergren, attila ! make/build.xml ! src/jdk/nashorn/internal/runtime/Context.java ! src/jdk/nashorn/internal/runtime/NashornLoader.java ! src/jdk/nashorn/internal/runtime/ScriptLoader.java ! src/jdk/nashorn/internal/runtime/StructureLoader.java + test/script/basic/JDK-8024619.js + test/src/META-INF/services/java.sql.Driver + test/src/jdk/nashorn/api/NashornSQLDriver.java Changeset: 5683eca2967a Author: sundar Date: 2013-09-13 17:50 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/5683eca2967a Merge From wdietl at gmail.com Sun Sep 15 00:53:06 2013 From: wdietl at gmail.com (Werner Dietl) Date: Sun, 15 Sep 2013 00:53:06 -0700 Subject: Better encapsulation for AnnotatedType Message-ID: <52356762.1000309@gmail.com> Jon, all, as you suggested, I encapsulated the typeAnnotations and underlyingType fields in com.sun.tools.javac.code.Type.AnnotatedType This actually made the code simpler in a few places. There is one new failure: langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java However, I think the test case is wrong: it uses a "normal" annotation processor and therefore runs too early. It should be changed to be a "type annotation processor", i.e. it should run after FLOW. I suggest we create a subclass/alternative to JavacTestingAbstractProcessor and use that to test type annotations. I'm not sure whether this had an effect on javadoc - if so, we should revisit when the typeAnnotations queue is flushed. Please review this changeset: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 If this first step is OK, we can next introduce the TypeMetadata abstraction. Regarding SymbolMetadata, I find it a bit strange that the methods that access SymbolMetadata in Symbol are still called "xxxAnnotations", e.g. com.sun.tools.javac.code.Symbol.getAnnotations() Should these also be renamed? I have one more change that I just pushed: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement to take the copied body instead of the original body. Charlie Garrett discovered this problem after painful debugging of a Checker Framework problem that depended on whether a label is present or not. I cannot present a simple test case for the error, but the change doesn't break any existing test cases. Also note that this was the only "unused variable" warning in TreeCopier. Warnings are useful. All comments welcome, cu, WMD. From wdietl at gmail.com Sun Sep 15 00:43:51 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sun, 15 Sep 2013 07:43:51 +0000 Subject: hg: type-annotations/type-annotations/jdk: 33 new changesets Message-ID: <20130915075230.7EC8162848@hg.openjdk.java.net> Changeset: f80b8af9c218 Author: xuelei Date: 2013-09-09 19:07 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f80b8af9c218 8024444: Change to use othervm mode of tests in SSLEngineImpl Reviewed-by: mullan ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java Changeset: 909aced59bef Author: alanb Date: 2013-09-10 10:42 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/909aced59bef 8023878: (fs) TEST_BUG java/nio/file/WatchService/SensitivityModifier.java fails intermittently Reviewed-by: alanb Contributed-by: yiming.wang at oracle.com ! test/java/nio/file/WatchService/SensitivityModifier.java Changeset: c9083205e6eb Author: xuelei Date: 2013-09-10 21:31 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c9083205e6eb 8024501: sun.security.mscapi.Key has no definition of serialVersionUID Reviewed-by: weijun ! src/windows/classes/sun/security/mscapi/Key.java Changeset: 13ee370ee8b3 Author: okutsu Date: 2013-09-11 15:29 +0900 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/13ee370ee8b3 8024141: Unexpected timezone display name Reviewed-by: peytoia ! src/share/classes/sun/util/locale/provider/LocaleResources.java + test/sun/util/locale/provider/Bug8024141.java Changeset: b271ea30f440 Author: jfranck Date: 2013-09-11 09:45 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b271ea30f440 4987375: (reflect) Class.get{Declared}Method{s} does not return clone() for array types Summary: Update spec to match long standing behavior Reviewed-by: darcy, mchung ! src/share/classes/java/lang/Class.java + test/java/lang/Class/ArrayMethods.java Changeset: 517c5e99fb2f Author: chegar Date: 2013-09-11 11:03 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/517c5e99fb2f 8024508: Fix doclint issues in com.sun.nio.sctp Reviewed-by: alanb ! src/share/classes/com/sun/nio/sctp/Association.java ! src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java ! src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java ! src/share/classes/com/sun/nio/sctp/InvalidStreamException.java ! src/share/classes/com/sun/nio/sctp/MessageInfo.java ! src/share/classes/com/sun/nio/sctp/Notification.java ! src/share/classes/com/sun/nio/sctp/SctpChannel.java ! src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java ! src/share/classes/com/sun/nio/sctp/SctpServerChannel.java Changeset: d389dedd1ccb Author: chegar Date: 2013-09-11 11:32 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d389dedd1ccb 8023090: Additional debug info for java/net/NetworkInterface/Equals.java Reviewed-by: alanb ! test/java/net/NetworkInterface/Equals.java Changeset: 7bfe3da4fad6 Author: naoto Date: 2013-09-11 05:38 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7bfe3da4fad6 8024332: sun/util/resources/en split between rt.jar and localedata.jar Reviewed-by: alanb, erikj ! make/java/java/genlocales.gmk ! make/java/java/localegen.sh ! make/java/text/base/FILES_java.gmk ! make/java/util/FILES_java.gmk ! make/java/util/FILES_properties.gmk ! make/sun/text/FILES_java.gmk ! make/sun/text/FILES_properties.gmk ! makefiles/CreateJars.gmk ! makefiles/GensrcLocaleDataMetaInfo.gmk ! src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java ! src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template Changeset: c3ef78cd9081 Author: emc Date: 2013-09-11 09:24 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c3ef78cd9081 6962494: Update documentation on Executable.getParameterAnnotations() Summary: Update javadoc comments on getParameterAnnotations to correctly describe its behavior Reviewed-by: darcy, jfranck ! src/share/classes/java/lang/reflect/Executable.java Changeset: 1ec241501e60 Author: michaelm Date: 2013-09-11 15:00 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1ec241501e60 8024601: Windows networking code prevents use of -Xlint:auxiliaryclass in jdk build Reviewed-by: chegar ! src/share/classes/java/net/AbstractPlainSocketImpl.java + src/share/classes/java/net/InetAddressContainer.java Changeset: 7dcb9d944910 Author: michaelm Date: 2013-09-11 15:02 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7dcb9d944910 Merge Changeset: 292d93f32aa1 Author: rriggs Date: 2013-09-11 10:16 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/292d93f32aa1 8024164: JSR310 serialization should be described in details Summary: The serialized-form.html should specify the stream format for interoperability Reviewed-by: alanb ! src/share/classes/java/time/Duration.java ! src/share/classes/java/time/Instant.java ! src/share/classes/java/time/LocalDate.java ! src/share/classes/java/time/LocalDateTime.java ! src/share/classes/java/time/LocalTime.java ! src/share/classes/java/time/MonthDay.java ! src/share/classes/java/time/OffsetDateTime.java ! src/share/classes/java/time/OffsetTime.java ! src/share/classes/java/time/Period.java ! src/share/classes/java/time/Ser.java ! src/share/classes/java/time/Year.java ! src/share/classes/java/time/YearMonth.java ! src/share/classes/java/time/ZoneId.java ! src/share/classes/java/time/ZoneOffset.java ! src/share/classes/java/time/ZoneRegion.java ! src/share/classes/java/time/ZonedDateTime.java ! src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java ! src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java ! src/share/classes/java/time/chrono/Chronology.java ! src/share/classes/java/time/chrono/HijrahChronology.java ! src/share/classes/java/time/chrono/HijrahDate.java ! src/share/classes/java/time/chrono/HijrahEra.java ! src/share/classes/java/time/chrono/IsoChronology.java ! src/share/classes/java/time/chrono/JapaneseChronology.java ! src/share/classes/java/time/chrono/JapaneseDate.java ! src/share/classes/java/time/chrono/JapaneseEra.java ! src/share/classes/java/time/chrono/MinguoChronology.java ! src/share/classes/java/time/chrono/MinguoDate.java ! src/share/classes/java/time/chrono/MinguoEra.java ! src/share/classes/java/time/chrono/Ser.java ! src/share/classes/java/time/chrono/ThaiBuddhistChronology.java ! src/share/classes/java/time/chrono/ThaiBuddhistDate.java ! src/share/classes/java/time/chrono/ThaiBuddhistEra.java ! src/share/classes/java/time/zone/Ser.java ! src/share/classes/java/time/zone/ZoneOffsetTransition.java ! src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java ! src/share/classes/java/time/zone/ZoneRules.java ! test/java/time/tck/java/time/chrono/TCKChronologySerialization.java Changeset: 8b4aef582087 Author: rriggs Date: 2013-09-11 10:35 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/8b4aef582087 Merge Changeset: 60b4cbdb446d Author: sherman Date: 2013-09-11 11:29 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/60b4cbdb446d 8024338: Constant fields introduced by JDK-4759491 fix in b94 are exposed as public fields in public API Summary: to move the new constants out of ZipConstants.java Reviewed-by: martin ! src/share/classes/java/util/zip/ZipConstants.java ! src/share/classes/java/util/zip/ZipConstants64.java ! src/share/classes/java/util/zip/ZipEntry.java Changeset: 70aab3db56de Author: henryjen Date: 2013-09-11 11:25 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/70aab3db56de 8024500: Missing API coverage for java.util.function.BiFunction andThen Reviewed-by: mduigou, alanb + test/java/util/Collections/SingletonIterator.java + test/java/util/function/BiFunction/BiFunctionTest.java Changeset: e407df8093dc Author: sjiang Date: 2013-09-12 09:41 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e407df8093dc 8023529: OpenMBeanInfoSupport.equals/hashCode throw NPE Reviewed-by: dholmes, dfuchs ! src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java + test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java + test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java Changeset: 262a625809fd Author: darcy Date: 2013-09-12 01:47 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/262a625809fd 8024643: Turn on javac lint checking in building the jdk repo Reviewed-by: erikj, ihse, smarks ! makefiles/Setup.gmk Changeset: 631c8dcd91f4 Author: dfuchs Date: 2013-09-12 17:01 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/631c8dcd91f4 8024525: Make Logger log methods call isLoggable() Summary: This changeset makes the various Logger logging method call isLoggable() instead of inlining the level checks. Reviewed-by: mchung, alanb ! src/share/classes/java/util/logging/Logger.java + test/java/util/logging/Logger/isLoggable/TestIsLoggable.java Changeset: 672f349fbad7 Author: rriggs Date: 2013-09-12 10:58 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/672f349fbad7 8024618: Issues with French locale on compact1,2: expected: but was: Summary: Tests against the data of the French locale are not valid as conformance tests and are redundant with testing of the US Locale above Reviewed-by: alanb ! test/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java Changeset: 60d6f60416ca Author: lancea Date: 2013-09-12 13:20 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/60d6f60416ca 8015340: remove erroneous @since tag Reviewed-by: darcy ! src/share/classes/java/sql/PreparedStatement.java Changeset: be6f5f027bc2 Author: henryjen Date: 2013-09-06 22:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/be6f5f027bc2 8011916: Spec update for java.util.stream 8024339: j.u.s.Stream.reduce(BinaryOperator) throws unexpected NPE Reviewed-by: mduigou Contributed-by: brian.goetz at oracle.com ! src/share/classes/java/util/Collection.java ! src/share/classes/java/util/function/package-info.java ! src/share/classes/java/util/stream/BaseStream.java ! src/share/classes/java/util/stream/Collector.java ! src/share/classes/java/util/stream/Collectors.java ! src/share/classes/java/util/stream/DoublePipeline.java ! src/share/classes/java/util/stream/DoubleStream.java ! src/share/classes/java/util/stream/IntPipeline.java ! src/share/classes/java/util/stream/IntStream.java ! src/share/classes/java/util/stream/LongPipeline.java ! src/share/classes/java/util/stream/LongStream.java ! src/share/classes/java/util/stream/PipelineHelper.java ! src/share/classes/java/util/stream/ReferencePipeline.java ! src/share/classes/java/util/stream/Stream.java ! src/share/classes/java/util/stream/StreamSpliterators.java ! src/share/classes/java/util/stream/StreamSupport.java ! src/share/classes/java/util/stream/package-info.java Changeset: 917fffe971c8 Author: bpb Date: 2013-09-11 17:07 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/917fffe971c8 8010430: Math.round has surprising behavior for odd values of ulp 1 Summary: If the effective floating point exponent is zero return the significand including the implicit 1-bit. Reviewed-by: bpb, darcy, gls Contributed-by: Dmitry Nadezhin ! src/share/classes/java/lang/Math.java ! src/share/classes/java/lang/StrictMath.java ! test/java/lang/Math/RoundTests.java Changeset: ba0b95f310c8 Author: sjiang Date: 2013-09-13 10:48 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ba0b95f310c8 8023669: MBean*Info.hashCode : NPE Reviewed-by: dholmes, dfuchs, jbachorik ! src/share/classes/javax/management/MBeanAttributeInfo.java ! src/share/classes/javax/management/MBeanConstructorInfo.java ! src/share/classes/javax/management/MBeanInfo.java ! src/share/classes/javax/management/MBeanOperationInfo.java ! src/share/classes/javax/management/MBeanParameterInfo.java + test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java Changeset: cc2bae7f8fbb Author: bchristi Date: 2013-09-12 14:22 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cc2bae7f8fbb 8024009: Remove jdk.map.useRandomSeed system property Summary: Removed usage of hashSeed in Hashtable & WeakHashMap, and removed tests Reviewed-by: alanb, mduigou ! src/share/classes/java/util/Hashtable.java ! src/share/classes/java/util/WeakHashMap.java - test/java/util/Map/CheckRandomHashSeed.java ! test/java/util/Map/Collisions.java Changeset: c53411f89b4c Author: msheppar Date: 2013-09-13 12:20 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c53411f89b4c 8024675: java/net/NetworkInterface/UniqueMacAddressesTest.java fails on Windows Summary: amended test to add active, i.e. isUp(), NetworkInterfaces to test list Reviewed-by: alanb, chegar ! test/java/net/NetworkInterface/UniqueMacAddressesTest.java Changeset: c65848f2b6a1 Author: mduigou Date: 2013-09-13 11:18 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c65848f2b6a1 8021591: Additional explicit null checks Reviewed-by: psandoz, alanb ! src/share/classes/java/util/Collections.java ! src/share/classes/java/util/Hashtable.java ! src/share/classes/java/util/IdentityHashMap.java ! src/share/classes/java/util/Map.java ! src/share/classes/java/util/TreeMap.java ! src/share/classes/java/util/concurrent/ConcurrentHashMap.java ! src/share/classes/javax/security/auth/Subject.java ! test/java/util/Collection/CollectionDefaults.java - test/java/util/Collection/ListDefaults.java ! test/java/util/Collection/MOAT.java ! test/java/util/Collection/testlibrary/CollectionAsserts.java ! test/java/util/Collection/testlibrary/CollectionSupplier.java + test/java/util/Collection/testlibrary/ExtendsAbstractCollection.java + test/java/util/Collection/testlibrary/ExtendsAbstractList.java + test/java/util/Collection/testlibrary/ExtendsAbstractSet.java + test/java/util/List/ListDefaults.java ! test/java/util/Map/Defaults.java Changeset: 973fdd9506b2 Author: mduigou Date: 2013-09-13 11:19 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/973fdd9506b2 8024014: TEST.groups - split sub-groups for jdk_collections, jdk_stream, jdk_concurrent, jdk_util_other from jdk_util Reviewed-by: mchung, dholmes, alanb ! test/TEST.groups Changeset: 5f81a12fed4d Author: bchristi Date: 2013-09-13 11:26 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5f81a12fed4d 7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx] Summary: On MacOS X set user.home to value of NSHomeDirectory() Reviewed-by: alanb, ddehaven, mduigou ! make/common/Defs-macosx.gmk ! make/java/java/Makefile ! makefiles/CompileNativeLibraries.gmk ! src/solaris/native/java/lang/java_props_macosx.c ! src/solaris/native/java/lang/java_props_macosx.h ! src/solaris/native/java/lang/java_props_md.c Changeset: 5c7690923663 Author: lancea Date: 2013-09-13 19:10 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5c7690923663 8014967: EBehavior of DriverManager.registerDriver(dr) is unspecified if driver is null Reviewed-by: alanb ! src/share/classes/java/sql/DriverManager.java Changeset: a7980b099af1 Author: henryjen Date: 2013-09-06 15:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a7980b099af1 8024825: Some fixes are missing from java.util.stream spec update Reviewed-by: mduigou ! src/share/classes/java/util/stream/ReferencePipeline.java ! src/share/classes/java/util/stream/Stream.java ! src/share/classes/java/util/stream/package-info.java Changeset: 3255a4e348a1 Author: rriggs Date: 2013-09-14 13:55 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3255a4e348a1 8023639: Difference between LocalTime.now(Clock.systemDefaultZone()) and LocalTime.now() executed successively is more than 100 000 000 nanoseconds for slow machines Summary: Test timed out on a slow machine; it is not a conformance test and should be in the test subtree Reviewed-by: darcy, sherman ! test/java/time/tck/java/time/TCKLocalTime.java ! test/java/time/test/java/time/TestLocalTime.java Changeset: 35bb1c7f227c Author: rriggs Date: 2013-09-14 13:55 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/35bb1c7f227c 8023556: Update javadoc for start of Meiji era Summary: correct the javadoc in JapaneseEra.MEIJI to match the implementation Reviewed-by: darcy, sherman ! src/share/classes/java/time/chrono/JapaneseEra.java ! test/java/time/test/java/time/TestLocalTime.java Changeset: a88254c70ad6 Author: wmdietl Date: 2013-09-15 00:43 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a88254c70ad6 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk ! src/share/classes/java/lang/Class.java ! src/share/classes/java/lang/reflect/Executable.java From wdietl at gmail.com Sun Sep 15 00:38:40 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sun, 15 Sep 2013 07:38:40 +0000 Subject: hg: type-annotations/type-annotations: 2 new changesets Message-ID: <20130915073842.37D9962844@hg.openjdk.java.net> Changeset: 67f64101616e Author: mduigou Date: 2013-09-13 12:06 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/67f64101616e 8024201: Update bugdatabase url Reviewed-by: wetmore ! make/scripts/webrev.ksh Changeset: 9e55781e1d2b Author: wmdietl Date: 2013-09-15 00:38 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/9e55781e1d2b Automated merge with http://hg.openjdk.java.net/jdk8/tl/ From charlie.wang at oracle.com Mon Sep 16 00:33:28 2013 From: charlie.wang at oracle.com (Charlie Wang) Date: Mon, 16 Sep 2013 15:33:28 +0800 Subject: Fwd: Re: type anno test code check in In-Reply-To: <5231F619.4070307@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> <52319FEE.3080703@oracle.com> <5231F619.4070307@oracle.com> Message-ID: <5236B448.7030006@oracle.com> Hi Steve, Made the update according to your comments. The test will dump the source code into a .txt file if it fails. Please review the attachment. I will update webrev later. - Charlie On 2013/9/13 1:12, Steve Sides wrote: > On 9/12/2013 4:05 AM, Charlie Wang wrote: >> Hi Joel, >> I ran the test on windows64, linux64, solaris32, mac64, and only >> found one failed test - ClassGetAnnotatedInterfacesTest. I think it >> is due to code change to Class.getAnnotatedInterfaces(). In the >> builds a while before b106 it didn't return null with primitive type >> class input, but now it does. I didn't find any bug to track this >> change when I searched with label "type-annotations" or "annotations". >> Besides that, I've made a little update to the comments of every >> tests explaining how the test code is constructed and run. >> By setting Helper.DEBUG = true/false, it displays/hides the test >> source code on the command line output, which is constructed for the >> test. I hope this doesn't seem overwhelmingly friendly. > Can you make it so is displays or leave on disk the test source for > failed test cases by default apart from DEBUG? > Since we're really most interested in failed test cases and the > ability to easily reproduce them with a small(er) test case, that > would be the desired behavior. > I.E., we don't want to say, "here's bug, to reproduce, run the whole > test", or even "you can set DEBUG and go fish for the failed test case > from the thousands in the debug output"....put in the most unfriendly > terms. :) (I do smile when I write these things). > > -steve > >> As suggested by Alex, the interfaces are introduced for extension. >> DeclarationGenerator is an interface for small code declarations. >> TestCaseGenerator is an interface for code generation of test cases. >> Helper constructs declarations and compile source code (better >> explanations are in Helper's comments). TestCodeGenerator is a >> utility class for test case generation. >> >> Attached are the updated test files. I will update the webrev link >> later. >> >> >> >> >> >> >> - Charlie >> >> On 2013/9/11 22:44, Joel Borggren-Franck wrote: >>> Hi Charlie, >>> >>> These tests should go into TL, I can commit them there. The test review >>> cycle should be on core-libs-dev at openjdk.java.net. >>> >>> However the test are not ready yet. >>> >>> If you run the tests vs jdk8-b106 or a recent copy of TL there is a few >>> failures. How can I as a developer see the exact source which caused >>> the >>> failure? >>> >>> Further, there is an @author tag between two jtreg tags, @build and >>> @run in almost every file. Please don't do that. >>> >>> As a user of these tests there needs to be a way for me to: >>> >>> 1) Understand the tests / ensure that the tests are correct >>> 2) Run the tests >>> 3) Understand what causes tests failures >>> >>> Out of these only 2) is currently easy. 1) is hard and 3) looks >>> impossible. >>> >>> Here is what you need to do to bring this forward: >>> >>> - At a minimum you need to document how the tests work. It is not clear >>> at the moment. >>> >>> - Please explain why are the helpers split out into 2 interfaces and 4 >>> classes? >>> >>> - You also need to improve failure friendliness. If a tests fail, it >>> must be possible to see the java source of the generated program >>> that >>> fails together with a decent explanation of what went wrong. >>> >>> If this is currently available, please indicate how to do it. >>> >>> cheers >>> /Joel >>> >>> On 2013-09-11, Charlie Wang wrote: >>>> Hi, >>>> I'm looking for a committer to help me check in type annotation >>>> reflection test code. Could someone give me a hand? >>>> >>>> >>>> >>>> Thanks, >>>> Charlie >>>> >>>> -------- Original Message -------- >>>> Subject: Re: type anno test code check in >>>> Date: Tue, 10 Sep 2013 10:29:02 -0700 >>>> From: Alex Buckley >>>> Organization: Oracle Corporation >>>> To: Charlie Wang >>>> >>>> >>>> >>>> Ask on type-annotations-dev for a Committer in the Type Annotations >>>> Project to push the tests for you. The tests will go in the jdk repo. >>>> >>>> Alex >>>> >> > -------------- next part -------------- A non-text attachment was scrubbed... Name: test.zip Type: application/x-zip-compressed Size: 73319 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130916/0dd58eac/test-0001.zip From jonathan.gibbons at oracle.com Mon Sep 16 08:03:14 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 16 Sep 2013 08:03:14 -0700 Subject: Fwd: Re: type anno test code check in In-Reply-To: <5236B448.7030006@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> <52319FEE.3080703@oracle.com> <5231F619.4070307@oracle.com> <5236B448.7030006@oracle.com> Message-ID: <52371DB2.5030206@oracle.com> Charlie, If it's source code, why would you not dump it into a .java file? -- Jon On 09/16/2013 12:33 AM, Charlie Wang wrote: > Hi Steve, > Made the update according to your comments. The test will dump the > source code into a .txt file if it fails. Please review the > attachment. I will update webrev later. > > > - Charlie > > On 2013/9/13 1:12, Steve Sides wrote: >> On 9/12/2013 4:05 AM, Charlie Wang wrote: >>> Hi Joel, >>> I ran the test on windows64, linux64, solaris32, mac64, and only >>> found one failed test - ClassGetAnnotatedInterfacesTest. I think it >>> is due to code change to Class.getAnnotatedInterfaces(). In the >>> builds a while before b106 it didn't return null with primitive type >>> class input, but now it does. I didn't find any bug to track this >>> change when I searched with label "type-annotations" or "annotations". >>> Besides that, I've made a little update to the comments of every >>> tests explaining how the test code is constructed and run. >>> By setting Helper.DEBUG = true/false, it displays/hides the test >>> source code on the command line output, which is constructed for the >>> test. I hope this doesn't seem overwhelmingly friendly. >> Can you make it so is displays or leave on disk the test source for >> failed test cases by default apart from DEBUG? >> Since we're really most interested in failed test cases and the >> ability to easily reproduce them with a small(er) test case, that >> would be the desired behavior. >> I.E., we don't want to say, "here's bug, to reproduce, run the whole >> test", or even "you can set DEBUG and go fish for the failed test >> case from the thousands in the debug output"....put in the most >> unfriendly terms. :) (I do smile when I write these things). >> >> -steve >> >>> As suggested by Alex, the interfaces are introduced for extension. >>> DeclarationGenerator is an interface for small code declarations. >>> TestCaseGenerator is an interface for code generation of test cases. >>> Helper constructs declarations and compile source code (better >>> explanations are in Helper's comments). TestCodeGenerator is a >>> utility class for test case generation. >>> >>> Attached are the updated test files. I will update the webrev link >>> later. >>> >>> >>> >>> >>> >>> >>> - Charlie >>> >>> On 2013/9/11 22:44, Joel Borggren-Franck wrote: >>>> Hi Charlie, >>>> >>>> These tests should go into TL, I can commit them there. The test >>>> review >>>> cycle should be on core-libs-dev at openjdk.java.net. >>>> >>>> However the test are not ready yet. >>>> >>>> If you run the tests vs jdk8-b106 or a recent copy of TL there is a >>>> few >>>> failures. How can I as a developer see the exact source which >>>> caused the >>>> failure? >>>> >>>> Further, there is an @author tag between two jtreg tags, @build and >>>> @run in almost every file. Please don't do that. >>>> >>>> As a user of these tests there needs to be a way for me to: >>>> >>>> 1) Understand the tests / ensure that the tests are correct >>>> 2) Run the tests >>>> 3) Understand what causes tests failures >>>> >>>> Out of these only 2) is currently easy. 1) is hard and 3) looks >>>> impossible. >>>> >>>> Here is what you need to do to bring this forward: >>>> >>>> - At a minimum you need to document how the tests work. It is not >>>> clear >>>> at the moment. >>>> >>>> - Please explain why are the helpers split out into 2 interfaces and 4 >>>> classes? >>>> >>>> - You also need to improve failure friendliness. If a tests fail, it >>>> must be possible to see the java source of the generated program >>>> that >>>> fails together with a decent explanation of what went wrong. >>>> >>>> If this is currently available, please indicate how to do it. >>>> >>>> cheers >>>> /Joel >>>> >>>> On 2013-09-11, Charlie Wang wrote: >>>>> Hi, >>>>> I'm looking for a committer to help me check in type annotation >>>>> reflection test code. Could someone give me a hand? >>>>> >>>>> >>>>> >>>>> Thanks, >>>>> Charlie >>>>> >>>>> -------- Original Message -------- >>>>> Subject: Re: type anno test code check in >>>>> Date: Tue, 10 Sep 2013 10:29:02 -0700 >>>>> From: Alex Buckley >>>>> Organization: Oracle Corporation >>>>> To: Charlie Wang >>>>> >>>>> >>>>> >>>>> Ask on type-annotations-dev for a Committer in the Type Annotations >>>>> Project to push the tests for you. The tests will go in the jdk repo. >>>>> >>>>> Alex >>>>> >>> >> From steve.sides at oracle.com Mon Sep 16 14:42:36 2013 From: steve.sides at oracle.com (Steve Sides) Date: Mon, 16 Sep 2013 14:42:36 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <52334E71.7050308@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> Message-ID: <52377B4C.5070005@oracle.com> On 9/13/2013 10:42 AM, Alex Buckley wrote: > - AnnotationVersion: The @summary is imprecise - the test is about the > receiver parameter 'this', not type annotations in general. In SE 6 > and 7 and 8, the annotation type 'A' with no I'm not so sure I agree with that. Due to the 3 @compile lines, the test is about allowing type-annotations only with jdk8. The fact that he put the annotation on 'this' appears to me to be incidental. It may be odd that he chose 'this' as opposed to maybe 'String' or some other more common usage, but it does seem to be just a usage to make the general point and elicit the diagnostic "compiler.err.type.annotations.not.supported.in.source: 1.7", and not to test that specific usage. > @Target is applicable to formal parameter declarations, so @A in front > of a formal parameter would usually be a perfectly ordinary > declaration annotation. However, a formal parameter called 'this' is > not allowed in SE 6 or 7. In SE 8, 'this' is the receiver parameter > (not a formal parameter!) and is legal syntax - but annotation type > 'A' is not applicable to the type of the receiver parameter, so a > different error is due than in 6/7. > > For completeness, there should be an accompanying test in this > directory where 'A' has an explicit @Target(PARAMETER). > AnnotationVersion is a poor name; good names would be > AnnotatedReceiverParameter and AnnotatedReceiverParameterWithTarget. > > - Scopes: The @summary is inconsistent with the rest of the file. > Also, line 15, the @Target meta-annotation which is commented out, > should be deleted entirely, as the test relies on @Target _not_ being > present. A commented-out line looks like someone forgot to change > something. Agreed. This test needs something or something less, or a little of both. "Scopes" seems a little grand for 1 check. I wasn't sure about the comment. Maybe I was squinting and looking sideways to see it as making the point more explicit, but then it could also be seen as a left over. -steve > > Alex > > On 9/13/2013 8:53 AM, Steve Sides wrote: >> ..just pinging... >> On 9/4/2013 12:40 PM, Steve Sides wrote: >>> .after screwing up the webrev a little (it didn't scp like I thought >>> it would), I created a new one: >>> http://cr.openjdk.java.net/~ssides/8010225.2/ >>> with this changes: >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java >>> >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java >>> >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java >>> >>> >>> I made the sorta unnecessary changes, since these are supposed to test >>> test-annotations. Like you said, they're not wrong. :) >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java >>> >>> >>> added positive test case of @compile AnnotationVersion.java >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java >>> >>> >>> I agree, these are kind of bad syntax with or without any anntations, >>> so I deleted the test. >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/OldArray.java >>> added out file and ref= to test file. >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/Scopes.java >>> I didn't mean to do more. Since I had them all loaded into an editor, >>> as I clicked through them, I made it a 4 space indent. >>> It's a superfluous but not incorrect change. >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java >>> >>> corrected usage (compile with no annotations) and added other static >>> contexts and updated .out file. >>> >>> >test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java >>> >>> deleted in lieue of above changes. >>> >>> -steve >>> >>> On 8/30/2013 3:46 PM, Jonathan Gibbons wrote: >>>> On 08/08/2013 05:48 PM, Steve Sides wrote: >>>>> Some changes for JDK-8010225 : test in typeAnnotations/failures do >>>>> not test TYPE_USE >>>>> Bug: http://bugs.sun.com/view_bug.do?bug_id=8010225 >>>>> webrev: http://cr.openjdk.java.net/~ssides/8010225/ >>>>> >>>>> This fix is for tl/langtools but since it's all type-annotations >>>>> test I've posted it here. >>>>> >>>>> -steve >>>> >>>> >>>> Here's the list of files: >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java >>>> >>>> >>>> OK. Edit is sorta unnecessary, but not wrong. >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java >>>> >>>> >>>> OK. Edit is sorta unnecessary, but not wrong. >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java >>>> >>>> >>>> OK. Edit is sorta unnecessary, but not wrong. >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java >>>> >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out >>>> >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out >>>> >>>> >>>> Test is only negative for 6, 7. Would be better to add positive test >>>> without -source as well >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/BadCast.java >>>> test/tools/javac/annotations/typeAnnotations/failures/BadCast.out >>>> OK >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java >>>> >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out >>>> >>>> >>>> OK >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java >>>> >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out >>>> >>>> >>>> OK >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java >>>> >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out >>>> >>>> >>>> *** There's no varargs in this test, so this test is kinda weird >>>> As it stands, it's sort of a random syntax error test. >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java >>>> test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out >>>> OK >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/OldArray.java >>>> *** The test passes without changing the golden file. This is >>>> unexpected. >>>> The answer is because there is no /ref=...OldArray.out on line 29. >>>> This should be fixed, and then, you'll need to create a golden file! >>>> Also, remove the legal header and substitute /nodynamiccopyright/. >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/Scopes.java >>>> *** You've just removed a space from the line, nothing more. >>>> Did you mean to do more? >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out >>>> *** Sorta OK, but not really. The test runs the risk of false >>>> positive >>>> because f is not itself declared static. Thus, quite apart from the >>>> annotation, you are trying to do static access to a non-static field, >>>> which is guaranteed to fail. >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java >>>> >>>> test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out >>>> >>>> This test is kinda pointless because the code fails even without the >>>> annotation. >>>> i.e. remove the annotation and the test still fails to compile. >>> >> From jonathan.gibbons at oracle.com Mon Sep 16 15:21:27 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 16 Sep 2013 15:21:27 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: <52356762.1000309@gmail.com> References: <52356762.1000309@gmail.com> Message-ID: <52378467.4000209@oracle.com> Werner, Wow, great. I'll take a look. -- Jon On 09/15/2013 12:53 AM, Werner Dietl wrote: > Jon, all, > > as you suggested, I encapsulated the typeAnnotations and underlyingType > fields in com.sun.tools.javac.code.Type.AnnotatedType > > This actually made the code simpler in a few places. > > There is one new failure: > langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java > > However, I think the test case is wrong: it uses a "normal" annotation > processor and therefore runs too early. It should be changed to be a > "type annotation processor", i.e. it should run after FLOW. > I suggest we create a subclass/alternative to > JavacTestingAbstractProcessor and use that to test type annotations. > > I'm not sure whether this had an effect on javadoc - if so, we should > revisit when the typeAnnotations queue is flushed. > > Please review this changeset: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 > > If this first step is OK, we can next introduce the TypeMetadata > abstraction. > > > Regarding SymbolMetadata, I find it a bit strange that the methods that > access SymbolMetadata in Symbol are still called "xxxAnnotations", e.g. > com.sun.tools.javac.code.Symbol.getAnnotations() > Should these also be renamed? > > > I have one more change that I just pushed: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 > > I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement > to take the copied body instead of the original body. > Charlie Garrett discovered this problem after painful debugging of a > Checker Framework problem that depended on whether a label is present or > not. > I cannot present a simple test case for the error, but the change > doesn't break any existing test cases. > Also note that this was the only "unused variable" warning in > TreeCopier. Warnings are useful. > > All comments welcome, > cu, WMD. From alex.buckley at oracle.com Mon Sep 16 17:20:57 2013 From: alex.buckley at oracle.com (Alex Buckley) Date: Mon, 16 Sep 2013 17:20:57 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <52377B4C.5070005@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> Message-ID: <5237A069.8020009@oracle.com> On 9/16/2013 2:42 PM, Steve Sides wrote: > On 9/13/2013 10:42 AM, Alex Buckley wrote: >> - AnnotationVersion: The @summary is imprecise - the test is about the >> receiver parameter 'this', not type annotations in general. In SE 6 >> and 7 and 8, the annotation type 'A' with no > I'm not so sure I agree with that. Due to the 3 @compile lines, the test > is about allowing type-annotations only with jdk8. The fact that he put > the annotation on 'this' appears to me to be incidental. It may be odd > that he chose 'this' as opposed to maybe 'String' or some other more > common usage, but it does seem to be just a usage to make the general > point and elicit the diagnostic > "compiler.err.type.annotations.not.supported.in.source: 1.7", and not to > test that specific usage. This test aims to show that "type annotations" didn't exist and now do exist. In other words, that an annotation was not permitted in some type-oriented location in 6/7 but is permitted in that location in 8. It is poor form to choose a location in 8 which didn't exist in 6/7 - especially when that location is frankly very obscure. I would suggest putting the @A on something simple like an 'extends' clause. In addition, ElementType.TYPE_USE didn't exist in 6/7 so a reader might ask why javac doesn't complain about that rather than the syntax error of the 'this' parameter. This is why I also suggested having a companion test where a ElementType from 6/7 was used. Alex From charlie.wang at oracle.com Mon Sep 16 17:34:55 2013 From: charlie.wang at oracle.com (Charlie Wang) Date: Tue, 17 Sep 2013 08:34:55 +0800 Subject: Fwd: Re: type anno test code check in In-Reply-To: <52371DB2.5030206@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> <52319FEE.3080703@oracle.com> <5231F619.4070307@oracle.com> <5236B448.7030006@oracle.com> <52371DB2.5030206@oracle.com> Message-ID: <5237A3AF.1050108@oracle.com> Hi Jonathan, Thanks for the idea, but I don't think so. In order to identify source code of different tests, I used a prefix(the test class's name) before _source.txt. e.g. ConstructorGetAnnotatedReturnTypeTest_source.txt. But none of the classes in the source code have such a name(they are all like TypeAnnoCls1). Besides, this is just for users' viewing. I think .txt files should be OK. - Charlie On 2013/9/16 23:03, Jonathan Gibbons wrote: > Charlie, > > If it's source code, why would you not dump it into a .java file? > > -- Jon > > > On 09/16/2013 12:33 AM, Charlie Wang wrote: >> Hi Steve, >> Made the update according to your comments. The test will dump the >> source code into a .txt file if it fails. Please review the >> attachment. I will update webrev later. >> >> >> - Charlie >> >> On 2013/9/13 1:12, Steve Sides wrote: >>> On 9/12/2013 4:05 AM, Charlie Wang wrote: >>>> Hi Joel, >>>> I ran the test on windows64, linux64, solaris32, mac64, and only >>>> found one failed test - ClassGetAnnotatedInterfacesTest. I think it >>>> is due to code change to Class.getAnnotatedInterfaces(). In the >>>> builds a while before b106 it didn't return null with primitive >>>> type class input, but now it does. I didn't find any bug to track >>>> this change when I searched with label "type-annotations" or >>>> "annotations". >>>> Besides that, I've made a little update to the comments of every >>>> tests explaining how the test code is constructed and run. >>>> By setting Helper.DEBUG = true/false, it displays/hides the test >>>> source code on the command line output, which is constructed for >>>> the test. I hope this doesn't seem overwhelmingly friendly. >>> Can you make it so is displays or leave on disk the test source for >>> failed test cases by default apart from DEBUG? >>> Since we're really most interested in failed test cases and the >>> ability to easily reproduce them with a small(er) test case, that >>> would be the desired behavior. >>> I.E., we don't want to say, "here's bug, to reproduce, run the >>> whole test", or even "you can set DEBUG and go fish for the failed >>> test case from the thousands in the debug output"....put in the most >>> unfriendly terms. :) (I do smile when I write these things). >>> >>> -steve >>> >>>> As suggested by Alex, the interfaces are introduced for >>>> extension. DeclarationGenerator is an interface for small code >>>> declarations. TestCaseGenerator is an interface for code generation >>>> of test cases. Helper constructs declarations and compile source >>>> code (better explanations are in Helper's comments). >>>> TestCodeGenerator is a utility class for test case generation. >>>> >>>> Attached are the updated test files. I will update the webrev link >>>> later. >>>> >>>> >>>> >>>> >>>> >>>> >>>> - Charlie >>>> >>>> On 2013/9/11 22:44, Joel Borggren-Franck wrote: >>>>> Hi Charlie, >>>>> >>>>> These tests should go into TL, I can commit them there. The test >>>>> review >>>>> cycle should be on core-libs-dev at openjdk.java.net. >>>>> >>>>> However the test are not ready yet. >>>>> >>>>> If you run the tests vs jdk8-b106 or a recent copy of TL there is >>>>> a few >>>>> failures. How can I as a developer see the exact source which >>>>> caused the >>>>> failure? >>>>> >>>>> Further, there is an @author tag between two jtreg tags, @build and >>>>> @run in almost every file. Please don't do that. >>>>> >>>>> As a user of these tests there needs to be a way for me to: >>>>> >>>>> 1) Understand the tests / ensure that the tests are correct >>>>> 2) Run the tests >>>>> 3) Understand what causes tests failures >>>>> >>>>> Out of these only 2) is currently easy. 1) is hard and 3) looks >>>>> impossible. >>>>> >>>>> Here is what you need to do to bring this forward: >>>>> >>>>> - At a minimum you need to document how the tests work. It is not >>>>> clear >>>>> at the moment. >>>>> >>>>> - Please explain why are the helpers split out into 2 interfaces >>>>> and 4 >>>>> classes? >>>>> >>>>> - You also need to improve failure friendliness. If a tests fail, it >>>>> must be possible to see the java source of the generated >>>>> program that >>>>> fails together with a decent explanation of what went wrong. >>>>> >>>>> If this is currently available, please indicate how to do it. >>>>> >>>>> cheers >>>>> /Joel >>>>> >>>>> On 2013-09-11, Charlie Wang wrote: >>>>>> Hi, >>>>>> I'm looking for a committer to help me check in type annotation >>>>>> reflection test code. Could someone give me a hand? >>>>>> >>>>>> >>>>>> >>>>>> Thanks, >>>>>> Charlie >>>>>> >>>>>> -------- Original Message -------- >>>>>> Subject: Re: type anno test code check in >>>>>> Date: Tue, 10 Sep 2013 10:29:02 -0700 >>>>>> From: Alex Buckley >>>>>> Organization: Oracle Corporation >>>>>> To: Charlie Wang >>>>>> >>>>>> >>>>>> >>>>>> Ask on type-annotations-dev for a Committer in the Type Annotations >>>>>> Project to push the tests for you. The tests will go in the jdk >>>>>> repo. >>>>>> >>>>>> Alex >>>>>> >>>> >>> > From jonathan.gibbons at oracle.com Mon Sep 16 17:51:12 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 16 Sep 2013 17:51:12 -0700 Subject: Fwd: Re: type anno test code check in In-Reply-To: <5237A3AF.1050108@oracle.com> References: <522F56DE.4040807@oracle.com> <522FD95D.9040402@oracle.com> <20130911144428.GR11725@jfranck-desktop.jrpg.bea.com> <52319FEE.3080703@oracle.com> <5231F619.4070307@oracle.com> <5236B448.7030006@oracle.com> <52371DB2.5030206@oracle.com> <5237A3AF.1050108@oracle.com> Message-ID: <5237A780.1050403@oracle.com> I think you misunderstood my comment. I am suggesting, as a reviewer and someone who might one day have to debug these tests, that you should dump source code into a file with a .java extension. It is important for a well written test that the artifacts for failing tests should be clearly identified, and whenever possible, should be in a form that is usable outside the context of the test. For example, if you have a test case involving one or more classes that fail, I would expect to see a clearly identified directory containing source files that I could pass to javac to reproduce and thence debug the failure. -- Jon On 09/16/2013 05:34 PM, Charlie Wang wrote: > Hi Jonathan, > Thanks for the idea, but I don't think so. In order to identify > source code of different tests, I used a prefix(the test class's name) > before _source.txt. e.g. > ConstructorGetAnnotatedReturnTypeTest_source.txt. But none of the > classes in the source code have such a name(they are all like > TypeAnnoCls1). Besides, this is just for users' viewing. I think .txt > files should be OK. > > > > > > - Charlie > > > On 2013/9/16 23:03, Jonathan Gibbons wrote: >> Charlie, >> >> If it's source code, why would you not dump it into a .java file? >> >> -- Jon >> >> >> On 09/16/2013 12:33 AM, Charlie Wang wrote: >>> Hi Steve, >>> Made the update according to your comments. The test will dump the >>> source code into a .txt file if it fails. Please review the >>> attachment. I will update webrev later. >>> >>> >>> - Charlie >>> >>> On 2013/9/13 1:12, Steve Sides wrote: >>>> On 9/12/2013 4:05 AM, Charlie Wang wrote: >>>>> Hi Joel, >>>>> I ran the test on windows64, linux64, solaris32, mac64, and only >>>>> found one failed test - ClassGetAnnotatedInterfacesTest. I think >>>>> it is due to code change to Class.getAnnotatedInterfaces(). In the >>>>> builds a while before b106 it didn't return null with primitive >>>>> type class input, but now it does. I didn't find any bug to track >>>>> this change when I searched with label "type-annotations" or >>>>> "annotations". >>>>> Besides that, I've made a little update to the comments of every >>>>> tests explaining how the test code is constructed and run. >>>>> By setting Helper.DEBUG = true/false, it displays/hides the test >>>>> source code on the command line output, which is constructed for >>>>> the test. I hope this doesn't seem overwhelmingly friendly. >>>> Can you make it so is displays or leave on disk the test source for >>>> failed test cases by default apart from DEBUG? >>>> Since we're really most interested in failed test cases and the >>>> ability to easily reproduce them with a small(er) test case, that >>>> would be the desired behavior. >>>> I.E., we don't want to say, "here's bug, to reproduce, run the >>>> whole test", or even "you can set DEBUG and go fish for the failed >>>> test case from the thousands in the debug output"....put in the >>>> most unfriendly terms. :) (I do smile when I write these things). >>>> >>>> -steve >>>> >>>>> As suggested by Alex, the interfaces are introduced for >>>>> extension. DeclarationGenerator is an interface for small code >>>>> declarations. TestCaseGenerator is an interface for code >>>>> generation of test cases. Helper constructs declarations and >>>>> compile source code (better explanations are in Helper's >>>>> comments). TestCodeGenerator is a utility class for test case >>>>> generation. >>>>> >>>>> Attached are the updated test files. I will update the webrev link >>>>> later. >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> - Charlie >>>>> >>>>> On 2013/9/11 22:44, Joel Borggren-Franck wrote: >>>>>> Hi Charlie, >>>>>> >>>>>> These tests should go into TL, I can commit them there. The test >>>>>> review >>>>>> cycle should be on core-libs-dev at openjdk.java.net. >>>>>> >>>>>> However the test are not ready yet. >>>>>> >>>>>> If you run the tests vs jdk8-b106 or a recent copy of TL there is >>>>>> a few >>>>>> failures. How can I as a developer see the exact source which >>>>>> caused the >>>>>> failure? >>>>>> >>>>>> Further, there is an @author tag between two jtreg tags, @build and >>>>>> @run in almost every file. Please don't do that. >>>>>> >>>>>> As a user of these tests there needs to be a way for me to: >>>>>> >>>>>> 1) Understand the tests / ensure that the tests are correct >>>>>> 2) Run the tests >>>>>> 3) Understand what causes tests failures >>>>>> >>>>>> Out of these only 2) is currently easy. 1) is hard and 3) looks >>>>>> impossible. >>>>>> >>>>>> Here is what you need to do to bring this forward: >>>>>> >>>>>> - At a minimum you need to document how the tests work. It is not >>>>>> clear >>>>>> at the moment. >>>>>> >>>>>> - Please explain why are the helpers split out into 2 interfaces >>>>>> and 4 >>>>>> classes? >>>>>> >>>>>> - You also need to improve failure friendliness. If a tests fail, it >>>>>> must be possible to see the java source of the generated >>>>>> program that >>>>>> fails together with a decent explanation of what went wrong. >>>>>> >>>>>> If this is currently available, please indicate how to do it. >>>>>> >>>>>> cheers >>>>>> /Joel >>>>>> >>>>>> On 2013-09-11, Charlie Wang wrote: >>>>>>> Hi, >>>>>>> I'm looking for a committer to help me check in type annotation >>>>>>> reflection test code. Could someone give me a hand? >>>>>>> >>>>>>> >>>>>>> >>>>>>> Thanks, >>>>>>> Charlie >>>>>>> >>>>>>> -------- Original Message -------- >>>>>>> Subject: Re: type anno test code check in >>>>>>> Date: Tue, 10 Sep 2013 10:29:02 -0700 >>>>>>> From: Alex Buckley >>>>>>> Organization: Oracle Corporation >>>>>>> To: Charlie Wang >>>>>>> >>>>>>> >>>>>>> >>>>>>> Ask on type-annotations-dev for a Committer in the Type Annotations >>>>>>> Project to push the tests for you. The tests will go in the jdk >>>>>>> repo. >>>>>>> >>>>>>> Alex >>>>>>> >>>>> >>>> >> > From steve.sides at oracle.com Tue Sep 17 12:06:14 2013 From: steve.sides at oracle.com (Steve Sides) Date: Tue, 17 Sep 2013 12:06:14 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <5237A069.8020009@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> Message-ID: <5238A826.60009@oracle.com> On 9/16/2013 5:20 PM, Alex Buckley wrote: > On 9/16/2013 2:42 PM, Steve Sides wrote: >> On 9/13/2013 10:42 AM, Alex Buckley wrote: >>> - AnnotationVersion: The @summary is imprecise - the test is about the >>> receiver parameter 'this', not type annotations in general. In SE 6 >>> and 7 and 8, the annotation type 'A' with no >> I'm not so sure I agree with that. Due to the 3 @compile lines, the test >> is about allowing type-annotations only with jdk8. The fact that he put >> the annotation on 'this' appears to me to be incidental. It may be odd >> that he chose 'this' as opposed to maybe 'String' or some other more >> common usage, but it does seem to be just a usage to make the general >> point and elicit the diagnostic >> "compiler.err.type.annotations.not.supported.in.source: 1.7", and not to >> test that specific usage. > > This test aims to show that "type annotations" didn't exist and now do > exist. In other words, that an annotation was not permitted in some > type-oriented location in 6/7 but is permitted in that location in 8. > It is poor form to choose a location in 8 which didn't exist in 6/7 - > especially when that location is frankly very obscure. I would suggest > putting the @A on something simple like an 'extends' clause. > > In addition, ElementType.TYPE_USE didn't exist in 6/7 so a reader > might ask why javac doesn't complain about that rather than the syntax > error of the 'this' parameter. This is why I also suggested having a > companion test where a ElementType from 6/7 was used. > > Alex Got it. While whittling on this, I have another question about the compiler's behavior. 1. If I qualify the (not type) annotation, @Scopes.UniqueInner class Scopes { @interface UniqueInner { }; } I get 1 error, "Scopes.java:11:24: compiler.err.annotation.type.not.applicable". This seems correct as I'm using an annotation on a type usage, and the one on the class is okay. 2. If I use the annotation unqualified, I get 3 errors, two for "cant.resolve..." and the one above again. I can see that this can also be correct. Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , // on the class Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , // on the bound Scopes.java:11:24: compiler.err.annotation.type.not.applicable // not a type annotation(I assumed)? 3 errors 3. If I use a qualified type annotation, @Scopes.UniqueInner class Scopes { @Target(ElementType.TYPE_USE) @interface UniqueInner { }; } it compiles without error. 4. However, if I use an unqualified type annotation, @UniqueInner class Scopes { @Target(ElementType.TYPE_USE) @interface UniqueInner { }; } I get the same 3 errors as the unqualified annotation: Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , Scopes.java:11:24: compiler.err.annotation.type.not.applicable 3 errors Why should I get "compiler.err.annotation.type.not.applicable" in this last scenario? For 1. I kind of assumed the third error meant it was not applicable because it was not a type annotation. Is it not applicable for reasons other than not being TYPE_USE? I'm thinking of using it as below (and adding a postivie version with qualified name), @UniqueInner class Scopes { // Unqualified @UniqueInner is not accessible to the class . // One has to use @Scopes.UniqueInner. @Target(ElementType.TYPE_USE) @interface UniqueInner { }; } but I'm unsure about that third error and would like to verify it is as expected. -steve From wdietl at gmail.com Tue Sep 17 12:24:32 2013 From: wdietl at gmail.com (Werner Dietl) Date: Tue, 17 Sep 2013 12:24:32 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <5238A826.60009@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> Message-ID: Hi Steve, thanks for testing these cases! In your last case: @UniqueInner class Scopes { @Target(ElementType.TYPE_USE) @interface UniqueInner { }; } The compiler cannot resolve the annotation on the class declaration and on Object and we therefore get the first two errors. Because the compiler cannot resolve the annotation, it doesn't know that it has meta-annotation TYPE_USE. We therefore get the third error, because it sees an annotation in a type-use location without knowing that it has the right meta-annotation. Maybe the check for the TYPE_USE target should be ignored if the annotation can't be resolved? A declaration annotation is by default valid in all locations, so the issue doesn't arise for declaration annotations. Thoughts? cu, WMD. On Tue, Sep 17, 2013 at 12:06 PM, Steve Sides wrote: > On 9/16/2013 5:20 PM, Alex Buckley wrote: >> >> On 9/16/2013 2:42 PM, Steve Sides wrote: >>> >>> On 9/13/2013 10:42 AM, Alex Buckley wrote: >>>> >>>> - AnnotationVersion: The @summary is imprecise - the test is about the >>>> receiver parameter 'this', not type annotations in general. In SE 6 >>>> and 7 and 8, the annotation type 'A' with no >>> >>> I'm not so sure I agree with that. Due to the 3 @compile lines, the test >>> is about allowing type-annotations only with jdk8. The fact that he put >>> the annotation on 'this' appears to me to be incidental. It may be odd >>> that he chose 'this' as opposed to maybe 'String' or some other more >>> common usage, but it does seem to be just a usage to make the general >>> point and elicit the diagnostic >>> "compiler.err.type.annotations.not.supported.in.source: 1.7", and not to >>> test that specific usage. >> >> >> This test aims to show that "type annotations" didn't exist and now do >> exist. In other words, that an annotation was not permitted in some >> type-oriented location in 6/7 but is permitted in that location in 8. It is >> poor form to choose a location in 8 which didn't exist in 6/7 - especially >> when that location is frankly very obscure. I would suggest putting the @A >> on something simple like an 'extends' clause. >> >> In addition, ElementType.TYPE_USE didn't exist in 6/7 so a reader might >> ask why javac doesn't complain about that rather than the syntax error of >> the 'this' parameter. This is why I also suggested having a companion test >> where a ElementType from 6/7 was used. >> >> Alex > > Got it. While whittling on this, I have another question about the > compiler's behavior. > 1. If I qualify the (not type) annotation, > > @Scopes.UniqueInner > class Scopes { > @interface UniqueInner { }; > } > I get 1 error, "Scopes.java:11:24: > compiler.err.annotation.type.not.applicable". This seems correct as I'm > using an annotation on a type usage, and the one on the class is okay. > > 2. If I use the annotation unqualified, I get 3 errors, two for > "cant.resolve..." and the one above again. I can see that this can also be > correct. > > Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , > // on the class > Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , > // on the bound > Scopes.java:11:24: compiler.err.annotation.type.not.applicable > // not a type annotation(I assumed)? > 3 errors > > 3. If I use a qualified type annotation, > @Scopes.UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > it compiles without error. > > 4. However, if I use an unqualified type annotation, > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > I get the same 3 errors as the unqualified annotation: > > Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , > Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , > Scopes.java:11:24: compiler.err.annotation.type.not.applicable > 3 errors > > Why should I get "compiler.err.annotation.type.not.applicable" in this last > scenario? For 1. I kind of assumed the third error meant it was not > applicable because it was not a type annotation. Is it not applicable for > reasons other than not being TYPE_USE? > > I'm thinking of using it as below (and adding a postivie version with > qualified name), > > @UniqueInner > class Scopes { > // Unqualified @UniqueInner is not accessible to the class . > // One has to use @Scopes.UniqueInner. > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > but I'm unsure about that third error and would like to verify it is as > expected. > > -steve > > > > > > -- http://www.google.com/profiles/wdietl From alex.buckley at oracle.com Tue Sep 17 12:29:32 2013 From: alex.buckley at oracle.com (Alex Buckley) Date: Tue, 17 Sep 2013 12:29:32 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <5238A826.60009@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> Message-ID: <5238AD9C.1050603@oracle.com> To all: there's a bug in case 4 below. On 9/17/2013 12:06 PM, Steve Sides wrote: > Got it. While whittling on this, I have another question about the > compiler's behavior. > 1. If I qualify the (not type) annotation, > > @Scopes.UniqueInner > class Scopes { > @interface UniqueInner { }; > } > I get 1 error, "Scopes.java:11:24: > compiler.err.annotation.type.not.applicable". This seems correct as I'm > using an annotation on a type usage, and the one on the class is okay. You are right. The annotation on the upper bound of T is illegal because the Scopes.UniqueInner annotation type is applicable only in locations which existed in Java SE 7 (such as type declarations) and not in new locations in Java SE 8 (such as type uses). > 2. If I use the annotation unqualified, I get 3 errors, two for > "cant.resolve..." and the one above again. I can see that this can also > be correct. > > Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, > UniqueInner, , // on the class > Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, > UniqueInner, , // on the bound > Scopes.java:11:24: > compiler.err.annotation.type.not.applicable // not a type > annotation(I assumed)? > 3 errors The scope of the @interface declaration is the body of class Scopes. Therefore, the simple name "UniqueInner" is not in scope before the { of the declaration of Scopes. All three errors are correct. > 3. If I use a qualified type annotation, > @Scopes.UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > it compiles without error. As it should. > 4. However, if I use an unqualified type annotation, > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > I get the same 3 errors as the unqualified annotation: > > Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , > Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, > UniqueInner, , > Scopes.java:11:24: compiler.err.annotation.type.not.applicable > 3 errors > > Why should I get "compiler.err.annotation.type.not.applicable" in this > last scenario? For 1. I kind of assumed the third error meant it was > not applicable because it was not a type annotation. Is it not > applicable for reasons other than not being TYPE_USE? You are right to ponder what's going on. The third error, about applicability, is a bug. > I'm thinking of using it as below (and adding a postivie version with > qualified name), > > @UniqueInner > class Scopes { > // Unqualified @UniqueInner is not accessible to the class . > // One has to use @Scopes.UniqueInner. > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > but I'm unsure about that third error and would like to verify it is as > expected. Please add this test. The comment however should not mention accessibility, which is a totally different concept. Say "The simple name UniqueInner is not in scope on the header of class Scopes, so @UniqueInner is not meaningful there. One must use the qualified name, as in @Scopes.UniqueInner." In addition, the type parameter T is also out of UniqueInner's scope. To ensure that annotations on the class declaration and annotations on the type parameter declaration are handled consistently, @UniqueInner should be written on T as well. Alex From alex.buckley at oracle.com Tue Sep 17 13:10:32 2013 From: alex.buckley at oracle.com (Alex Buckley) Date: Tue, 17 Sep 2013 13:10:32 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> Message-ID: <5238B738.1030707@oracle.com> There should be no applicability check if the annotation's name can't be resolved. That's how it worked in SE 7 for the old targets: @UniqueInner class Scopes { @Target(ElementType.FIELD) // Anything but TYPE @interface UniqueInner {} } gives one error, about not finding the symbol UniqueInner in the annotation. I notice that an annotation on a type parameter declaration is treated like an annotation on a type use; the following code gives two errors (can't resolve + not applicable) but should only give one. class Scopes<@UniqueInner T> { @interface UniqueInner {} // Not applicable to type parameter decls } Alex On 9/17/2013 12:24 PM, Werner Dietl wrote: > Hi Steve, > > thanks for testing these cases! > In your last case: > > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > The compiler cannot resolve the annotation on the class declaration > and on Object and we therefore get the first two errors. > Because the compiler cannot resolve the annotation, it doesn't know > that it has meta-annotation TYPE_USE. We therefore get the third > error, because it sees an annotation in a type-use location without > knowing that it has the right meta-annotation. > > Maybe the check for the TYPE_USE target should be ignored if the > annotation can't be resolved? > A declaration annotation is by default valid in all locations, so the > issue doesn't arise for declaration annotations. > > Thoughts? > > cu, WMD. > > > On Tue, Sep 17, 2013 at 12:06 PM, Steve Sides wrote: >> On 9/16/2013 5:20 PM, Alex Buckley wrote: >>> >>> On 9/16/2013 2:42 PM, Steve Sides wrote: >>>> >>>> On 9/13/2013 10:42 AM, Alex Buckley wrote: >>>>> >>>>> - AnnotationVersion: The @summary is imprecise - the test is about the >>>>> receiver parameter 'this', not type annotations in general. In SE 6 >>>>> and 7 and 8, the annotation type 'A' with no >>>> >>>> I'm not so sure I agree with that. Due to the 3 @compile lines, the test >>>> is about allowing type-annotations only with jdk8. The fact that he put >>>> the annotation on 'this' appears to me to be incidental. It may be odd >>>> that he chose 'this' as opposed to maybe 'String' or some other more >>>> common usage, but it does seem to be just a usage to make the general >>>> point and elicit the diagnostic >>>> "compiler.err.type.annotations.not.supported.in.source: 1.7", and not to >>>> test that specific usage. >>> >>> >>> This test aims to show that "type annotations" didn't exist and now do >>> exist. In other words, that an annotation was not permitted in some >>> type-oriented location in 6/7 but is permitted in that location in 8. It is >>> poor form to choose a location in 8 which didn't exist in 6/7 - especially >>> when that location is frankly very obscure. I would suggest putting the @A >>> on something simple like an 'extends' clause. >>> >>> In addition, ElementType.TYPE_USE didn't exist in 6/7 so a reader might >>> ask why javac doesn't complain about that rather than the syntax error of >>> the 'this' parameter. This is why I also suggested having a companion test >>> where a ElementType from 6/7 was used. >>> >>> Alex >> >> Got it. While whittling on this, I have another question about the >> compiler's behavior. >> 1. If I qualify the (not type) annotation, >> >> @Scopes.UniqueInner >> class Scopes { >> @interface UniqueInner { }; >> } >> I get 1 error, "Scopes.java:11:24: >> compiler.err.annotation.type.not.applicable". This seems correct as I'm >> using an annotation on a type usage, and the one on the class is okay. >> >> 2. If I use the annotation unqualified, I get 3 errors, two for >> "cant.resolve..." and the one above again. I can see that this can also be >> correct. >> >> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , >> // on the class >> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , >> // on the bound >> Scopes.java:11:24: compiler.err.annotation.type.not.applicable >> // not a type annotation(I assumed)? >> 3 errors >> >> 3. If I use a qualified type annotation, >> @Scopes.UniqueInner >> class Scopes { >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> it compiles without error. >> >> 4. However, if I use an unqualified type annotation, >> @UniqueInner >> class Scopes { >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> I get the same 3 errors as the unqualified annotation: >> >> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, UniqueInner, , >> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , >> Scopes.java:11:24: compiler.err.annotation.type.not.applicable >> 3 errors >> >> Why should I get "compiler.err.annotation.type.not.applicable" in this last >> scenario? For 1. I kind of assumed the third error meant it was not >> applicable because it was not a type annotation. Is it not applicable for >> reasons other than not being TYPE_USE? >> >> I'm thinking of using it as below (and adding a postivie version with >> qualified name), >> >> @UniqueInner >> class Scopes { >> // Unqualified @UniqueInner is not accessible to the class . >> // One has to use @Scopes.UniqueInner. >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> >> but I'm unsure about that third error and would like to verify it is as >> expected. >> >> -steve >> >> >> >> >> >> > > > From wdietl at gmail.com Tue Sep 17 13:57:21 2013 From: wdietl at gmail.com (Werner Dietl) Date: Tue, 17 Sep 2013 13:57:21 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <5238B738.1030707@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> <5238B738.1030707@oracle.com> Message-ID: Alex, I think you can't make your conclusion from the SE 7 behavior. SE 7 by default allows an annotation in any location. So the applicability check would have succeeded for an unknown annotation. The compiler doesn't see the FIELD target, because it didn't find the annotation. I'll look into removing the applicability error for SE 8. cu, WMD. On Sep 17, 2013 1:11 PM, "Alex Buckley" wrote: > There should be no applicability check if the annotation's name can't be > resolved. That's how it worked in SE 7 for the old targets: > > @UniqueInner > class Scopes { > @Target(ElementType.FIELD) // Anything but TYPE > @interface UniqueInner {} > } > > gives one error, about not finding the symbol UniqueInner in the > annotation. > > I notice that an annotation on a type parameter declaration is treated > like an annotation on a type use; the following code gives two errors > (can't resolve + not applicable) but should only give one. > > class Scopes<@UniqueInner T> { > @interface UniqueInner {} // Not applicable to type parameter decls > } > > Alex > > On 9/17/2013 12:24 PM, Werner Dietl wrote: > >> Hi Steve, >> >> thanks for testing these cases! >> In your last case: >> >> @UniqueInner >> class Scopes { >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> >> The compiler cannot resolve the annotation on the class declaration >> and on Object and we therefore get the first two errors. >> Because the compiler cannot resolve the annotation, it doesn't know >> that it has meta-annotation TYPE_USE. We therefore get the third >> error, because it sees an annotation in a type-use location without >> knowing that it has the right meta-annotation. >> >> Maybe the check for the TYPE_USE target should be ignored if the >> annotation can't be resolved? >> A declaration annotation is by default valid in all locations, so the >> issue doesn't arise for declaration annotations. >> >> Thoughts? >> >> cu, WMD. >> >> >> On Tue, Sep 17, 2013 at 12:06 PM, Steve Sides >> wrote: >> >>> On 9/16/2013 5:20 PM, Alex Buckley wrote: >>> >>>> >>>> On 9/16/2013 2:42 PM, Steve Sides wrote: >>>> >>>>> >>>>> On 9/13/2013 10:42 AM, Alex Buckley wrote: >>>>> >>>>>> >>>>>> - AnnotationVersion: The @summary is imprecise - the test is about the >>>>>> receiver parameter 'this', not type annotations in general. In SE 6 >>>>>> and 7 and 8, the annotation type 'A' with no >>>>>> >>>>> >>>>> I'm not so sure I agree with that. Due to the 3 @compile lines, the >>>>> test >>>>> is about allowing type-annotations only with jdk8. The fact that he put >>>>> the annotation on 'this' appears to me to be incidental. It may be odd >>>>> that he chose 'this' as opposed to maybe 'String' or some other more >>>>> common usage, but it does seem to be just a usage to make the general >>>>> point and elicit the diagnostic >>>>> "compiler.err.type.**annotations.not.supported.in.**source: 1.7", and >>>>> not to >>>>> test that specific usage. >>>>> >>>> >>>> >>>> This test aims to show that "type annotations" didn't exist and now do >>>> exist. In other words, that an annotation was not permitted in some >>>> type-oriented location in 6/7 but is permitted in that location in 8. >>>> It is >>>> poor form to choose a location in 8 which didn't exist in 6/7 - >>>> especially >>>> when that location is frankly very obscure. I would suggest putting the >>>> @A >>>> on something simple like an 'extends' clause. >>>> >>>> In addition, ElementType.TYPE_USE didn't exist in 6/7 so a reader might >>>> ask why javac doesn't complain about that rather than the syntax error >>>> of >>>> the 'this' parameter. This is why I also suggested having a companion >>>> test >>>> where a ElementType from 6/7 was used. >>>> >>>> Alex >>>> >>> >>> Got it. While whittling on this, I have another question about the >>> compiler's behavior. >>> 1. If I qualify the (not type) annotation, >>> >>> @Scopes.UniqueInner >>> class Scopes { >>> @interface UniqueInner { }; >>> } >>> I get 1 error, "Scopes.java:11:24: >>> compiler.err.annotation.type.**not.applicable". This seems correct as >>> I'm >>> using an annotation on a type usage, and the one on the class is okay. >>> >>> 2. If I use the annotation unqualified, I get 3 errors, two for >>> "cant.resolve..." and the one above again. I can see that this can also >>> be >>> correct. >>> >>> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, >>> UniqueInner, , >>> // on the class >>> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, >>> UniqueInner, , >>> // on the bound >>> Scopes.java:11:24: compiler.err.annotation.type.**not.applicable >>> // not a type annotation(I assumed)? >>> 3 errors >>> >>> 3. If I use a qualified type annotation, >>> @Scopes.UniqueInner >>> class Scopes { >>> @Target(ElementType.TYPE_USE) >>> @interface UniqueInner { }; >>> } >>> it compiles without error. >>> >>> 4. However, if I use an unqualified type annotation, >>> @UniqueInner >>> class Scopes { >>> @Target(ElementType.TYPE_USE) >>> @interface UniqueInner { }; >>> } >>> I get the same 3 errors as the unqualified annotation: >>> >>> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, >>> UniqueInner, , >>> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, >>> UniqueInner, , >>> Scopes.java:11:24: compiler.err.annotation.type.**not.applicable >>> 3 errors >>> >>> Why should I get "compiler.err.annotation.type.**not.applicable" in >>> this last >>> scenario? For 1. I kind of assumed the third error meant it was not >>> applicable because it was not a type annotation. Is it not applicable >>> for >>> reasons other than not being TYPE_USE? >>> >>> I'm thinking of using it as below (and adding a postivie version with >>> qualified name), >>> >>> @UniqueInner >>> class Scopes { >>> // Unqualified @UniqueInner is not accessible to the class . >>> // One has to use @Scopes.UniqueInner. >>> @Target(ElementType.TYPE_USE) >>> @interface UniqueInner { }; >>> } >>> >>> but I'm unsure about that third error and would like to verify it is as >>> expected. >>> >>> -steve >>> >>> >>> >>> >>> >>> >>> >> >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130917/6860e7f5/attachment-0001.html From alex.buckley at oracle.com Tue Sep 17 14:00:20 2013 From: alex.buckley at oracle.com (Alex Buckley) Date: Tue, 17 Sep 2013 14:00:20 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> <5238B738.1030707@oracle.com> Message-ID: <5238C2E4.6070303@oracle.com> I know what you mean about the way I worded my first sentence. Fair enough. Still, it's true in SE 7 there was no error about applicability when an annotation name was unresolvable, and that's the principle we should follow in 8. Alex On 9/17/2013 1:57 PM, Werner Dietl wrote: > Alex, > > I think you can't make your conclusion from the SE 7 behavior. > SE 7 by default allows an annotation in any location. So the > applicability check would have succeeded for an unknown annotation. The > compiler doesn't see the FIELD target, because it didn't find the > annotation. > > I'll look into removing the applicability error for SE 8. > > cu, WMD. > > On Sep 17, 2013 1:11 PM, "Alex Buckley" > wrote: > > There should be no applicability check if the annotation's name > can't be resolved. That's how it worked in SE 7 for the old targets: > > @UniqueInner > class Scopes { > @Target(ElementType.FIELD) // Anything but TYPE > @interface UniqueInner {} > } > > gives one error, about not finding the symbol UniqueInner in the > annotation. > > I notice that an annotation on a type parameter declaration is > treated like an annotation on a type use; the following code gives > two errors (can't resolve + not applicable) but should only give one. > > class Scopes<@UniqueInner T> { > @interface UniqueInner {} // Not applicable to type parameter decls > } > > Alex > > On 9/17/2013 12:24 PM, Werner Dietl wrote: > > Hi Steve, > > thanks for testing these cases! > In your last case: > > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > The compiler cannot resolve the annotation on the class declaration > and on Object and we therefore get the first two errors. > Because the compiler cannot resolve the annotation, it doesn't know > that it has meta-annotation TYPE_USE. We therefore get the third > error, because it sees an annotation in a type-use location without > knowing that it has the right meta-annotation. > > Maybe the check for the TYPE_USE target should be ignored if the > annotation can't be resolved? > A declaration annotation is by default valid in all locations, > so the > issue doesn't arise for declaration annotations. > > Thoughts? > > cu, WMD. > > > On Tue, Sep 17, 2013 at 12:06 PM, Steve Sides > > wrote: > > On 9/16/2013 5:20 PM, Alex Buckley wrote: > > > On 9/16/2013 2:42 PM, Steve Sides wrote: > > > On 9/13/2013 10:42 AM, Alex Buckley wrote: > > > - AnnotationVersion: The @summary is imprecise - > the test is about the > receiver parameter 'this', not type annotations > in general. In SE 6 > and 7 and 8, the annotation type 'A' with no > > > I'm not so sure I agree with that. Due to the 3 > @compile lines, the test > is about allowing type-annotations only with jdk8. > The fact that he put > the annotation on 'this' appears to me to be > incidental. It may be odd > that he chose 'this' as opposed to maybe 'String' or > some other more > common usage, but it does seem to be just a usage to > make the general > point and elicit the diagnostic > "compiler.err.type.__annotations.not.supported.in > .__source: > 1.7", and not to > test that specific usage. > > > > This test aims to show that "type annotations" didn't > exist and now do > exist. In other words, that an annotation was not > permitted in some > type-oriented location in 6/7 but is permitted in that > location in 8. It is > poor form to choose a location in 8 which didn't exist > in 6/7 - especially > when that location is frankly very obscure. I would > suggest putting the @A > on something simple like an 'extends' clause. > > In addition, ElementType.TYPE_USE didn't exist in 6/7 so > a reader might > ask why javac doesn't complain about that rather than > the syntax error of > the 'this' parameter. This is why I also suggested > having a companion test > where a ElementType from 6/7 was used. > > Alex > > > Got it. While whittling on this, I have another question > about the > compiler's behavior. > 1. If I qualify the (not type) annotation, > > @Scopes.UniqueInner > class Scopes { > @interface UniqueInner { }; > } > I get 1 error, "Scopes.java:11:24: > compiler.err.annotation.type.__not.applicable". This seems > correct as I'm > using an annotation on a type usage, and the one on the > class is okay. > > 2. If I use the annotation unqualified, I get 3 errors, two for > "cant.resolve..." and the one above again. I can see that > this can also be > correct. > > Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, > UniqueInner, , > // on the class > Scopes.java:11:25: compiler.err.cant.resolve: > kindname.class, UniqueInner, , > // on the bound > Scopes.java:11:24: compiler.err.annotation.type.__not.applicable > // not a type annotation(I assumed)? > 3 errors > > 3. If I use a qualified type annotation, > @Scopes.UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > it compiles without error. > > 4. However, if I use an unqualified type annotation, > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > I get the same 3 errors as the unqualified annotation: > > Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, > UniqueInner, , > Scopes.java:11:25: compiler.err.cant.resolve: > kindname.class, UniqueInner, , > Scopes.java:11:24: compiler.err.annotation.type.__not.applicable > 3 errors > > Why should I get > "compiler.err.annotation.type.__not.applicable" in this last > scenario? For 1. I kind of assumed the third error meant it > was not > applicable because it was not a type annotation. Is it not > applicable for > reasons other than not being TYPE_USE? > > I'm thinking of using it as below (and adding a postivie > version with > qualified name), > > @UniqueInner > class Scopes { > // Unqualified @UniqueInner is not accessible to the > class . > // One has to use @Scopes.UniqueInner. > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > but I'm unsure about that third error and would like to > verify it is as > expected. > > -steve > > > > > > > > > From steve.sides at oracle.com Tue Sep 17 17:21:58 2013 From: steve.sides at oracle.com (Steve Sides) Date: Tue, 17 Sep 2013 17:21:58 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> <5238B738.1030707@oracle.com> Message-ID: <5238F226.4060504@oracle.com> On 9/17/2013 1:57 PM, Werner Dietl wrote: > > Alex, > > I think you can't make your conclusion from the SE 7 behavior. > SE 7 by default allows an annotation in any location. So the > applicability check would have succeeded for an unknown annotation. > The compiler doesn't see the FIELD target, because it didn't find the > annotation. > > I'll look into removing the applicability error for SE 8. > a bug for that: https://bugs.openjdk.java.net/browse/JDK-8024961 -steve > > cu, WMD. > > On Sep 17, 2013 1:11 PM, "Alex Buckley" > wrote: > > There should be no applicability check if the annotation's name > can't be resolved. That's how it worked in SE 7 for the old targets: > > @UniqueInner > class Scopes { > @Target(ElementType.FIELD) // Anything but TYPE > @interface UniqueInner {} > } > > gives one error, about not finding the symbol UniqueInner in the > annotation. > > I notice that an annotation on a type parameter declaration is > treated like an annotation on a type use; the following code gives > two errors (can't resolve + not applicable) but should only give one. > > class Scopes<@UniqueInner T> { > @interface UniqueInner {} // Not applicable to type parameter decls > } > > Alex > > On 9/17/2013 12:24 PM, Werner Dietl wrote: > > Hi Steve, > > thanks for testing these cases! > In your last case: > > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > The compiler cannot resolve the annotation on the class > declaration > and on Object and we therefore get the first two errors. > Because the compiler cannot resolve the annotation, it doesn't > know > that it has meta-annotation TYPE_USE. We therefore get the third > error, because it sees an annotation in a type-use location > without > knowing that it has the right meta-annotation. > > Maybe the check for the TYPE_USE target should be ignored if the > annotation can't be resolved? > A declaration annotation is by default valid in all locations, > so the > issue doesn't arise for declaration annotations. > > Thoughts? > > cu, WMD. > > > On Tue, Sep 17, 2013 at 12:06 PM, Steve Sides > > wrote: > > On 9/16/2013 5:20 PM, Alex Buckley wrote: > > > On 9/16/2013 2:42 PM, Steve Sides wrote: > > > On 9/13/2013 10:42 AM, Alex Buckley wrote: > > > - AnnotationVersion: The @summary is imprecise > - the test is about the > receiver parameter 'this', not type > annotations in general. In SE 6 > and 7 and 8, the annotation type 'A' with no > > > I'm not so sure I agree with that. Due to the 3 > @compile lines, the test > is about allowing type-annotations only with jdk8. > The fact that he put > the annotation on 'this' appears to me to be > incidental. It may be odd > that he chose 'this' as opposed to maybe 'String' > or some other more > common usage, but it does seem to be just a usage > to make the general > point and elicit the diagnostic > "compiler.err.type.annotations.not.supported.in > .source: > 1.7", and not to > test that specific usage. > > > > This test aims to show that "type annotations" didn't > exist and now do > exist. In other words, that an annotation was not > permitted in some > type-oriented location in 6/7 but is permitted in that > location in 8. It is > poor form to choose a location in 8 which didn't exist > in 6/7 - especially > when that location is frankly very obscure. I would > suggest putting the @A > on something simple like an 'extends' clause. > > In addition, ElementType.TYPE_USE didn't exist in 6/7 > so a reader might > ask why javac doesn't complain about that rather than > the syntax error of > the 'this' parameter. This is why I also suggested > having a companion test > where a ElementType from 6/7 was used. > > Alex > > > Got it. While whittling on this, I have another question > about the > compiler's behavior. > 1. If I qualify the (not type) annotation, > > @Scopes.UniqueInner > class Scopes { > @interface UniqueInner { }; > } > I get 1 error, "Scopes.java:11:24: > compiler.err.annotation.type.not.applicable". This seems > correct as I'm > using an annotation on a type usage, and the one on the > class is okay. > > 2. If I use the annotation unqualified, I get 3 errors, > two for > "cant.resolve..." and the one above again. I can see that > this can also be > correct. > > Scopes.java:10:2: compiler.err.cant.resolve: > kindname.class, UniqueInner, , > // on the class > Scopes.java:11:25: compiler.err.cant.resolve: > kindname.class, UniqueInner, , > // on the bound > Scopes.java:11:24: compiler.err.annotation.type.not.applicable > // not a type annotation(I assumed)? > 3 errors > > 3. If I use a qualified type annotation, > @Scopes.UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > it compiles without error. > > 4. However, if I use an unqualified type annotation, > @UniqueInner > class Scopes { > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > I get the same 3 errors as the unqualified annotation: > > Scopes.java:10:2: compiler.err.cant.resolve: > kindname.class, UniqueInner, , > Scopes.java:11:25: compiler.err.cant.resolve: > kindname.class, UniqueInner, , > Scopes.java:11:24: compiler.err.annotation.type.not.applicable > 3 errors > > Why should I get > "compiler.err.annotation.type.not.applicable" in this last > scenario? For 1. I kind of assumed the third error meant > it was not > applicable because it was not a type annotation. Is it > not applicable for > reasons other than not being TYPE_USE? > > I'm thinking of using it as below (and adding a postivie > version with > qualified name), > > @UniqueInner > class Scopes { > // Unqualified @UniqueInner is not accessible to the > class . > // One has to use @Scopes.UniqueInner. > @Target(ElementType.TYPE_USE) > @interface UniqueInner { }; > } > > but I'm unsure about that third error and would like to > verify it is as > expected. > > -steve > > > > > > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20130917/fe4455bb/attachment-0001.html From joel.franck at oracle.com Wed Sep 18 03:08:27 2013 From: joel.franck at oracle.com (Joel Borggren-Franck) Date: Wed, 18 Sep 2013 12:08:27 +0200 Subject: Better encapsulation for AnnotatedType In-Reply-To: <52356762.1000309@gmail.com> References: <52356762.1000309@gmail.com> Message-ID: <20130918100827.GE5572@jfranck-desktop.jrpg.bea.com> Hi Werner, In general I think this looks good. On 2013-09-15, Werner Dietl wrote: > Jon, all, > > as you suggested, I encapsulated the typeAnnotations and underlyingType > fields in com.sun.tools.javac.code.Type.AnnotatedType > > This actually made the code simpler in a few places. > There is one new failure: > langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java > > However, I think the test case is wrong: it uses a "normal" annotation > processor and therefore runs too early. It should be changed to be a > "type annotation processor", i.e. it should run after FLOW. > I suggest we create a subclass/alternative to > JavacTestingAbstractProcessor and use that to test type annotations. Annotation processing will occur before flow. Eventually we need to move to a model were we trigger stuff that annotation processing depends on before attr. Some type anno stuff needs to be done there, and some can be delayed. For example there is this bug: https://bugs.openjdk.java.net/browse/JDK-8014016 that is assigned to Jan in the javac team. I'm not sure the concept of an after flow processor makes sense at all. However it seems a bit strange that your encapsulation introduced an error like this. > > I'm not sure whether this had an effect on javadoc - if so, we should > revisit when the typeAnnotations queue is flushed. > > Please review this changeset: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 > > If this first step is OK, we can next introduce the TypeMetadata > abstraction. > > > Regarding SymbolMetadata, I find it a bit strange that the methods that > access SymbolMetadata in Symbol are still called "xxxAnnotations", e.g. > com.sun.tools.javac.code.Symbol.getAnnotations() > Should these also be renamed? > I'm working towards removing those altogether (but probably in the 9 timeframe). There was I reason I didn't want Andreas to rename them, but I can't recall it now :) > I have one more change that I just pushed: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 > > I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement > to take the copied body instead of the original body. > Charlie Garrett discovered this problem after painful debugging of a > Checker Framework problem that depended on whether a label is present or > not. > I cannot present a simple test case for the error, but the change > doesn't break any existing test cases. > Also note that this was the only "unused variable" warning in > TreeCopier. Warnings are useful. > Seems reasonable. cheers /Joel From wdietl at gmail.com Wed Sep 18 15:51:15 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Wed, 18 Sep 2013 22:51:15 +0000 Subject: hg: type-annotations/type-annotations/langtools: 5 new changesets Message-ID: <20130918225233.AE69A6291D@hg.openjdk.java.net> Changeset: 4ce8148ffc4f Author: jlahoda Date: 2013-09-16 14:13 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4ce8148ffc4f 8021112: Spurious unchecked warning reported by javac 6480588: No way to suppress deprecation warnings when implementing deprecated interface Summary: Fixing DeferredLintHandler configuration, so lint warnings are reported with correct @SuppressWarnings settings Reviewed-by: jjg, vromero ! src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java ! test/tools/javac/depDocComment/SuppressDeprecation.out ! test/tools/javac/warnings/6594914/T6594914a.out ! test/tools/javac/warnings/6594914/T6594914b.out + test/tools/javac/warnings/suppress/ImplicitTest.java + test/tools/javac/warnings/suppress/ImplicitTest.out + test/tools/javac/warnings/suppress/PackageInfo.java + test/tools/javac/warnings/suppress/PackageInfo.out + test/tools/javac/warnings/suppress/T6480588.java + test/tools/javac/warnings/suppress/T6480588.out + test/tools/javac/warnings/suppress/T8021112a.java + test/tools/javac/warnings/suppress/T8021112b.java + test/tools/javac/warnings/suppress/T8021112b.out + test/tools/javac/warnings/suppress/TypeAnnotations.java + test/tools/javac/warnings/suppress/TypeAnnotations.out + test/tools/javac/warnings/suppress/VerifySuppressWarnings.java + test/tools/javac/warnings/suppress/pack/DeprecatedClass.java + test/tools/javac/warnings/suppress/pack/ImplicitMain.java + test/tools/javac/warnings/suppress/pack/ImplicitUse.java + test/tools/javac/warnings/suppress/pack/package-info.java Changeset: fdfbc5f0c4ed Author: jjg Date: 2013-09-17 14:17 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/fdfbc5f0c4ed 8024538: -Xdoclint + -Xprefer:source + incremental compilation == FAIL Reviewed-by: darcy ! src/share/classes/com/sun/tools/doclint/DocLint.java ! src/share/classes/com/sun/tools/javac/comp/Enter.java + test/tools/javac/doclint/implicitSource/ImplicitSourceTest.java + test/tools/javac/doclint/implicitSource/Other.java Changeset: ac6ec071c2b2 Author: alundblad Date: 2013-09-18 14:39 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/ac6ec071c2b2 8024127: javac, Code_attribute.exception_table_langth should be Code_attribute.exception_table_length Summary: exception_table_langth renamed to exception_table_length Reviewed-by: jfranck, jjg ! src/share/classes/com/sun/tools/classfile/Code_attribute.java ! src/share/classes/com/sun/tools/javap/CodeWriter.java ! test/tools/javac/T7093325.java ! test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java ! test/tools/javac/multicatch/Pos05.java Changeset: 0eea54984b0e Author: wmdietl Date: 2013-09-18 14:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0eea54984b0e Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/Enter.java ! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java ! src/share/classes/com/sun/tools/javap/CodeWriter.java Changeset: eb9901286b87 Author: wmdietl Date: 2013-09-18 15:48 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/eb9901286b87 JDK-8024961: don't perform admissibility check if annotation type is erroneous. ! src/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/annotations/typeAnnotations/failures/Scopes.java ! test/tools/javac/annotations/typeAnnotations/failures/Scopes.out ! test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out From wdietl at gmail.com Wed Sep 18 15:59:36 2013 From: wdietl at gmail.com (Werner Dietl) Date: Wed, 18 Sep 2013 15:59:36 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <5238F226.4060504@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> <5238B738.1030707@oracle.com> <5238F226.4060504@oracle.com> Message-ID: I pushed a fix: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/eb9901286b87 Steve, do you have extended test cases for this? I adapted two existing test cases to the new behavior. cu, WMD. On Tue, Sep 17, 2013 at 5:21 PM, Steve Sides wrote: > On 9/17/2013 1:57 PM, Werner Dietl wrote: > > Alex, > > I think you can't make your conclusion from the SE 7 behavior. > SE 7 by default allows an annotation in any location. So the applicability > check would have succeeded for an unknown annotation. The compiler doesn't > see the FIELD target, because it didn't find the annotation. > > I'll look into removing the applicability error for SE 8. > > a bug for that: https://bugs.openjdk.java.net/browse/JDK-8024961 > > -steve > > cu, WMD. > > On Sep 17, 2013 1:11 PM, "Alex Buckley" wrote: >> >> There should be no applicability check if the annotation's name can't be >> resolved. That's how it worked in SE 7 for the old targets: >> >> @UniqueInner >> class Scopes { >> @Target(ElementType.FIELD) // Anything but TYPE >> @interface UniqueInner {} >> } >> >> gives one error, about not finding the symbol UniqueInner in the >> annotation. >> >> I notice that an annotation on a type parameter declaration is treated >> like an annotation on a type use; the following code gives two errors (can't >> resolve + not applicable) but should only give one. >> >> class Scopes<@UniqueInner T> { >> @interface UniqueInner {} // Not applicable to type parameter decls >> } >> >> Alex >> >> On 9/17/2013 12:24 PM, Werner Dietl wrote: >>> >>> Hi Steve, >>> >>> thanks for testing these cases! >>> In your last case: >>> >>> @UniqueInner >>> class Scopes { >>> @Target(ElementType.TYPE_USE) >>> @interface UniqueInner { }; >>> } >>> >>> The compiler cannot resolve the annotation on the class declaration >>> and on Object and we therefore get the first two errors. >>> Because the compiler cannot resolve the annotation, it doesn't know >>> that it has meta-annotation TYPE_USE. We therefore get the third >>> error, because it sees an annotation in a type-use location without >>> knowing that it has the right meta-annotation. >>> >>> Maybe the check for the TYPE_USE target should be ignored if the >>> annotation can't be resolved? >>> A declaration annotation is by default valid in all locations, so the >>> issue doesn't arise for declaration annotations. >>> >>> Thoughts? >>> >>> cu, WMD. >>> >>> >>> On Tue, Sep 17, 2013 at 12:06 PM, Steve Sides >>> wrote: >>>> >>>> On 9/16/2013 5:20 PM, Alex Buckley wrote: >>>>> >>>>> >>>>> On 9/16/2013 2:42 PM, Steve Sides wrote: >>>>>> >>>>>> >>>>>> On 9/13/2013 10:42 AM, Alex Buckley wrote: >>>>>>> >>>>>>> >>>>>>> - AnnotationVersion: The @summary is imprecise - the test is about >>>>>>> the >>>>>>> receiver parameter 'this', not type annotations in general. In SE 6 >>>>>>> and 7 and 8, the annotation type 'A' with no >>>>>> >>>>>> >>>>>> I'm not so sure I agree with that. Due to the 3 @compile lines, the >>>>>> test >>>>>> is about allowing type-annotations only with jdk8. The fact that he >>>>>> put >>>>>> the annotation on 'this' appears to me to be incidental. It may be >>>>>> odd >>>>>> that he chose 'this' as opposed to maybe 'String' or some other more >>>>>> common usage, but it does seem to be just a usage to make the general >>>>>> point and elicit the diagnostic >>>>>> "compiler.err.type.annotations.not.supported.in.source: 1.7", and not >>>>>> to >>>>>> test that specific usage. >>>>> >>>>> >>>>> >>>>> This test aims to show that "type annotations" didn't exist and now do >>>>> exist. In other words, that an annotation was not permitted in some >>>>> type-oriented location in 6/7 but is permitted in that location in 8. >>>>> It is >>>>> poor form to choose a location in 8 which didn't exist in 6/7 - >>>>> especially >>>>> when that location is frankly very obscure. I would suggest putting the >>>>> @A >>>>> on something simple like an 'extends' clause. >>>>> >>>>> In addition, ElementType.TYPE_USE didn't exist in 6/7 so a reader might >>>>> ask why javac doesn't complain about that rather than the syntax error >>>>> of >>>>> the 'this' parameter. This is why I also suggested having a companion >>>>> test >>>>> where a ElementType from 6/7 was used. >>>>> >>>>> Alex >>>> >>>> >>>> Got it. While whittling on this, I have another question about the >>>> compiler's behavior. >>>> 1. If I qualify the (not type) annotation, >>>> >>>> @Scopes.UniqueInner >>>> class Scopes { >>>> @interface UniqueInner { }; >>>> } >>>> I get 1 error, "Scopes.java:11:24: >>>> compiler.err.annotation.type.not.applicable". This seems correct as I'm >>>> using an annotation on a type usage, and the one on the class is okay. >>>> >>>> 2. If I use the annotation unqualified, I get 3 errors, two for >>>> "cant.resolve..." and the one above again. I can see that this can also >>>> be >>>> correct. >>>> >>>> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, >>>> UniqueInner, , >>>> // on the class >>>> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, >>>> UniqueInner, , >>>> // on the bound >>>> Scopes.java:11:24: compiler.err.annotation.type.not.applicable >>>> // not a type annotation(I assumed)? >>>> 3 errors >>>> >>>> 3. If I use a qualified type annotation, >>>> @Scopes.UniqueInner >>>> class Scopes { >>>> @Target(ElementType.TYPE_USE) >>>> @interface UniqueInner { }; >>>> } >>>> it compiles without error. >>>> >>>> 4. However, if I use an unqualified type annotation, >>>> @UniqueInner >>>> class Scopes { >>>> @Target(ElementType.TYPE_USE) >>>> @interface UniqueInner { }; >>>> } >>>> I get the same 3 errors as the unqualified annotation: >>>> >>>> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, >>>> UniqueInner, , >>>> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, >>>> UniqueInner, , >>>> Scopes.java:11:24: compiler.err.annotation.type.not.applicable >>>> 3 errors >>>> >>>> Why should I get "compiler.err.annotation.type.not.applicable" in this >>>> last >>>> scenario? For 1. I kind of assumed the third error meant it was not >>>> applicable because it was not a type annotation. Is it not applicable >>>> for >>>> reasons other than not being TYPE_USE? >>>> >>>> I'm thinking of using it as below (and adding a postivie version with >>>> qualified name), >>>> >>>> @UniqueInner >>>> class Scopes { >>>> // Unqualified @UniqueInner is not accessible to the class . >>>> // One has to use @Scopes.UniqueInner. >>>> @Target(ElementType.TYPE_USE) >>>> @interface UniqueInner { }; >>>> } >>>> >>>> but I'm unsure about that third error and would like to verify it is as >>>> expected. >>>> >>>> -steve >>>> >>>> >>>> >>>> >>>> >>>> >>> >>> >>> > -- http://www.google.com/profiles/wdietl From wdietl at gmail.com Wed Sep 18 16:01:30 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Wed, 18 Sep 2013 23:01:30 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 4 new changesets Message-ID: <20130918230145.F28016291E@hg.openjdk.java.net> Changeset: 38378024a332 Author: sundar Date: 2013-09-16 15:08 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/38378024a332 8024847: Java.to should accept mirror and external JSObjects as array-like objects as well Reviewed-by: hannesw, attila, lagergren ! src/jdk/nashorn/internal/objects/NativeJava.java ! src/jdk/nashorn/internal/runtime/ECMAErrors.java + src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java ! src/jdk/nashorn/internal/runtime/JSType.java ! src/jdk/nashorn/internal/runtime/ListAdapter.java + src/jdk/nashorn/internal/runtime/ScriptObjectListAdapter.java ! src/jdk/nashorn/internal/runtime/arrays/ArrayData.java + test/script/basic/JDK-8024847.js + test/script/basic/JDK-8024847.js.EXPECTED Changeset: f1fd5f0bc84c Author: attila Date: 2013-09-16 14:44 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/f1fd5f0bc84c 8024846: keep separate internal arguments variable Reviewed-by: lagergren, sundar ! src/jdk/nashorn/internal/codegen/Attr.java ! src/jdk/nashorn/internal/codegen/CompilerConstants.java ! src/jdk/nashorn/internal/parser/Parser.java + test/script/basic/JDK-8024846.js Changeset: 1971c2d770ae Author: sundar Date: 2013-09-18 13:06 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/1971c2d770ae 8024972: for (LeftHandSideExpression in Expression) crashes the compiler Reviewed-by: lagergren, hannesw ! src/jdk/nashorn/internal/codegen/CodeGenerator.java + test/script/basic/JDK-8024972.js + test/script/basic/JDK-8024972.js.EXPECTED Changeset: a62172fe5bae Author: sundar Date: 2013-09-18 16:36 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/a62172fe5bae 8024973: Using a different ScriptContext with a CompiledScript results in ScriptException Reviewed-by: jlaskey, hannesw ! src/jdk/nashorn/api/scripting/NashornScriptEngine.java ! src/jdk/nashorn/internal/runtime/Source.java ! test/script/trusted/JDK-8008305.js ! test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java From wdietl at gmail.com Wed Sep 18 15:55:11 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Wed, 18 Sep 2013 22:55:11 +0000 Subject: hg: type-annotations/type-annotations/jdk: 13 new changesets Message-ID: <20130918230642.78FA16291F@hg.openjdk.java.net> Changeset: ff6c76f7733e Author: psandoz Date: 2013-09-02 11:59 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ff6c76f7733e 8010293: java/util/concurrent/ConcurrentHashMap/toArray.java fails intermittently Reviewed-by: forax, chegar, alanb Contributed-by: Doug Lea
, Peter Levart , Paul Sandoz ! src/share/classes/java/util/concurrent/ConcurrentHashMap.java ! test/java/util/concurrent/ConcurrentHashMap/toArray.java Changeset: 5025ed287a4a Author: psandoz Date: 2013-09-15 16:13 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5025ed287a4a 8024837: Rename java/util/concurrent/ConcurrentHashMap/toArray.java to ToArray.java Reviewed-by: alanb ! test/java/util/concurrent/ConcurrentHashMap/ToArray.java < test/java/util/concurrent/ConcurrentHashMap/toArray.java Changeset: b9d59414de23 Author: sherman Date: 2013-09-15 11:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b9d59414de23 7186311: (props) "Unicode" is misspelled as "Uniocde" in JavaDoc and error message Summary: to correct the typo Reviewed-by: alanb, chegar ! make/tools/src/build/tools/generatecharacter/CharacterName.java ! src/share/classes/java/util/Properties.java Changeset: efa09bf27d39 Author: sherman Date: 2013-09-15 13:58 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/efa09bf27d39 8020687: Deflater.setLevel does not work as expected Summary: to clarify the api to match the existing implementation behavior Reviewed-by: alanb ! src/share/classes/java/util/zip/Deflater.java Changeset: db0fc2b71298 Author: msheppar Date: 2013-09-16 14:51 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/db0fc2b71298 6458027: Disabling IPv6 on a specific network interface causes problems Summary: added a check to test if an interface is configured for IPv6 to native code TwoStacklainDatagramSocketImpl: getMulticastInterface, setMulticastInterface Reviewed-by: chegar, michaelm ! src/windows/native/java/net/NetworkInterface.c ! src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c + test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java Changeset: 86aa8e7503e9 Author: henryjen Date: 2013-09-16 10:28 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/86aa8e7503e9 8024874: Copy-paste typo in the spec for j.u.Comparator.thenComparing(Function, Comparator) Reviewed-by: mduigou ! src/share/classes/java/util/Comparator.java Changeset: 657482758408 Author: lancea Date: 2013-09-17 07:56 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/657482758408 7097386: Correct error in Predicate javadoc example Reviewed-by: alanb, shade ! src/share/classes/javax/sql/rowset/Predicate.java Changeset: 8708569b5524 Author: sjiang Date: 2013-09-18 08:51 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/8708569b5524 8023954: MBean*Info.equals: throw NPE Reviewed-by: dfuchs, dholmes ! src/share/classes/javax/management/MBeanAttributeInfo.java ! src/share/classes/javax/management/MBeanConstructorInfo.java ! src/share/classes/javax/management/MBeanFeatureInfo.java ! src/share/classes/javax/management/MBeanNotificationInfo.java ! src/share/classes/javax/management/MBeanOperationInfo.java ! src/share/classes/javax/management/MBeanParameterInfo.java + test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java Changeset: ee8b292ee568 Author: weijun Date: 2013-09-18 18:22 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ee8b292ee568 8012615: Realm.getRealmsList returns realms list in wrong Reviewed-by: valeriep, xuelei ! src/share/classes/sun/security/krb5/Config.java ! src/share/classes/sun/security/krb5/Realm.java ! src/share/classes/sun/security/krb5/internal/CredentialsUtil.java ! test/sun/security/krb5/ParseCAPaths.java ! test/sun/security/krb5/krb5-capaths.conf Changeset: e92635d6834c Author: alanb Date: 2013-09-18 14:10 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e92635d6834c 8024883: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx) Reviewed-by: alanb, coffeys Contributed-by: nmaurer at redhat.com, alan.bateman at oracle.com ! src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java ! src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java ! src/solaris/classes/sun/nio/ch/EventPortWrapper.java ! test/java/nio/channels/Selector/LotsOfChannels.java ! test/java/nio/channels/Selector/SelectorLimit.java Changeset: 07d73060e0da Author: weijun Date: 2013-09-18 21:37 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/07d73060e0da 8011402: Move blacklisting certificate logic from hard code to data Reviewed-by: erikj, mullan ! make/java/security/Makefile ! makefiles/CopyFiles.gmk ! src/share/classes/java/security/cert/Certificate.java ! src/share/classes/sun/security/util/UntrustedCertificates.java ! src/share/classes/sun/security/x509/X509CertImpl.java + src/share/lib/security/BlacklistedCertsConverter.java + src/share/lib/security/blacklisted.certs + src/share/lib/security/blacklisted.certs.pem + test/lib/security/CheckBlacklistedCerts.java Changeset: b3a506a30fda Author: ewang Date: 2013-09-18 15:13 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b3a506a30fda 8015762: TEST_BUG: java/nio/channels/DatagramChannel/AdaptDatagramSocket.java failing intermittently [win] Reviewed-by: chegar, alanb ! test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java Changeset: cec2d862b916 Author: wmdietl Date: 2013-09-18 15:54 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cec2d862b916 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From wdietl at gmail.com Wed Sep 18 16:23:59 2013 From: wdietl at gmail.com (Werner Dietl) Date: Wed, 18 Sep 2013 16:23:59 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: <20130918100827.GE5572@jfranck-desktop.jrpg.bea.com> References: <52356762.1000309@gmail.com> <20130918100827.GE5572@jfranck-desktop.jrpg.bea.com> Message-ID: Hi Joel, all, thanks for the comments. I think the only tricky part in this refactoring was that in Attr.annotateType(...) instead of modifying the Type and adding the type annotations, I'm now setting the type of the tree to the new AnnotatedType: tree.type = tree.type.unannotatedType().annotatedType(compounds); This means that the tree type appears without type annotations until the annotate.typeAnnotation queue is emptied. This shouldn't make a difference, as in the old version one would have seen an AnnotatedType with empty annotations - which is also unexpected. Please do let me know whether I should look into TypeMetadata or whether one of you is performing that refactoring. Cheers, cu, WMD. On Wed, Sep 18, 2013 at 3:08 AM, Joel Borggren-Franck wrote: > Hi Werner, > > In general I think this looks good. > > On 2013-09-15, Werner Dietl wrote: >> Jon, all, >> >> as you suggested, I encapsulated the typeAnnotations and underlyingType >> fields in com.sun.tools.javac.code.Type.AnnotatedType >> >> This actually made the code simpler in a few places. > >> There is one new failure: >> langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java >> >> However, I think the test case is wrong: it uses a "normal" annotation >> processor and therefore runs too early. It should be changed to be a >> "type annotation processor", i.e. it should run after FLOW. >> I suggest we create a subclass/alternative to >> JavacTestingAbstractProcessor and use that to test type annotations. > > Annotation processing will occur before flow. Eventually we need to move > to a model were we trigger stuff that annotation processing depends on > before attr. Some type anno stuff needs to be done there, and some can > be delayed. For example there is this bug: > https://bugs.openjdk.java.net/browse/JDK-8014016 that is assigned to Jan > in the javac team. > > I'm not sure the concept of an after flow processor makes sense at all. > > However it seems a bit strange that your encapsulation introduced an > error like this. > >> >> I'm not sure whether this had an effect on javadoc - if so, we should >> revisit when the typeAnnotations queue is flushed. >> >> Please review this changeset: >> >> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 >> >> If this first step is OK, we can next introduce the TypeMetadata >> abstraction. >> >> >> Regarding SymbolMetadata, I find it a bit strange that the methods that >> access SymbolMetadata in Symbol are still called "xxxAnnotations", e.g. >> com.sun.tools.javac.code.Symbol.getAnnotations() >> Should these also be renamed? >> > > I'm working towards removing those altogether (but probably in the 9 > timeframe). There was I reason I didn't want Andreas to rename them, but > I can't recall it now :) > >> I have one more change that I just pushed: >> >> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 >> >> I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement >> to take the copied body instead of the original body. >> Charlie Garrett discovered this problem after painful debugging of a >> Checker Framework problem that depended on whether a label is present or >> not. >> I cannot present a simple test case for the error, but the change >> doesn't break any existing test cases. >> Also note that this was the only "unused variable" warning in >> TreeCopier. Warnings are useful. >> > > Seems reasonable. > > cheers > /Joel -- http://www.google.com/profiles/wdietl From jonathan.gibbons at oracle.com Wed Sep 18 16:58:04 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 18 Sep 2013 16:58:04 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: References: <52356762.1000309@gmail.com> <20130918100827.GE5572@jfranck-desktop.jrpg.bea.com> Message-ID: <523A3E0C.3090301@oracle.com> Werner, I still want to look at this code in detail, but my primary comment is that I believe BasicAnnoTests is valid as-is. Although it contains type annotations, they are all in positions on signatures (i.e. not in method bodies or variable initializer expressions) and so should be evaluated/valid/reflectable at the time that annotation processing is called. -- Jon On 09/18/2013 04:23 PM, Werner Dietl wrote: > Hi Joel, all, > > thanks for the comments. > > I think the only tricky part in this refactoring was that in > Attr.annotateType(...) instead of modifying the Type and adding the > type annotations, I'm now setting the type of the tree to the new > AnnotatedType: > > tree.type = tree.type.unannotatedType().annotatedType(compounds); > > This means that the tree type appears without type annotations until > the annotate.typeAnnotation queue is emptied. This shouldn't make a > difference, as in the old version one would have seen an AnnotatedType > with empty annotations - which is also unexpected. > > Please do let me know whether I should look into TypeMetadata or > whether one of you is performing that refactoring. > > Cheers, > cu, WMD. > > > On Wed, Sep 18, 2013 at 3:08 AM, Joel Borggren-Franck > wrote: >> Hi Werner, >> >> In general I think this looks good. >> >> On 2013-09-15, Werner Dietl wrote: >>> Jon, all, >>> >>> as you suggested, I encapsulated the typeAnnotations and underlyingType >>> fields in com.sun.tools.javac.code.Type.AnnotatedType >>> >>> This actually made the code simpler in a few places. >>> There is one new failure: >>> langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java >>> >>> However, I think the test case is wrong: it uses a "normal" annotation >>> processor and therefore runs too early. It should be changed to be a >>> "type annotation processor", i.e. it should run after FLOW. >>> I suggest we create a subclass/alternative to >>> JavacTestingAbstractProcessor and use that to test type annotations. >> Annotation processing will occur before flow. Eventually we need to move >> to a model were we trigger stuff that annotation processing depends on >> before attr. Some type anno stuff needs to be done there, and some can >> be delayed. For example there is this bug: >> https://bugs.openjdk.java.net/browse/JDK-8014016 that is assigned to Jan >> in the javac team. >> >> I'm not sure the concept of an after flow processor makes sense at all. >> >> However it seems a bit strange that your encapsulation introduced an >> error like this. >> >>> I'm not sure whether this had an effect on javadoc - if so, we should >>> revisit when the typeAnnotations queue is flushed. >>> >>> Please review this changeset: >>> >>> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 >>> >>> If this first step is OK, we can next introduce the TypeMetadata >>> abstraction. >>> >>> >>> Regarding SymbolMetadata, I find it a bit strange that the methods that >>> access SymbolMetadata in Symbol are still called "xxxAnnotations", e.g. >>> com.sun.tools.javac.code.Symbol.getAnnotations() >>> Should these also be renamed? >>> >> I'm working towards removing those altogether (but probably in the 9 >> timeframe). There was I reason I didn't want Andreas to rename them, but >> I can't recall it now :) >> >>> I have one more change that I just pushed: >>> >>> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 >>> >>> I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement >>> to take the copied body instead of the original body. >>> Charlie Garrett discovered this problem after painful debugging of a >>> Checker Framework problem that depended on whether a label is present or >>> not. >>> I cannot present a simple test case for the error, but the change >>> doesn't break any existing test cases. >>> Also note that this was the only "unused variable" warning in >>> TreeCopier. Warnings are useful. >>> >> Seems reasonable. >> >> cheers >> /Joel > > From jonathan.gibbons at oracle.com Thu Sep 19 19:02:06 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 19 Sep 2013 19:02:06 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: <52356762.1000309@gmail.com> References: <52356762.1000309@gmail.com> Message-ID: <523BAC9E.9040404@oracle.com> On 09/15/2013 12:53 AM, Werner Dietl wrote: > Jon, all, > > as you suggested, I encapsulated the typeAnnotations and underlyingType > fields in com.sun.tools.javac.code.Type.AnnotatedType > > This actually made the code simpler in a few places. > > There is one new failure: > langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java > > However, I think the test case is wrong: it uses a "normal" annotation > processor and therefore runs too early. It should be changed to be a > "type annotation processor", i.e. it should run after FLOW. > I suggest we create a subclass/alternative to > JavacTestingAbstractProcessor and use that to test type annotations. > > I'm not sure whether this had an effect on javadoc - if so, we should > revisit when the typeAnnotations queue is flushed. > > Please review this changeset: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6f595e036db7 > > If this first step is OK, we can next introduce the TypeMetadata > abstraction. Werner, I'm limiting this email to a review of the changeset you provided. I'll answer your other points separately. Basically very nice. Previously, I'd taken a stab at the easy bits of this, but you've managed the type rewriting bits in Attr as well. Thank you. I have created https://bugs.openjdk.java.net/browse/JDK-8025109 to track this work. I would prefer to work with you to make this change directly to tl/langtools. Right now, the patch from your changeset does not apply cleanly to tl/langtools, so the patch will need to be updated. There are still some explicit references to Type.AnnotatedType which need to go away for the encapsulation to be complete. The first (maybe only?) one I've come across is in src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java line 378. I would expect to see that all casts to Type.AnnotatedTYpe can go away, and that declarations can use Type instead of Type.AnnotatedType. It is OK, for now, to see visitAnnotatedType(AnnotatedType, ...) methods. They should go away in the next phase to use TypeMetadata. src/share/classes/com/sun/tools/javac/comp/Attr.java:4060 Remove comment and commented Assert. src/share/classes/com/sun/tools/javac/comp/Lower.java:2803 Do you really need to go twice to the well, in tree.underlyingType.type.unannotatedType() test/tools/javac/annotations/typeAnnotations/failures/LintCast.out Do you really need to modify this file? In general, in a refactoring such as this, it is a good indication of success that the tests remain unmodified. Unless you believe this tests was previously wrong, it would be better if the test were to remain unchanged. test/tools/javac/lib/DPrinter.java The changes here are not wrong, but I think they are unnecessary because the context is in a visitAnnotatedType method. If you revert this file and fix the code to the change to LintCast.out is unnecessary, then you'll have a clean src/** only refactoring. > There is one new failure: > langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java > > However, I think the test case is wrong: it uses a "normal" annotation > processor and therefore runs too early. It should be changed to be a > "type annotation processor", i.e. it should run after FLOW. > I suggest we create a subclass/alternative to > JavacTestingAbstractProcessor and use that to test type annotations. As I indicated in an earlier email, I think BasicAnnoTests.java is a valid test, and that javac code needs to be updated so that it continues to pass. All type annotations that can be accessed via javax.lang.model API need to be available at annotation processing time. We might want to have a new test, MoreAnnoTests.java, that tests type annotations within a method body, but I agree that should be written to run after FLOW. -- Jon From jonathan.gibbons at oracle.com Thu Sep 19 19:07:21 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 19 Sep 2013 19:07:21 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: <52356762.1000309@gmail.com> References: <52356762.1000309@gmail.com> Message-ID: <523BADD9.4020305@oracle.com> On 09/15/2013 12:53 AM, Werner Dietl wrote: > I have one more change that I just pushed: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 > > I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement > to take the copied body instead of the original body. > Charlie Garrett discovered this problem after painful debugging of a > Checker Framework problem that depended on whether a label is present or > not. > I cannot present a simple test case for the error, but the change > doesn't break any existing test cases. > Also note that this was the only "unused variable" warning in > TreeCopier. Warnings are useful. Well, that ws an embarrassing bug. Thank you for pointing it out. I'll apply the patch for this changeset to tl/langtools. -- Jon From jonathan.gibbons at oracle.com Thu Sep 19 19:21:03 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 19 Sep 2013 19:21:03 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: <523BADD9.4020305@oracle.com> References: <52356762.1000309@gmail.com> <523BADD9.4020305@oracle.com> Message-ID: <523BB10F.10905@oracle.com> On 09/19/2013 07:07 PM, Jonathan Gibbons wrote: > On 09/15/2013 12:53 AM, Werner Dietl wrote: >> I have one more change that I just pushed: >> >> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e1772bcdf768 >> >> >> I changed com.sun.tools.javac.tree.TreeCopier.visitLabeledStatement >> to take the copied body instead of the original body. >> Charlie Garrett discovered this problem after painful debugging of a >> Checker Framework problem that depended on whether a label is present or >> not. >> I cannot present a simple test case for the error, but the change >> doesn't break any existing test cases. >> Also note that this was the only "unused variable" warning in >> TreeCopier. Warnings are useful. > > Well, that ws an embarrassing bug. Thank you for pointing it out. I'll > apply the patch for this changeset to tl/langtools. > > -- Jon Changeset pushed to tl/langtools. http://hg.openjdk.java.net/jdk8/tl/langtools/rev/9a75bdb249a2 -- Jon From jonathan.gibbons at oracle.com Thu Sep 19 19:30:11 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 19 Sep 2013 19:30:11 -0700 Subject: Better encapsulation for AnnotatedType In-Reply-To: <52356762.1000309@gmail.com> References: <52356762.1000309@gmail.com> Message-ID: <523BB333.2000008@oracle.com> On 09/15/2013 12:53 AM, Werner Dietl wrote: > Regarding SymbolMetadata, I find it a bit strange that the methods that > access SymbolMetadata in Symbol are still called "xxxAnnotations", e.g. > com.sun.tools.javac.code.Symbol.getAnnotations() > Should these also be renamed? Yes, this method should be renamed, preferably sooner rather than later. It looks like initedAnnos should be renamed to initedMetadata as well. (I don't think we need the longer form initedSymbolMetadata, given the context. And yes, protected SymbolMetadata annotations; should be renamed to protected SymbolMetadata metadata; This renaming should be done as a patch to tl/langtools. To be clear on where we are trying to go with the naming, the intent is to use "metadata" for all metadata; "annotations" are a particular kind of metadata. Although annotations are currently the only kind of metadata on a symbol, the distinction is more obvious on Type, where constant values are another kind of metadata on Type. Thus TypeMetadata will contain constant values and type annotations. -- Jon From wdietl at gmail.com Fri Sep 20 18:27:30 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 21 Sep 2013 01:27:30 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 6 new changesets Message-ID: <20130921012740.57B50629F9@hg.openjdk.java.net> Changeset: f954d3f4d192 Author: sundar Date: 2013-09-19 13:34 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/f954d3f4d192 8025048: true as case label results in ClassCastException Reviewed-by: lagergren ! src/jdk/nashorn/internal/codegen/Attr.java + test/script/basic/JDK-8025048-2.js + test/script/basic/JDK-8025048.js Changeset: 740b1133f1b6 Author: hannesw Date: 2013-09-19 15:39 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/740b1133f1b6 8023154: compileAllTests fails with: 2 tests failed to compile Reviewed-by: sundar, jlaskey ! make/build-benchmark.xml ! make/build.xml ! make/project.properties Changeset: 821b0b610861 Author: sundar Date: 2013-09-19 21:20 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/821b0b610861 8025080: Object literal getter, setter function with number format property name results in ClassFormatError Reviewed-by: lagergren, hannesw ! src/jdk/nashorn/internal/ir/debug/JSONWriter.java ! src/jdk/nashorn/internal/parser/Parser.java + test/script/basic/JDK-8025080.js + test/script/basic/JDK-8025080.js.EXPECTED ! test/script/basic/parser/objectLitExpr.js.EXPECTED Changeset: 18d64bc4937d Author: sundar Date: 2013-09-19 23:48 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/18d64bc4937d 8025090: 'while' statement with 'test' using var before being declared in body results in VerifyError Reviewed-by: jlaskey ! src/jdk/nashorn/internal/ir/WhileNode.java + test/script/basic/JDK-8025090.js Changeset: 195be8ca5c97 Author: sundar Date: 2013-09-20 12:56 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/195be8ca5c97 8025111: undefined or null 'with' expression in empty with block should throw TypeError Reviewed-by: lagergren, hannesw ! src/jdk/nashorn/internal/codegen/CodeGenerator.java + test/script/basic/JDK-8025111.js Changeset: fa491b75d3e4 Author: hannesw Date: 2013-09-20 12:11 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/fa491b75d3e4 8022587: ClassCache is not optimal and leaks Source instances Reviewed-by: lagergren, attila ! src/jdk/nashorn/internal/objects/Global.java From wdietl at gmail.com Fri Sep 20 18:51:02 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 21 Sep 2013 01:51:02 +0000 Subject: hg: type-annotations/type-annotations/langtools: 9 new changesets Message-ID: <20130921015138.CE602629FE@hg.openjdk.java.net> Changeset: a2a5ad0853ed Author: bpatel Date: 2013-09-18 17:13 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a2a5ad0853ed 8015249: javadoc fails to document static final fields in annotation types Reviewed-by: jjg + src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java + src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java + src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java ! test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java + test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationTypeField.java ! test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Changeset: 8df12c315ea3 Author: bpatel Date: 2013-09-18 22:47 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8df12c315ea3 8024096: some javadoc tests may contain false positive results Reviewed-by: jjg ! test/com/sun/javadoc/lib/JavadocTester.java ! test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java ! test/com/sun/javadoc/testEncoding/EncodeTest.java ! test/com/sun/javadoc/testEncoding/TestEncoding.java ! test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java ! test/com/sun/javadoc/testProfiles/TestProfiles.java Changeset: 36e342dd57e2 Author: kizune Date: 2013-09-19 17:05 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/36e342dd57e2 8017248: Compiler Diacritics Issue Reviewed-by: naoto ! src/share/classes/com/sun/tools/javac/file/RegularFileObject.java Changeset: 8d1c48de706d Author: jlahoda Date: 2013-09-19 17:05 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8d1c48de706d 8022567: Javac Should Generate Warnings For Raw Array Type Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/warnings/6747671/T6747671.java ! test/tools/javac/warnings/6747671/T6747671.out Changeset: 0cfd5baa7154 Author: ohrstrom Date: 2013-09-19 08:26 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0cfd5baa7154 8024609: sjavac assertion fails during call to BuildState.collectArtifacts Reviewed-by: jjg ! src/share/classes/com/sun/tools/sjavac/BuildState.java ! src/share/classes/com/sun/tools/sjavac/Main.java ! src/share/classes/com/sun/tools/sjavac/server/JavacServer.java Changeset: 2375ce96e80d Author: vromero Date: 2013-09-19 20:57 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2375ce96e80d 8024437: Inferring the exception thrown: sometimes fails to compile Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java + test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java Changeset: 9a75bdb249a2 Author: jjg Date: 2013-09-19 19:18 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9a75bdb249a2 8025110: TreeCopier does not correctly copy LabeledStatementTree Reviewed-by: jjg Contributed-by: Werner Dietl ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Changeset: 41599b57d262 Author: jlahoda Date: 2013-09-20 16:33 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/41599b57d262 8023835: TreeMaker.QualIdent() too leafy Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java + test/tools/javac/tree/MakeQualIdent.java + test/tools/javac/tree/ScopeTest.java Changeset: 25401a714d5b Author: wmdietl Date: 2013-09-20 18:50 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/25401a714d5b Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java From wdietl at gmail.com Fri Sep 20 18:28:55 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 21 Sep 2013 01:28:55 +0000 Subject: hg: type-annotations/type-annotations/jdk: 12 new changesets Message-ID: <20130921013222.973B6629FC@hg.openjdk.java.net> Changeset: 22e9f0067b5a Author: kizune Date: 2013-09-19 17:04 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/22e9f0067b5a 8017248: Compiler Diacritics Issue Reviewed-by: naoto ! src/share/classes/sun/launcher/LauncherHelper.java + test/tools/launcher/8017248/ClassA??.java + test/tools/launcher/8017248/test.sh Changeset: 7557062d2dd2 Author: plevart Date: 2013-09-19 16:14 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7557062d2dd2 8011940: java.lang.Class.getAnnotations() always enters synchronized method Reviewed-by: jfranck, chegar, psandoz, shade ! src/share/classes/java/lang/Class.java + test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java Changeset: 278873b2b3f8 Author: sherman Date: 2013-09-19 10:06 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/278873b2b3f8 8023113: tools/jar/ChangeDir.java fails if /tmp/a exists Summary: updated the test case Reviewed-by: alanb ! test/tools/jar/ChangeDir.java Changeset: f36714707c38 Author: psandoz Date: 2013-09-18 10:49 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f36714707c38 8025002: "".codePoints().sorted().iterator().hasNext() causes NegativeArraySizeException Reviewed-by: henryjen, alanb ! src/share/classes/java/lang/CharSequence.java ! test/java/lang/CharSequence/DefaultTest.java Changeset: 0ef7ddef9de0 Author: psandoz Date: 2013-09-19 20:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0ef7ddef9de0 8024405: Spliterators.spliterator should support CONCURRENT characteristic Reviewed-by: martin ! src/share/classes/java/util/Spliterator.java ! src/share/classes/java/util/Spliterators.java ! test/java/util/Spliterator/SpliteratorCharacteristics.java ! test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java Changeset: 58fd427b454d Author: sla Date: 2013-09-20 10:14 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/58fd427b454d 8024985: com/sun/jdi/StepTest.java failed since jdk8b107 Reviewed-by: dcubed ! test/com/sun/jdi/ExceptionEvents.java ! test/com/sun/jdi/FilterNoMatch.java ! test/com/sun/jdi/JDIScaffold.java ! test/com/sun/jdi/PopAndStepTest.java ! test/com/sun/jdi/RepStep.java ! test/com/sun/jdi/TestScaffold.java Changeset: 6a1c70e191d4 Author: sla Date: 2013-09-20 10:15 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/6a1c70e191d4 8024416: TESTBUG: com/sun/jdi/MethodEntryExitEvents.java: method entry count mismatch Reviewed-by: dcubed ! test/com/sun/jdi/MethodEntryExitEvents.java Changeset: afe857b13b62 Author: kizune Date: 2013-09-20 17:56 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/afe857b13b62 8025076: Fix for JDK-8017248 breaks jprt submission for non-unicode locales Reviewed-by: naoto, ksrini - test/tools/launcher/8017248/ClassA??.java - test/tools/launcher/8017248/test.sh + test/tools/launcher/DiacriticTest.java Changeset: 94cc251d0c45 Author: sla Date: 2013-09-20 16:40 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/94cc251d0c45 7200277: [parfait] potential buffer overflow in npt/utf.c Reviewed-by: dsamersoff, dcubed ! src/share/npt/utf.c Changeset: 7913855ff66c Author: psandoz Date: 2013-09-20 11:07 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7913855ff66c 8024253: ThreadLocal random can use SecureRandom for the initial seed Reviewed-by: psandoz, chegar, alanb Contributed-by: Doug Lea
, Peter Levart , Guy Steele ! src/share/classes/java/util/SplittableRandom.java ! src/share/classes/java/util/concurrent/ThreadLocalRandom.java ! test/java/util/concurrent/ThreadLocalRandom/ThreadLocalRandomTest.java Changeset: 2552cd270350 Author: bpb Date: 2013-09-20 15:12 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2552cd270350 8024331: j.u.Map.computeIfPresent() default/nondefault implementations don't throw NPE if the remappingFunction is null and the key is absent Summary: Explicitly check for null remappingFunction parameter. Reviewed-by: mduigou, forax, psandoz Contributed-by: Brian Burkhalter ! src/share/classes/java/util/HashMap.java ! src/share/classes/java/util/Map.java ! test/java/util/Map/Defaults.java Changeset: 821a84488dd4 Author: wmdietl Date: 2013-09-20 16:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/821a84488dd4 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk ! src/share/classes/java/lang/Class.java From wdietl at gmail.com Fri Sep 20 19:00:56 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Sat, 21 Sep 2013 02:00:56 +0000 Subject: hg: type-annotations/type-annotations/jdk: 2 new changesets Message-ID: <20130921020132.3F321629FF@hg.openjdk.java.net> Changeset: c30dc8e7744e Author: psandoz Date: 2013-09-20 17:11 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c30dc8e7744e 8024341: j.u.regex.Pattern.splitAsStream() doesn't correspond to split() method if using an example from the spec Reviewed-by: alanb ! src/share/classes/java/util/regex/Pattern.java + test/java/util/regex/PatternStreamTest.java - test/java/util/regex/PatternTest.java Changeset: 50f248c74d81 Author: wmdietl Date: 2013-09-20 19:00 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/50f248c74d81 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From steve.sides at oracle.com Mon Sep 23 11:49:23 2013 From: steve.sides at oracle.com (Steve Sides) Date: Mon, 23 Sep 2013 11:49:23 -0700 Subject: review request for 8010225 test in typeAnnotations/failures do not test TYPE_USE In-Reply-To: <5238AD9C.1050603@oracle.com> References: <52043C60.8020501@oracle.com> <522120AD.8080506@oracle.com> <52278CB5.4030005@oracle.com> <52333506.8020002@oracle.com> <52334E71.7050308@oracle.com> <52377B4C.5070005@oracle.com> <5237A069.8020009@oracle.com> <5238A826.60009@oracle.com> <5238AD9C.1050603@oracle.com> Message-ID: <52408D33.5070902@oracle.com> This makes the noted changes: http://cr.openjdk.java.net/~ssides/8010225.3/ Also, I took out any changes to CantAnnotateStaticClass.java/out and this change leaves it as is. I saw Werner sent a much more comprehensive test for this as a mail attachement. It was CantAnnotateStaticClass2.java. Werner, could you put that test back as CantAnnotateStaticClass.java/.out since your test was inclusive of the first and that first was never completed (no final .out file)? -steve On 9/17/2013 12:29 PM, Alex Buckley wrote: > To all: there's a bug in case 4 below. > > On 9/17/2013 12:06 PM, Steve Sides wrote: >> Got it. While whittling on this, I have another question about the >> compiler's behavior. >> 1. If I qualify the (not type) annotation, >> >> @Scopes.UniqueInner >> class Scopes { >> @interface UniqueInner { }; >> } >> I get 1 error, "Scopes.java:11:24: >> compiler.err.annotation.type.not.applicable". This seems correct as I'm >> using an annotation on a type usage, and the one on the class is okay. > > You are right. The annotation on the upper bound of T is illegal > because the Scopes.UniqueInner annotation type is applicable only in > locations which existed in Java SE 7 (such as type declarations) and > not in new locations in Java SE 8 (such as type uses). > >> 2. If I use the annotation unqualified, I get 3 errors, two for >> "cant.resolve..." and the one above again. I can see that this can also >> be correct. >> >> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, >> UniqueInner, , // on the class >> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, >> UniqueInner, , // on the bound >> Scopes.java:11:24: >> compiler.err.annotation.type.not.applicable // not a type >> annotation(I assumed)? >> 3 errors > > The scope of the @interface declaration is the body of class Scopes. > Therefore, the simple name "UniqueInner" is not in scope before the { > of the declaration of Scopes. All three errors are correct. > >> 3. If I use a qualified type annotation, >> @Scopes.UniqueInner >> class Scopes { >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> it compiles without error. > > As it should. > >> 4. However, if I use an unqualified type annotation, >> @UniqueInner >> class Scopes { >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> I get the same 3 errors as the unqualified annotation: >> >> Scopes.java:10:2: compiler.err.cant.resolve: kindname.class, >> UniqueInner, , >> Scopes.java:11:25: compiler.err.cant.resolve: kindname.class, >> UniqueInner, , >> Scopes.java:11:24: compiler.err.annotation.type.not.applicable >> 3 errors >> >> Why should I get "compiler.err.annotation.type.not.applicable" in this >> last scenario? For 1. I kind of assumed the third error meant it was >> not applicable because it was not a type annotation. Is it not >> applicable for reasons other than not being TYPE_USE? > > You are right to ponder what's going on. The third error, about > applicability, is a bug. > >> I'm thinking of using it as below (and adding a postivie version with >> qualified name), >> >> @UniqueInner >> class Scopes { >> // Unqualified @UniqueInner is not accessible to the class . >> // One has to use @Scopes.UniqueInner. >> @Target(ElementType.TYPE_USE) >> @interface UniqueInner { }; >> } >> >> but I'm unsure about that third error and would like to verify it is as >> expected. > > Please add this test. The comment however should not mention > accessibility, which is a totally different concept. Say "The simple > name UniqueInner is not in scope on the header of class Scopes, so > @UniqueInner is not meaningful there. One must use the qualified name, > as in @Scopes.UniqueInner." > > In addition, the type parameter T is also out of UniqueInner's scope. > To ensure that annotations on the class declaration and annotations on > the type parameter declaration are handled consistently, @UniqueInner > should be written on T as well. > > Alex From steve.sides at oracle.com Mon Sep 23 12:14:10 2013 From: steve.sides at oracle.com (Steve Sides) Date: Mon, 23 Sep 2013 12:14:10 -0700 Subject: redundant cast test LintCast.java failing Message-ID: <52409302.7000906@oracle.com> Hi Werner, I also noticed a recent change removed an '@A' from the expected output of the test test/tools/javac/annotations/typeAnnotation/failures/LintCast.java and the test now fails. The test case in LintCast.java is void array() { int @A [] a = null; int[] a1 = (int[])a; //this line is the one in question int[] a2 = (int @A [])a; } This casts 'int @A[]'a to 'int[]'. The expected was changed to: LintCast.java:27:20: compiler.warn.redundant.cast: int[] which removed the @A. The warning text is more explicit than the diagnostic key and states, Xlint:cast Test.java Test.java:13: warning: [cast] redundant cast to int @A [] int[] a1 = (int[])a; ^ 1 warning Was the change to the out file expected? I makes more sense, but was it expected? -steve From jonathan.gibbons at oracle.com Mon Sep 23 12:21:00 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 23 Sep 2013 12:21:00 -0700 Subject: redundant cast test LintCast.java failing In-Reply-To: <52409302.7000906@oracle.com> References: <52409302.7000906@oracle.com> Message-ID: <5240949C.4070606@oracle.com> On 09/23/2013 12:14 PM, Steve Sides wrote: > Hi Werner, > I also noticed a recent change removed an '@A' from the expected > output of the test > test/tools/javac/annotations/typeAnnotation/failures/LintCast.java > and the test now fails. > > The test case in LintCast.java is > > void array() { > int @A [] a = null; > int[] a1 = (int[])a; //this line is the one in question > int[] a2 = (int @A [])a; > } > > This casts 'int @A[]'a to 'int[]'. The expected was changed to: > > LintCast.java:27:20: compiler.warn.redundant.cast: int[] > > which removed the @A. The warning text is more explicit than the > diagnostic key and states, > > Xlint:cast Test.java > Test.java:13: warning: [cast] redundant cast to int @A [] > int[] a1 = (int[])a; > ^ > 1 warning > > Was the change to the out file expected? I makes more sense, but was > it expected? > > -steve Steve, Thanks for the detail you provide here. I raised this issue with Werner in my review of a recent changeset last week. Looking at the details you provide, it does seem that the change is correct: after all, there is no annotation on the statement in question, and so it seems like it was an error that it appears in the diagnostic. -- jon From wdietl at gmail.com Mon Sep 23 16:26:12 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:26:12 +0000 Subject: hg: type-annotations/type-annotations/langtools: 12 new changesets Message-ID: <20130923232656.1770E62A68@hg.openjdk.java.net> Changeset: 571f8ebc2d51 Author: vromero Date: 2013-09-22 12:53 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/571f8ebc2d51 8024696: Missing null check in bound method reference capture Reviewed-by: jjg, briangoetz ! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java ! test/tools/javac/lambda/8023558/T8023558a.java + test/tools/javac/lambda/methodReferenceExecution/MethodReferenceNullCheckTest.java Changeset: 1b7f5a27c4ba Author: cl Date: 2013-09-12 11:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/1b7f5a27c4ba Added tag jdk8-b107 for changeset 3f274927ec18 ! .hgtags Changeset: 252f872b8a2f Author: lana Date: 2013-09-17 08:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/252f872b8a2f Merge - src/share/classes/com/sun/tools/javac/code/Annotations.java - test/tools/javac/diags/examples/CyclicInference.java - test/tools/javac/diags/examples/MrefStat.java.rej - test/tools/javac/diags/examples/MrefStat1.java.rej - test/tools/javac/lambda/TargetType10.out - test/tools/javac/lambda/typeInference/InferenceTest5.java - test/tools/javac/lambda/typeInference/InferenceTest_neg5.java - test/tools/javac/lambda/typeInference/InferenceTest_neg5.out Changeset: 8ecfe6a3ba4c Author: cl Date: 2013-09-19 09:37 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8ecfe6a3ba4c Added tag jdk8-b108 for changeset 252f872b8a2f ! .hgtags Changeset: 86dd72166267 Author: lana Date: 2013-09-20 19:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/86dd72166267 Merge Changeset: 20b72bae83d7 Author: lana Date: 2013-09-22 20:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/20b72bae83d7 Merge Changeset: 1fe358ea75ff Author: alundblad Date: 2013-09-23 10:10 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/1fe358ea75ff 8024988: javac, LVT test harness should generate tests .class files in the scratch folder Summary: Set the CLASS_OUTPUT location to the scratch directory. Changed the argument to checkClassFile accordingly. Reviewed-by: jjg, vromero ! test/tools/javac/flow/LVTHarness.java Changeset: 5f915a0c9615 Author: alundblad Date: 2013-09-23 10:42 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/5f915a0c9615 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb() Summary: Static factory method ListBuffer.lb removed. Replaced by constructor calls. Reviewed-by: jfranck, jjg ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java ! src/share/classes/com/sun/tools/javac/code/Printer.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java ! src/share/classes/com/sun/tools/javac/comp/Flow.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/comp/Lower.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/parser/Tokens.java ! src/share/classes/com/sun/tools/javac/util/GraphUtils.java ! src/share/classes/com/sun/tools/javac/util/List.java ! src/share/classes/com/sun/tools/javac/util/ListBuffer.java ! src/share/classes/com/sun/tools/javac/util/Log.java ! test/tools/javac/cast/intersection/IntersectionTypeCastTest.java ! test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java ! test/tools/javac/scope/7017664/CompoundScopeTest.java ! test/tools/javac/types/TypeHarness.java Changeset: 809a50f24d6f Author: kizune Date: 2013-09-23 17:27 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/809a50f24d6f 7154966: CRs found to be in Fixed state with no test and no noreg- keyword. Reviewed-by: ksrini + test/tools/javac/T7090499.java + test/tools/javac/T7090499.out + test/tools/javac/T7120463.java + test/tools/javac/T7120463.out + test/tools/javac/T7126754.java Changeset: 64e79d38bd07 Author: kizune Date: 2013-09-23 18:29 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/64e79d38bd07 4881267: improve diagnostic for "instanceof T" for type parameter T Reviewed-by: vromero, jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java + test/tools/javac/T4881267.java + test/tools/javac/T4881267.out Changeset: 09301757bb32 Author: emc Date: 2013-09-23 15:37 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/09301757bb32 6499673: Assertion check for TypeVariable.getUpperBound() fails. Summary: Fix TypeVariable.getUpperBound to return results as specified Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/model/JavacTypes.java ! test/tools/javac/cast/intersection/model/Model01.java ! test/tools/javac/cast/intersection/model/ModelChecker.java + test/tools/javac/processing/model/type/BoundsTest.java + test/tools/javac/processing/model/type/IntersectionPropertiesTest.java Changeset: e627eab3a45a Author: wmdietl Date: 2013-09-23 16:26 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e627eab3a45a Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! .hgtags ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/code/Printer.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/Flow.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/comp/Lower.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java ! src/share/classes/com/sun/tools/javac/model/JavacTypes.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/util/List.java ! src/share/classes/com/sun/tools/javac/util/Log.java From wdietl at gmail.com Mon Sep 23 16:30:00 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:30:00 +0000 Subject: hg: type-annotations/type-annotations: 14 new changesets Message-ID: <20130923233002.6975762A69@hg.openjdk.java.net> Changeset: 0874bb4707b7 Author: omajid Date: 2013-09-11 12:08 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/0874bb4707b7 8024320: Add s390(x) detection to platform.m4 Reviewed-by: erikj, ihse, dsamersoff ! common/autoconf/generated-configure.sh ! common/autoconf/platform.m4 Changeset: 14fe208b657c Author: cl Date: 2013-09-12 11:08 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/14fe208b657c Added tag jdk8-b107 for changeset 0874bb4707b7 ! .hgtags Changeset: 4bf059350c51 Author: lana Date: 2013-09-17 08:08 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/4bf059350c51 Merge Changeset: 8dadd26c2a58 Author: ihse Date: 2013-09-12 10:38 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/8dadd26c2a58 8024467: Update autoconf-config.guess to autoconf 2.69 Reviewed-by: erikj ! common/autoconf/build-aux/autoconf-config.guess Changeset: 64f52ef175a4 Author: ihse Date: 2013-09-12 10:42 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/64f52ef175a4 8010185: Build should support --with-override-nashorn Reviewed-by: erikj ! common/autoconf/generated-configure.sh ! common/autoconf/source-dirs.m4 Changeset: b1e9396fb8af Author: vadim Date: 2013-09-12 12:12 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/b1e9396fb8af 8008022: Upgrade Direct X SDK used to build JDK Reviewed-by: erikj, prr, ihse ! Makefile ! README-builds.html ! common/autoconf/generated-configure.sh ! common/autoconf/spec.gmk.in ! common/autoconf/toolchain.m4 ! common/autoconf/toolchain_windows.m4 Changeset: 69da99676239 Author: ihse Date: 2013-09-13 13:07 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/69da99676239 8024620: config.log does not end up in corresponding configuration Reviewed-by: erikj ! common/autoconf/configure ! common/autoconf/configure.ac ! common/autoconf/generated-configure.sh Changeset: ac3f5137f84d Author: ihse Date: 2013-09-13 14:59 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/ac3f5137f84d 8024665: Move open changes for JDK-8020411 to closed source Reviewed-by: erikj ! common/autoconf/generated-configure.sh ! common/autoconf/platform.m4 ! common/autoconf/spec.gmk.in Changeset: aab351790498 Author: katleman Date: 2013-09-17 13:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/aab351790498 Merge Changeset: 59d6af7422af Author: katleman Date: 2013-09-17 19:06 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/59d6af7422af Merge Changeset: 7697621037fd Author: ihse Date: 2013-09-18 12:37 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/7697621037fd 8024815: Make --with-dxsdk and friends deprecated Reviewed-by: erikj ! common/autoconf/basics.m4 ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain.m4 Changeset: 9286a6e61291 Author: ihse Date: 2013-09-18 13:49 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/9286a6e61291 8024849: Don't remove upper case letters from username when setting USER_RELEASE_SUFFIX Reviewed-by: erikj ! common/autoconf/basics_windows.m4 ! common/autoconf/generated-configure.sh ! common/autoconf/jdk-options.m4 Changeset: d4762f463fe0 Author: cl Date: 2013-09-19 09:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/d4762f463fe0 Added tag jdk8-b108 for changeset 9286a6e61291 ! .hgtags Changeset: 773f0ca7d240 Author: wmdietl Date: 2013-09-23 16:29 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/773f0ca7d240 Automated merge with http://hg.openjdk.java.net/jdk8/tl/ ! .hgtags From wdietl at gmail.com Mon Sep 23 16:30:36 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:30:36 +0000 Subject: hg: type-annotations/type-annotations/corba: 4 new changesets Message-ID: <20130923233042.A53E662A6A@hg.openjdk.java.net> Changeset: 260f00a95705 Author: cl Date: 2013-09-12 11:08 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/260f00a95705 Added tag jdk8-b107 for changeset 23fc34133152 ! .hgtags Changeset: a4bb3b450016 Author: lana Date: 2013-09-17 08:08 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/a4bb3b450016 Merge Changeset: c1eb93f57603 Author: cl Date: 2013-09-19 09:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/c1eb93f57603 Added tag jdk8-b108 for changeset a4bb3b450016 ! .hgtags Changeset: 2e4a4c62bd17 Author: wmdietl Date: 2013-09-23 16:30 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/2e4a4c62bd17 Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba ! .hgtags From wdietl at gmail.com Mon Sep 23 16:32:41 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:32:41 +0000 Subject: hg: type-annotations/type-annotations/jaxws: 3 new changesets Message-ID: <20130923233254.106B762A6B@hg.openjdk.java.net> Changeset: d1ea68556fd7 Author: cl Date: 2013-09-12 11:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/d1ea68556fd7 Added tag jdk8-b107 for changeset e3c9328f7563 ! .hgtags Changeset: f64b1e497722 Author: cl Date: 2013-09-19 09:37 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/f64b1e497722 Added tag jdk8-b108 for changeset d1ea68556fd7 ! .hgtags Changeset: e8a486be13d3 Author: wmdietl Date: 2013-09-23 16:32 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/e8a486be13d3 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxws ! .hgtags From wdietl at gmail.com Mon Sep 23 16:33:20 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:33:20 +0000 Subject: hg: type-annotations/type-annotations/jaxp: 3 new changesets Message-ID: <20130923233334.3640962A6C@hg.openjdk.java.net> Changeset: 8ade3eed63da Author: cl Date: 2013-09-12 11:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/8ade3eed63da Added tag jdk8-b107 for changeset d6a32e3831aa ! .hgtags Changeset: 21b10835b88a Author: cl Date: 2013-09-19 09:37 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/21b10835b88a Added tag jdk8-b108 for changeset 8ade3eed63da ! .hgtags Changeset: 0a3ceabce40f Author: wmdietl Date: 2013-09-23 16:33 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/0a3ceabce40f Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxp ! .hgtags From wdietl at gmail.com Mon Sep 23 16:34:54 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:34:54 +0000 Subject: hg: type-annotations/type-annotations/jdk: 23 new changesets Message-ID: <20130923234049.C117562A6D@hg.openjdk.java.net> Changeset: 56d247821694 Author: alanb Date: 2013-09-23 04:05 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/56d247821694 8023130: (process) ProcessBuilder#inheritIO does not work on Windows Reviewed-by: alanb, martin Contributed-by: ivan.gerasimov at oracle.com ! src/windows/native/java/lang/ProcessImpl_md.c ! test/java/lang/ProcessBuilder/Basic.java + test/java/lang/ProcessBuilder/InheritIO/InheritIO.java + test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh Changeset: eea685b9ccaa Author: amurillo Date: 2013-09-10 05:46 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/eea685b9ccaa 8024515: ProblemList.txt updates to exclude tests that fail with hs25-b49 Reviewed-by: alanb, chegar ! test/ProblemList.txt Changeset: b67c8099ba28 Author: cl Date: 2013-09-12 11:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b67c8099ba28 Added tag jdk8-b107 for changeset eea685b9ccaa ! .hgtags Changeset: 12ac08d79c9b Author: vadim Date: 2013-08-23 14:13 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/12ac08d79c9b 8023052: JVM crash in native layout Reviewed-by: bae, prr ! src/share/native/sun/font/layout/SunLayoutEngine.cpp Changeset: b5c5cff52455 Author: lana Date: 2013-08-28 08:59 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b5c5cff52455 Merge Changeset: 7da90f645a63 Author: jgodinez Date: 2013-08-30 09:10 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7da90f645a63 8017469: [macosx] Printing problem using ja and zh_CN locales Reviewed-by: prr, jchen ! src/macosx/native/sun/awt/CTextPipe.m Changeset: dc09174469ef Author: prr Date: 2013-08-30 10:25 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/dc09174469ef 4673406: RFE: Java Printing: Provide a way to display win32 printer driver's dialog Reviewed-by: jgodinez, bae + src/share/classes/sun/print/DocumentPropertiesUI.java + src/share/classes/sun/print/PrinterJobWrapper.java ! src/share/classes/sun/print/RasterPrinterJob.java ! src/share/classes/sun/print/ServiceDialog.java ! src/windows/classes/sun/awt/windows/WPrinterJob.java ! src/windows/classes/sun/print/Win32MediaTray.java ! src/windows/classes/sun/print/Win32PrintService.java ! src/windows/native/sun/windows/awt_PrintControl.cpp ! src/windows/native/sun/windows/awt_PrintControl.h ! src/windows/native/sun/windows/awt_PrintJob.cpp Changeset: 2114b624bf63 Author: ceisserer Date: 2013-09-01 09:38 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2114b624bf63 7189452: XRender pipeline does ignore source-surface offset for text rendering Reviewed-by: prr, bae ! src/solaris/classes/sun/font/XRTextRenderer.java ! src/solaris/classes/sun/java2d/xr/XRBackendNative.java ! src/solaris/classes/sun/java2d/xr/XRCompositeManager.java ! src/solaris/native/sun/java2d/x11/XRBackendNative.c Changeset: a07c907a82b5 Author: bae Date: 2013-09-04 12:10 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a07c907a82b5 7043064: sun/java2d/cmm/ tests failed against RI b141 & b138-nightly Reviewed-by: prr, vadim ! make/sun/cmm/lcms/mapfile-vers ! makefiles/mapfiles/liblcms/mapfile-vers ! src/share/classes/java/awt/color/ICC_Profile.java ! src/share/classes/java/awt/color/ICC_ProfileGray.java ! src/share/classes/java/awt/color/ICC_ProfileRGB.java ! src/share/classes/sun/java2d/cmm/CMSManager.java ! src/share/classes/sun/java2d/cmm/PCMM.java + src/share/classes/sun/java2d/cmm/Profile.java ! src/share/classes/sun/java2d/cmm/lcms/LCMS.java + src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java ! src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java ! src/share/native/sun/java2d/cmm/lcms/LCMS.c ! test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java Changeset: c561115d697d Author: ceisserer Date: 2013-09-04 12:38 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c561115d697d 7159455: Nimbus scrollbar rendering glitch with xrender enabled on i945GM Reviewed-by: prr, bae ! src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java Changeset: 0a317fc785fb Author: ceisserer Date: 2013-09-05 11:50 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0a317fc785fb 8024261: xrender: improve performance of small fillRect operations Reviewed-by: prr, bae ! src/solaris/classes/sun/java2d/xr/XRCompositeManager.java Changeset: 2d223e1a9706 Author: lana Date: 2013-09-06 18:25 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2d223e1a9706 Merge - src/share/classes/sun/misc/Compare.java - src/share/classes/sun/misc/Sort.java Changeset: 08296c2d4c68 Author: bae Date: 2013-09-10 21:54 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/08296c2d4c68 8024511: Crash during color profile destruction Reviewed-by: vadim, prr ! src/share/native/sun/java2d/cmm/lcms/LCMS.c + test/sun/java2d/cmm/ProfileOp/DisposalCrashTest.java Changeset: 1579407c0a82 Author: bae Date: 2013-09-13 20:28 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1579407c0a82 8024697: Fix for 8020983 causes Xcheck:jni warnings Reviewed-by: prr, jchen ! src/share/native/sun/awt/image/jpeg/imageioJPEG.c ! test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java Changeset: da6cd0247b27 Author: lana Date: 2013-09-17 08:07 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/da6cd0247b27 Merge Changeset: ebc44e50df79 Author: lana Date: 2013-09-17 08:16 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ebc44e50df79 Merge - src/share/classes/java/util/stream/CloseableStream.java - src/share/classes/java/util/stream/DelegatingStream.java ! test/ProblemList.txt - test/java/util/Collection/ListDefaults.java - test/java/util/Map/CheckRandomHashSeed.java - test/java/util/Map/TreeBinSplitBackToEntries.java - test/java/util/concurrent/ConcurrentHashMap/toArray.java - test/sun/tools/jconsole/ImmutableResourceTest.java - test/sun/tools/jconsole/ImmutableResourceTest.sh Changeset: 5063b43d7e09 Author: vadim Date: 2013-09-12 12:12 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5063b43d7e09 8008022: Upgrade Direct X SDK used to build JDK Reviewed-by: erikj, prr, ihse ! make/Makefile ! make/common/Defs-windows.gmk ! make/common/Sanity.gmk ! make/common/shared/Defs-versions.gmk ! make/common/shared/Defs-windows.gmk ! make/common/shared/Sanity-Settings.gmk ! make/common/shared/Sanity.gmk ! make/javax/sound/jsoundds/Makefile ! make/jdk_generic_profile.sh ! make/netbeans/awt2d/README ! make/sun/awt/Makefile ! make/sun/jawt/Makefile ! makefiles/CompileNativeLibraries.gmk Changeset: 5da2bb1419e6 Author: katleman Date: 2013-09-17 13:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5da2bb1419e6 Merge Changeset: 006aaa5f069e Author: katleman Date: 2013-09-17 19:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/006aaa5f069e Merge ! makefiles/CompileNativeLibraries.gmk Changeset: a7dd84b9557c Author: cl Date: 2013-09-19 09:37 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a7dd84b9557c Added tag jdk8-b108 for changeset 006aaa5f069e ! .hgtags Changeset: a3b17b91127d Author: lana Date: 2013-09-20 19:15 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a3b17b91127d Merge Changeset: f1b251affc6a Author: lana Date: 2013-09-22 20:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f1b251affc6a Merge Changeset: 3fb86e04572e Author: wmdietl Date: 2013-09-23 16:34 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3fb86e04572e Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk ! .hgtags From wdietl at gmail.com Mon Sep 23 16:46:35 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:46:35 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 8 new changesets Message-ID: <20130923234648.64C7C62A6E@hg.openjdk.java.net> Changeset: a1f980cc1355 Author: cl Date: 2013-09-12 11:09 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/a1f980cc1355 Added tag jdk8-b107 for changeset f35e1255024b ! .hgtags Changeset: 445ad3f6d3b4 Author: lana Date: 2013-09-17 08:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/445ad3f6d3b4 Merge - src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectMirrorIterator.java - src/jdk/nashorn/internal/runtime/arrays/ScriptObjectMirrorIterator.java Changeset: 6ec2f9e5ed5b Author: cl Date: 2013-09-19 09:37 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/6ec2f9e5ed5b Added tag jdk8-b108 for changeset 445ad3f6d3b4 ! .hgtags Changeset: 13210550765c Author: lana Date: 2013-09-20 19:17 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/13210550765c Merge Changeset: 279f47b353f3 Author: sundar Date: 2013-09-20 20:55 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/279f47b353f3 8025147: Trailing comma is not allowed in JSONArray and JSONObject Reviewed-by: hannesw, jlaskey ! src/jdk/nashorn/internal/parser/JSONParser.java ! src/jdk/nashorn/internal/runtime/resources/Messages.properties + test/script/basic/JDK-8025147.js + test/script/basic/JDK-8025147.js.EXPECTED Changeset: 16b6db9f7225 Author: sundar Date: 2013-09-20 22:37 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/16b6db9f7225 8025149: JSON.stringify does not handle 'space' argument as per the spec. Reviewed-by: jlaskey, hannesw ! src/jdk/nashorn/internal/objects/NativeJSON.java + test/script/basic/JDK-8025149.js + test/script/basic/JDK-8025149.js.EXPECTED Changeset: b8d9a63578e2 Author: hannesw Date: 2013-09-21 10:11 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/b8d9a63578e2 8025163: Date methods should not return -0 Reviewed-by: lagergren, jlaskey ! src/jdk/nashorn/internal/objects/NativeDate.java + test/script/basic/JDK-8025163.js + test/script/basic/JDK-8025163.js.EXPECTED Changeset: 8f6304373671 Author: sundar Date: 2013-09-23 14:20 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/8f6304373671 Merge From wdietl at gmail.com Mon Sep 23 16:44:45 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 23 Sep 2013 23:44:45 +0000 Subject: hg: type-annotations/type-annotations/hotspot: 70 new changesets Message-ID: <20130923234728.0D52362A6F@hg.openjdk.java.net> Changeset: c169f7038414 Author: amurillo Date: 2013-08-30 00:29 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c169f7038414 8024022: new hotspot build - hs25-b49 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 4a1efab850f4 Author: shade Date: 2013-08-26 17:42 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4a1efab850f4 8023638: Add the regression test for 8006997 Summary: Add the relevant test and proofread the VM messages as well Reviewed-by: coleenp, mseledtsov, dcubed ! src/share/vm/runtime/arguments.cpp + test/runtime/contended/Options.java Changeset: a7d8baf4cca7 Author: dcubed Date: 2013-08-26 18:34 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a7d8baf4cca7 Merge Changeset: 91b93f523ec6 Author: acorn Date: 2013-08-26 11:35 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/91b93f523ec6 8012294: remove generic handling for default methods Reviewed-by: kamg, coleenp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/defaultMethods.cpp - src/share/vm/classfile/genericSignatures.cpp - src/share/vm/classfile/genericSignatures.hpp ! src/share/vm/runtime/globals.hpp Changeset: d80493ee6430 Author: acorn Date: 2013-08-27 01:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d80493ee6430 Merge - src/share/vm/classfile/genericSignatures.cpp - src/share/vm/classfile/genericSignatures.hpp ! src/share/vm/runtime/globals.hpp Changeset: 6b3ac96bada6 Author: jiangli Date: 2013-08-26 13:32 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6b3ac96bada6 8023477: Invalid CP index when reading ConstantPool. Summary: Need to check for 0 case for InstanceKlass::_generic_signature_index. Reviewed-by: sspitsyn, sla ! agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Changeset: b3596321fbf4 Author: jiangli Date: 2013-08-27 04:58 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b3596321fbf4 Merge Changeset: 7e7dd25666da Author: ccheung Date: 2013-08-26 14:11 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/7e7dd25666da 8020675: invalid jar file in the bootclasspath could lead to jvm fatal error Summary: removed offending EXCEPTION_MARK calls and code cleanup Reviewed-by: dholmes, iklam, coleenp, mseledtsov ! src/share/vm/classfile/classLoader.cpp ! src/share/vm/classfile/classLoader.hpp + test/runtime/LoadClass/LoadClassNegative.java + test/runtime/LoadClass/TestForName.java + test/runtime/LoadClass/dummy.jar Changeset: 5351fe805c12 Author: minqi Date: 2013-08-27 07:54 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5351fe805c12 Merge Changeset: f462e61bce87 Author: iklam Date: 2013-08-26 21:59 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f462e61bce87 8020622: create.bat on Windows failed to create project file for Visual Studio 2012 Summary: Treat VS2012 the same as VS2010. Reviewed-by: dcubed, kamg, minqi ! make/windows/create.bat ! make/windows/makefiles/rules.make Changeset: 35471dcba316 Author: iklam Date: 2013-08-27 03:35 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/35471dcba316 Merge Changeset: c26d57fa08aa Author: iklam Date: 2013-08-27 16:02 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c26d57fa08aa Merge Changeset: 915cc4f3fb15 Author: acorn Date: 2013-08-28 08:15 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/915cc4f3fb15 8020489: VM crash when non-existent interface called by invokespecial Reviewed-by: kamg, coleenp ! src/share/vm/classfile/defaultMethods.cpp Changeset: cc56f122f3f7 Author: sla Date: 2013-08-29 11:05 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cc56f122f3f7 8023720: (hotspot) setjmp/longjmp changes the process signal mask on OS X Reviewed-by: dholmes, rbackman ! src/os/posix/vm/os_posix.cpp Changeset: 76482cbba706 Author: hseigel Date: 2013-08-29 10:33 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/76482cbba706 8016764: JVM does not prohibit invokespecial in c.f.v 51.0 that invokes default interface method in c.f.v 52.0 Summary: Check cfv before allowing invokespecial call to default method. Reviewed-by: kamg, acorn, dholmes ! src/share/vm/classfile/verifier.cpp Changeset: dfc126b2f659 Author: hseigel Date: 2013-08-29 13:44 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/dfc126b2f659 8022407: sun/misc/CopyMemory.java fails with SIGSEGV in Unsafe_SetByte+0x35 Summary: lower optimization level for unsafe.cpp due to MacOS Xcode 4.6.2 compiler optimization issue. Reviewed-by: coleenp, twisti, dholmes Contributed-by: lois.foltan at oracle.com ! make/bsd/makefiles/gcc.make Changeset: d8e99408faad Author: dsamersoff Date: 2013-08-29 21:48 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d8e99408faad 8009062: poor performance of JNI AttachCurrentThread after fix for 7017193 Summary: don't re-evaluate stack bounds for main thread before install guard page Reviewed-by: coleenp, dholmes, dlong ! src/os/linux/vm/os_linux.cpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/os.hpp + test/runtime/InitialThreadOverflow/DoOverflow.java + test/runtime/InitialThreadOverflow/invoke.cxx + test/runtime/InitialThreadOverflow/testme.sh Changeset: cef1e56a4d88 Author: dsamersoff Date: 2013-08-29 21:46 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cef1e56a4d88 Merge Changeset: 9758d9f36299 Author: coleenp Date: 2013-08-29 18:56 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9758d9f36299 8021954: VM SIGSEGV during classloading on MacOS; hs_err_pid file produced Summary: declare all user-defined operator new()s within Hotspot code with the empty throw() exception specification Reviewed-by: coleenp, twisti, dholmes, hseigel, dcubed, kvn, ccheung Contributed-by: lois.foltan at oracle.com ! src/share/vm/adlc/arena.cpp ! src/share/vm/adlc/arena.hpp ! src/share/vm/adlc/main.cpp ! src/share/vm/asm/codeBuffer.hpp ! src/share/vm/c1/c1_Compilation.hpp ! src/share/vm/c1/c1_Instruction.hpp ! src/share/vm/code/codeBlob.cpp ! src/share/vm/code/codeBlob.hpp ! src/share/vm/code/debugInfoRec.cpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/code/nmethod.hpp ! src/share/vm/code/relocInfo.hpp ! src/share/vm/code/vtableStubs.cpp ! src/share/vm/code/vtableStubs.hpp ! src/share/vm/gc_implementation/shared/gcUtil.hpp ! src/share/vm/libadt/port.hpp ! src/share/vm/memory/allocation.cpp ! src/share/vm/memory/allocation.hpp ! src/share/vm/memory/allocation.inline.hpp ! src/share/vm/memory/memRegion.cpp ! src/share/vm/memory/memRegion.hpp ! src/share/vm/oops/klass.cpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/symbol.cpp ! src/share/vm/oops/symbol.hpp ! src/share/vm/opto/callGenerator.hpp ! src/share/vm/opto/callnode.hpp ! src/share/vm/opto/machnode.hpp ! src/share/vm/opto/node.hpp ! src/share/vm/opto/type.hpp ! src/share/vm/runtime/fprofiler.cpp ! src/share/vm/runtime/handles.cpp ! src/share/vm/runtime/handles.hpp ! src/share/vm/runtime/interfaceSupport.hpp ! src/share/vm/runtime/objectMonitor.hpp ! src/share/vm/runtime/park.cpp ! src/share/vm/runtime/park.hpp ! src/share/vm/runtime/thread.hpp ! src/share/vm/services/memRecorder.hpp ! src/share/vm/services/memTrackWorker.cpp ! src/share/vm/services/memTrackWorker.hpp ! src/share/vm/utilities/array.hpp Changeset: c636758ea616 Author: dcubed Date: 2013-08-30 07:04 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c636758ea616 Merge ! src/os/posix/vm/os_posix.cpp - src/share/vm/classfile/genericSignatures.cpp - src/share/vm/classfile/genericSignatures.hpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/os.hpp Changeset: 522d69638aa8 Author: zgu Date: 2013-08-30 11:54 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/522d69638aa8 6991327: using -Xprof trigger native memory leak Summary: Fixed a memory leak in FlatProfiler::record_thread_tick() method Reviewed-by: dholmes, ccheung ! src/share/vm/runtime/fprofiler.cpp Changeset: 491de79915eb Author: zgu Date: 2013-08-30 12:22 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/491de79915eb Merge ! src/share/vm/runtime/fprofiler.cpp Changeset: ac2764460da7 Author: zgu Date: 2013-08-30 13:38 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ac2764460da7 Merge Changeset: ca0501b58953 Author: hseigel Date: 2013-08-30 15:07 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ca0501b58953 8024050: Incorrect optimization level and comment specified for unsafe.cpp Summary: Fix comments and optimization level. Reviewed-by: rdurbin, coleenp, hseigel Contributed-by: lois.foltan at oracle.com ! make/bsd/makefiles/gcc.make Changeset: d8ff06fb87ae Author: hseigel Date: 2013-08-30 15:15 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d8ff06fb87ae Merge Changeset: abff50660360 Author: hseigel Date: 2013-08-30 15:57 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/abff50660360 Merge Changeset: 3a1df0dce3e5 Author: acorn Date: 2013-08-30 15:15 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3a1df0dce3e5 8023872: Verification error in generated lambda classes Summary: skip verification for generated lambda classes Reviewed-by: kamg, dholmes ! src/share/vm/classfile/verifier.cpp ! src/share/vm/runtime/globals.hpp Changeset: 735f94656acc Author: acorn Date: 2013-08-30 12:56 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/735f94656acc Merge Changeset: 2918c7e21a3a Author: acorn Date: 2013-08-30 15:42 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2918c7e21a3a Merge Changeset: 35b99e7e0af2 Author: hseigel Date: 2013-09-01 10:37 -0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/35b99e7e0af2 8023381: VM fails to initialize in runtime/CDSCompressedKPtrs/XShareAuto.java runtime/SharedArchiveFile/CdsSameObjectAlignment.java Summary: Improve handling when CDS archive cannot be mapped Reviewed-by: kvn, dholmes, mseledtsov ! src/share/vm/memory/filemap.cpp ! test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java ! test/runtime/CDSCompressedKPtrs/XShareAuto.java ! test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java Changeset: 766fac3395d6 Author: kvn Date: 2013-08-23 11:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/766fac3395d6 8012972: Incremental Inlining should support scalar replaced object in debug info Summary: store in _first_index not absolute index but an index relative to the last (youngest) jvms->_scloff value Reviewed-by: roland, twisti ! src/share/vm/compiler/compileBroker.cpp ! src/share/vm/opto/callnode.cpp ! src/share/vm/opto/callnode.hpp ! src/share/vm/opto/generateOptoStub.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/opto/node.cpp ! src/share/vm/opto/node.hpp ! src/share/vm/opto/output.cpp Changeset: b17d8f6d9ed7 Author: kvn Date: 2013-08-23 18:04 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b17d8f6d9ed7 8023472: C2 optimization breaks with G1 Summary: set control edge for previous value load in G1 pre-barrier Reviewed-by: twisti ! src/share/vm/opto/graphKit.cpp + test/compiler/gcbarriers/G1CrashTest.java Changeset: f98f5d48f511 Author: roland Date: 2013-08-21 13:34 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f98f5d48f511 7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked Summary: Do patching rather bailing out for unlinked call with appendix Reviewed-by: twisti, kvn ! src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp ! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp ! src/cpu/sparc/vm/c1_Runtime1_sparc.cpp ! src/cpu/x86/vm/c1_CodeStubs_x86.cpp ! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ! src/cpu/x86/vm/c1_Runtime1_x86.cpp ! src/share/vm/c1/c1_CodeStubs.hpp ! src/share/vm/c1/c1_GraphBuilder.cpp ! src/share/vm/c1/c1_LIR.hpp ! src/share/vm/c1/c1_LIRAssembler.cpp ! src/share/vm/c1/c1_LIRAssembler.hpp ! src/share/vm/c1/c1_Runtime1.cpp ! src/share/vm/c1/c1_Runtime1.hpp ! src/share/vm/c1/c1_globals.cpp ! src/share/vm/c1/c1_globals.hpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciEnv.hpp ! src/share/vm/ci/ciMethod.hpp ! src/share/vm/ci/ciObjectFactory.cpp ! src/share/vm/ci/ciObjectFactory.hpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals_extension.hpp ! src/share/vm/runtime/sharedRuntime.cpp Changeset: e1fbb86b47e4 Author: roland Date: 2013-08-26 16:12 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e1fbb86b47e4 8016277: Crash in nmethod::is_compiled_by_c1() on x86 Summary: Method pointer for zombie methods may be invalid Reviewed-by: kvn, coleenp ! src/share/vm/code/nmethod.cpp Changeset: e47de6dfec5d Author: vlivanov Date: 2013-08-26 17:37 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e47de6dfec5d 8022456: LogCompilation tool does not work with C1 output again Reviewed-by: kvn ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java ! src/share/vm/c1/c1_Compilation.cpp Changeset: 74608df95ba3 Author: vlivanov Date: 2013-08-26 17:41 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/74608df95ba3 8022595: JSR292: deadlock during class loading of MethodHandles, MethodHandleImpl & MethodHandleNatives Reviewed-by: kvn, coleenp, dholmes ! src/share/vm/runtime/thread.cpp + test/compiler/jsr292/ConcurrentClassLoadingTest.java Changeset: 022415fe638e Author: vlivanov Date: 2013-08-26 21:48 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/022415fe638e Merge Changeset: 59982ff9e0ec Author: rbackman Date: 2013-08-20 09:37 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/59982ff9e0ec 8022283: Assertion failed: assert(is_loaded() && field->holder()->is_loaded() && klass()->is_subclass_of (field->holder())) failed: invalid access Reviewed-by: roland, twisti ! src/share/vm/c1/c1_GraphBuilder.cpp ! src/share/vm/ci/ciInstance.cpp Changeset: 58e010ab2d06 Author: rbackman Date: 2013-08-27 19:37 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/58e010ab2d06 Merge Changeset: 650868c062a9 Author: adlertz Date: 2013-08-26 12:50 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/650868c062a9 8023691: Create interface for nodes in class Block Summary: Create public methods for accessing the nodes in a block Reviewed-by: kvn, roland ! src/share/vm/adlc/output_c.cpp ! src/share/vm/opto/block.cpp ! src/share/vm/opto/block.hpp ! src/share/vm/opto/buildOopMap.cpp ! src/share/vm/opto/chaitin.cpp ! src/share/vm/opto/coalesce.cpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/domgraph.cpp ! src/share/vm/opto/gcm.cpp ! src/share/vm/opto/idealGraphPrinter.cpp ! src/share/vm/opto/ifg.cpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/live.cpp ! src/share/vm/opto/output.cpp ! src/share/vm/opto/phaseX.cpp ! src/share/vm/opto/postaloc.cpp ! src/share/vm/opto/reg_split.cpp Changeset: 7181dd13a6c4 Author: adlertz Date: 2013-08-27 21:16 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/7181dd13a6c4 Merge Changeset: 29aa8936f03c Author: kvn Date: 2013-08-28 11:22 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/29aa8936f03c 8023597: Optimize G1 barriers code for unsafe load_store Summary: Avoid loading old values in G1 pre-barriers for inlined unsafe load_store nodes. Reviewed-by: kvn, tonyp Contributed-by: Martin Doerr ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/library_call.cpp Changeset: 8947af8a9cec Author: vlivanov Date: 2013-08-29 22:44 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8947af8a9cec 8023976: assert(!CompilationPolicy::can_be_compiled(this, comp_level)) failed: sanity check Reviewed-by: kvn, twisti ! src/share/vm/oops/method.cpp ! src/share/vm/oops/method.hpp Changeset: 4b078f877b56 Author: adlertz Date: 2013-09-01 19:21 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4b078f877b56 8023988: Move local scheduling of nodes to the CFG creation and code motion phase (PhaseCFG) Summary: Moved local scheduling code from class Block to class PhaseCFG Reviewed-by: kvn, roland ! src/share/vm/opto/block.cpp ! src/share/vm/opto/block.hpp ! src/share/vm/opto/coalesce.cpp ! src/share/vm/opto/gcm.cpp ! src/share/vm/opto/lcm.cpp Changeset: 40ed2dc92a79 Author: adlertz Date: 2013-09-01 19:52 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/40ed2dc92a79 Merge Changeset: 27ffd1c4537b Author: rbackman Date: 2013-09-02 13:13 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/27ffd1c4537b Merge ! src/share/vm/runtime/thread.cpp Changeset: a9a968364704 Author: adlertz Date: 2013-09-02 22:44 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a9a968364704 8024095: Missing brackets in local scheduling code. Summary: Added brackets for if-statement Reviewed-by: kvn, roland ! src/share/vm/opto/lcm.cpp Changeset: 3bfb204913de Author: adlertz Date: 2013-09-05 10:39 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3bfb204913de Merge ! src/share/vm/code/nmethod.cpp ! src/share/vm/opto/callnode.hpp ! src/share/vm/opto/node.hpp Changeset: 88c255656030 Author: mgerdin Date: 2013-08-22 10:50 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/88c255656030 8016155: SIGBUS when running Kitchensink with ParallelScavenge and ParallelOld Summary: When using NUMA and large pages we need to ease the requirement on which node the memory should be allocated on. To avoid the SIGBUS we now use the memory policy MPOL_PREFERRED, which prefers a certain node, instead of MPOL_BIND, which requires a certain node. Reviewed-by: jmasa, pliden Contributed-by: stefan.johansson at oracle.com ! src/os/linux/vm/os_linux.cpp ! src/os/linux/vm/os_linux.hpp Changeset: 0d59407e7e09 Author: jmasa Date: 2013-08-29 06:53 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0d59407e7e09 Merge ! src/os/linux/vm/os_linux.cpp ! src/os/linux/vm/os_linux.hpp Changeset: 84683e78e713 Author: brutisso Date: 2013-08-30 07:31 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/84683e78e713 8019902: G1: Use the average heap size rather than the minimum heap size to calculate the region size Reviewed-by: tonyp, tschatzl, sjohanss ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/gc_implementation/g1/heapRegion.hpp Changeset: f175e3678be2 Author: ehelin Date: 2013-08-22 11:23 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f175e3678be2 8020692: TestGCEventMixed.java failed because of timestamp in event after end event Reviewed-by: mgerdin, stefank ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/shared/gcTraceSend.cpp Changeset: a701c16e8bbf Author: jmasa Date: 2013-09-04 11:41 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a701c16e8bbf 8013938: Native OOME on fastdebug VM on Solaris Reviewed-by: azeemj, brutisso, kvn, tschatzl ! src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp Changeset: 428025878417 Author: jmasa Date: 2013-09-04 12:56 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/428025878417 Merge Changeset: bb57d48691f5 Author: tschatzl Date: 2013-09-05 14:15 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/bb57d48691f5 Merge ! src/os/linux/vm/os_linux.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp Changeset: 50794d8ac11c Author: amurillo Date: 2013-09-06 11:04 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/50794d8ac11c Merge - src/share/vm/classfile/genericSignatures.cpp - src/share/vm/classfile/genericSignatures.hpp Changeset: 5b7f90aab3ad Author: amurillo Date: 2013-09-06 11:04 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5b7f90aab3ad Added tag hs25-b49 for changeset 50794d8ac11c ! .hgtags Changeset: 9cd0183fe325 Author: cl Date: 2013-09-12 11:08 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9cd0183fe325 Added tag jdk8-b107 for changeset 5b7f90aab3ad ! .hgtags Changeset: 313b724f8911 Author: amurillo Date: 2013-09-06 11:11 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/313b724f8911 8024258: new hotspot build - hs25-b50 Reviewed-by: jcoomes ! make/hotspot_version Changeset: ceda33ff54a3 Author: iignatyev Date: 2013-09-05 16:38 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ceda33ff54a3 8012447: Java CTW implementation Reviewed-by: vlivanov, kvn, twisti ! test/gc/TestVerifyDuringStartup.java ! test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java + test/testlibrary/ctw/Makefile + test/testlibrary/ctw/README + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java + test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java + test/testlibrary/ctw/test/Bar.java + test/testlibrary/ctw/test/ClassesDirTest.java + test/testlibrary/ctw/test/ClassesListTest.java + test/testlibrary/ctw/test/CtwTest.java + test/testlibrary/ctw/test/Foo.java + test/testlibrary/ctw/test/JarDirTest.java + test/testlibrary/ctw/test/JarsTest.java + test/testlibrary/ctw/test/classes.lst + test/testlibrary/whitebox/Makefile Changeset: cd16d587b0fa Author: adlertz Date: 2013-09-09 19:53 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cd16d587b0fa Merge Changeset: 72a567cce06f Author: anoll Date: 2013-09-10 07:51 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/72a567cce06f 8024473: Remove unused macro: IRT_ENTRY_FOR_NMETHOD Summary: Removed unused macro Reviewed-by: kvn, adlertz ! src/share/vm/runtime/interfaceSupport.hpp Changeset: edb5ab0f3fe5 Author: vlivanov Date: 2013-09-10 14:51 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/edb5ab0f3fe5 8001107: @Stable annotation for constant folding of lazily evaluated variables Reviewed-by: rbackman, twisti, kvn Contributed-by: john.r.rose at oracle.com, vladimir.x.ivanov at oracle.com ! src/share/vm/ci/ciArray.cpp ! src/share/vm/ci/ciArray.hpp ! src/share/vm/ci/ciConstant.hpp ! src/share/vm/ci/ciField.cpp ! src/share/vm/ci/ciField.hpp ! src/share/vm/ci/ciFlags.hpp ! src/share/vm/ci/ciInstance.cpp ! src/share/vm/ci/ciTypeArray.cpp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/classFileParser.hpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/oops/fieldInfo.hpp ! src/share/vm/opto/c2_globals.hpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/compile.hpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/memnode.cpp ! src/share/vm/opto/parse.hpp ! src/share/vm/opto/parse3.cpp ! src/share/vm/opto/type.cpp ! src/share/vm/opto/type.hpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/utilities/accessFlags.hpp Changeset: e0d33d2ce5aa Author: vlivanov Date: 2013-09-10 15:28 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e0d33d2ce5aa Merge Changeset: 34bd5e86aadb Author: adlertz Date: 2013-09-11 09:34 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/34bd5e86aadb 8010941: MinJumpTableSize is set to 18, investigate if that's still optimal Summary: Lowered the MinJumpTableSize for each platform Reviewed-by: kvn ! src/cpu/sparc/vm/c2_globals_sparc.hpp ! src/cpu/x86/vm/c2_globals_x86.hpp ! src/share/vm/opto/c2_globals.hpp Changeset: 0821b5d72ca8 Author: adlertz Date: 2013-09-12 09:10 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0821b5d72ca8 Merge Changeset: a09fe9d1e016 Author: amurillo Date: 2013-09-13 00:25 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a09fe9d1e016 Merge Changeset: 85072013aad4 Author: amurillo Date: 2013-09-13 00:25 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/85072013aad4 Added tag hs25-b50 for changeset a09fe9d1e016 ! .hgtags Changeset: 34aa07e92d22 Author: cl Date: 2013-09-19 09:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/34aa07e92d22 Added tag jdk8-b108 for changeset 85072013aad4 ! .hgtags Changeset: d9a14278235e Author: wmdietl Date: 2013-09-23 16:44 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d9a14278235e Automated merge with http://hg.openjdk.java.net/jdk8/tl/hotspot ! .hgtags From wdietl at gmail.com Mon Sep 23 17:23:55 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 24 Sep 2013 00:23:55 +0000 Subject: hg: type-annotations/type-annotations/langtools: Fix up javadoc @see annotations; contributed by Mike Ernst. Message-ID: <20130924002400.45B6F62A70@hg.openjdk.java.net> Changeset: 036d175879ff Author: wmdietl Date: 2013-09-23 17:22 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/036d175879ff Fix up javadoc @see annotations; contributed by Mike Ernst. ! src/share/classes/javax/lang/model/AnnotatedConstruct.java From wdietl at gmail.com Mon Sep 23 17:34:30 2013 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 23 Sep 2013 17:34:30 -0700 Subject: redundant cast test LintCast.java failing In-Reply-To: <5240949C.4070606@oracle.com> References: <52409302.7000906@oracle.com> <5240949C.4070606@oracle.com> Message-ID: <5240DE16.4020002@gmail.com> Steve, Jon, all, I think the current output in type-annotations LintCast.out is correct. The previous output contained type annotations in the error messages, which I don't think were expected. Also, the type annotations were not consistently included - for some errors they showed up, but not for all. However, the type-annotations test passes for me - I've changed the impl and the expected output and get consistent results. Jon, I agree that a pure refactoring shouldn't require changes in test cases. However, I do think this change is desired. We should double check which behavior seems more desirable and then fix the output for the test case. Steve, can you give more details about which version is failing? I can't reproduce it in type-annotations. cu, WMD. On 09/23/2013 12:21 PM, Jonathan Gibbons wrote: > On 09/23/2013 12:14 PM, Steve Sides wrote: >> Hi Werner, >> I also noticed a recent change removed an '@A' from the expected >> output of the test >> test/tools/javac/annotations/typeAnnotation/failures/LintCast.java >> and the test now fails. >> >> The test case in LintCast.java is >> >> void array() { >> int @A [] a = null; >> int[] a1 = (int[])a; //this line is the one in question >> int[] a2 = (int @A [])a; >> } >> >> This casts 'int @A[]'a to 'int[]'. The expected was changed to: >> >> LintCast.java:27:20: compiler.warn.redundant.cast: int[] >> >> which removed the @A. The warning text is more explicit than the >> diagnostic key and states, >> >> Xlint:cast Test.java >> Test.java:13: warning: [cast] redundant cast to int @A [] >> int[] a1 = (int[])a; >> ^ >> 1 warning >> >> Was the change to the out file expected? I makes more sense, but was >> it expected? >> >> -steve > > Steve, > > Thanks for the detail you provide here. > > I raised this issue with Werner in my review of a recent changeset last > week. > > Looking at the details you provide, it does seem that the change is > correct: after all, there is no annotation on the statement in question, > and so it seems like it was an error that it appears in the diagnostic. > > -- jon > > From steve.sides at oracle.com Mon Sep 23 17:42:26 2013 From: steve.sides at oracle.com (Steve Sides) Date: Mon, 23 Sep 2013 17:42:26 -0700 Subject: redundant cast test LintCast.java failing In-Reply-To: <5240DE16.4020002@gmail.com> References: <52409302.7000906@oracle.com> <5240949C.4070606@oracle.com> <5240DE16.4020002@gmail.com> Message-ID: <5240DFF2.5020002@oracle.com> Well, that is a little odd. I do not see this in nightly testing,but I used a copy of the lastest nightly build openjdk version "1.8.0-ea" OpenJDK Runtime Environment (build 1.8.0-ea-jsr308-nightly-h286-20130923-b109-b00) OpenJDK Server VM (build 25.0-b48, mixed mode) and it failed there. I will wipe it clean and retest it and get back to you. -steve On 9/23/2013 5:34 PM, Werner Dietl wrote: > Steve, Jon, all, > > I think the current output in type-annotations LintCast.out is correct. > The previous output contained type annotations in the error messages, > which I don't think were expected. Also, the type annotations were not > consistently included - for some errors they showed up, but not for all. > > However, the type-annotations test passes for me - I've changed the impl > and the expected output and get consistent results. > > Jon, I agree that a pure refactoring shouldn't require changes in test > cases. However, I do think this change is desired. We should double > check which behavior seems more desirable and then fix the output for > the test case. > > Steve, can you give more details about which version is failing? I can't > reproduce it in type-annotations. > > cu, WMD. > > > On 09/23/2013 12:21 PM, Jonathan Gibbons wrote: >> On 09/23/2013 12:14 PM, Steve Sides wrote: >>> Hi Werner, >>> I also noticed a recent change removed an '@A' from the expected >>> output of the test >>> test/tools/javac/annotations/typeAnnotation/failures/LintCast.java >>> and the test now fails. >>> >>> The test case in LintCast.java is >>> >>> void array() { >>> int @A [] a = null; >>> int[] a1 = (int[])a; //this line is the one in question >>> int[] a2 = (int @A [])a; >>> } >>> >>> This casts 'int @A[]'a to 'int[]'. The expected was changed to: >>> >>> LintCast.java:27:20: compiler.warn.redundant.cast: int[] >>> >>> which removed the @A. The warning text is more explicit than the >>> diagnostic key and states, >>> >>> Xlint:cast Test.java >>> Test.java:13: warning: [cast] redundant cast to int @A [] >>> int[] a1 = (int[])a; >>> ^ >>> 1 warning >>> >>> Was the change to the out file expected? I makes more sense, but was >>> it expected? >>> >>> -steve >> Steve, >> >> Thanks for the detail you provide here. >> >> I raised this issue with Werner in my review of a recent changeset last >> week. >> >> Looking at the details you provide, it does seem that the change is >> correct: after all, there is no annotation on the statement in question, >> and so it seems like it was an error that it appears in the diagnostic. >> >> -- jon >> >> From jonathan.gibbons at oracle.com Mon Sep 23 17:59:58 2013 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 23 Sep 2013 17:59:58 -0700 Subject: redundant cast test LintCast.java failing In-Reply-To: <5240DE16.4020002@gmail.com> References: <52409302.7000906@oracle.com> <5240949C.4070606@oracle.com> <5240DE16.4020002@gmail.com> Message-ID: <5240E40E.2070804@oracle.com> On 09/23/2013 05:34 PM, Werner Dietl wrote: > Jon, I agree that a pure refactoring shouldn't require changes in test > cases. However, I do think this change is desired. We should double > check which behavior seems more desirable and then fix the output for > the test case. Agreed, if refactoring fixes latent issues, the issues should be fixed. -- Jon From steve.sides at oracle.com Mon Sep 23 18:05:57 2013 From: steve.sides at oracle.com (Steve Sides) Date: Mon, 23 Sep 2013 18:05:57 -0700 Subject: redundant cast test LintCast.java failing In-Reply-To: <5240DE16.4020002@gmail.com> References: <52409302.7000906@oracle.com> <5240949C.4070606@oracle.com> <5240DE16.4020002@gmail.com> Message-ID: <5240E575.7000006@oracle.com> On 9/23/2013 5:34 PM, Werner Dietl wrote: > Steve, can you give more details about which version is failing? I can't > reproduce it in type-annotations. You can't reproduce it because you updated your LintCast.out file. :) It's not failing in nightly testing, but in my version of the repo from last Friday. That's why I asked if it was intentional. Before updating everything, I thought I'd ask about the change. I think it's a good change..just asking. -steve > > cu, WMD. > > > On 09/23/2013 12:21 PM, Jonathan Gibbons wrote: >> On 09/23/2013 12:14 PM, Steve Sides wrote: >>> Hi Werner, >>> I also noticed a recent change removed an '@A' from the expected >>> output of the test >>> test/tools/javac/annotations/typeAnnotation/failures/LintCast.java >>> and the test now fails. >>> >>> The test case in LintCast.java is >>> >>> void array() { >>> int @A [] a = null; >>> int[] a1 = (int[])a; //this line is the one in question >>> int[] a2 = (int @A [])a; >>> } >>> >>> This casts 'int @A[]'a to 'int[]'. The expected was changed to: >>> >>> LintCast.java:27:20: compiler.warn.redundant.cast: int[] >>> >>> which removed the @A. The warning text is more explicit than the >>> diagnostic key and states, >>> >>> Xlint:cast Test.java >>> Test.java:13: warning: [cast] redundant cast to int @A [] >>> int[] a1 = (int[])a; >>> ^ >>> 1 warning >>> >>> Was the change to the out file expected? I makes more sense, but was >>> it expected? >>> >>> -steve >> Steve, >> >> Thanks for the detail you provide here. >> >> I raised this issue with Werner in my review of a recent changeset last >> week. >> >> Looking at the details you provide, it does seem that the change is >> correct: after all, there is no annotation on the statement in question, >> and so it seems like it was an error that it appears in the diagnostic. >> >> -- jon >> >> From wdietl at gmail.com Fri Sep 27 11:46:53 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Fri, 27 Sep 2013 18:46:53 +0000 Subject: hg: type-annotations/type-annotations/jdk: 11 new changesets Message-ID: <20130927185025.1EA1D62BA2@hg.openjdk.java.net> Changeset: b606775fd1a3 Author: stefank Date: 2013-08-29 11:08 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b606775fd1a3 8014659: NPG: performance counters for compressed klass space Reviewed-by: jmasa, sla Contributed-by: erik.helin at oracle.com ! 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/lineCounts1.awk ! test/sun/tools/jstat/lineCounts2.awk ! test/sun/tools/jstat/lineCounts3.awk ! test/sun/tools/jstat/lineCounts4.awk ! test/sun/tools/jstat/timeStamp1.awk ! test/sun/tools/jstatd/jstatGcutilOutput1.awk Changeset: 76619d71a7c5 Author: dfuchs Date: 2013-09-25 09:47 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/76619d71a7c5 8025140: TEST_BUG: java/util/logging/Logger/getGlobal tests fail due to timeout Summary: Arbitrary timeouts in the tests @run lines where too agressive for some configurations. The tests will now run with default timeout. Reviewed-by: alanb, mchung ! test/java/util/logging/Logger/getGlobal/TestGetGlobal.java ! test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java ! test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java Changeset: 2b928330970a Author: mfang Date: 2013-09-24 14:17 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2b928330970a 8025215: jdk8 l10n resource file translation update 4 Reviewed-by: naoto, yhuang ! src/macosx/classes/com/apple/laf/resources/aqua_ko.properties ! src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties ! src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties ! src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties ! src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties ! src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties ! src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties ! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties ! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties + src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java + src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java ! src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties ! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties ! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties ! src/share/classes/sun/applet/resources/MsgAppletViewer_de.java ! src/share/classes/sun/launcher/resources/launcher_de.properties ! src/share/classes/sun/launcher/resources/launcher_es.properties ! src/share/classes/sun/launcher/resources/launcher_fr.properties ! src/share/classes/sun/launcher/resources/launcher_it.properties ! src/share/classes/sun/launcher/resources/launcher_ja.properties ! src/share/classes/sun/launcher/resources/launcher_ko.properties ! src/share/classes/sun/launcher/resources/launcher_pt_BR.properties ! src/share/classes/sun/launcher/resources/launcher_sv.properties ! src/share/classes/sun/launcher/resources/launcher_zh_CN.properties ! src/share/classes/sun/launcher/resources/launcher_zh_TW.properties ! src/share/classes/sun/print/resources/serviceui_de.properties ! src/share/classes/sun/print/resources/serviceui_es.properties ! src/share/classes/sun/print/resources/serviceui_fr.properties ! src/share/classes/sun/print/resources/serviceui_it.properties ! src/share/classes/sun/print/resources/serviceui_pt_BR.properties ! src/share/classes/sun/print/resources/serviceui_sv.properties ! src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties ! src/share/classes/sun/rmi/server/resources/rmid_ko.properties ! src/share/classes/sun/security/tools/jarsigner/Resources_ja.java ! src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java ! src/share/classes/sun/security/tools/keytool/Resources_de.java ! src/share/classes/sun/security/tools/keytool/Resources_es.java ! src/share/classes/sun/security/tools/keytool/Resources_fr.java ! src/share/classes/sun/security/tools/keytool/Resources_it.java ! src/share/classes/sun/security/tools/keytool/Resources_ja.java ! src/share/classes/sun/security/tools/keytool/Resources_ko.java ! src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java ! src/share/classes/sun/security/tools/keytool/Resources_sv.java ! src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java ! src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java ! src/share/classes/sun/security/tools/policytool/Resources_de.java ! src/share/classes/sun/security/tools/policytool/Resources_es.java ! src/share/classes/sun/security/tools/policytool/Resources_fr.java ! src/share/classes/sun/security/tools/policytool/Resources_it.java ! src/share/classes/sun/security/tools/policytool/Resources_ja.java ! src/share/classes/sun/security/tools/policytool/Resources_ko.java ! src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java ! src/share/classes/sun/security/tools/policytool/Resources_sv.java ! src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java ! src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java ! src/share/classes/sun/security/util/Resources_fr.java ! src/share/classes/sun/tools/jar/resources/jar_de.properties ! src/share/classes/sun/tools/jar/resources/jar_es.properties ! src/share/classes/sun/tools/jar/resources/jar_fr.properties ! src/share/classes/sun/tools/jar/resources/jar_it.properties ! src/share/classes/sun/tools/jar/resources/jar_ja.properties ! src/share/classes/sun/tools/jar/resources/jar_ko.properties ! src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties ! src/share/classes/sun/tools/jar/resources/jar_sv.properties ! src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties ! src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties ! src/share/classes/sun/tools/jconsole/resources/messages_ja.properties ! src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Changeset: 9765801f209f Author: mfang Date: 2013-09-24 14:34 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9765801f209f Merge - test/java/util/regex/PatternTest.java Changeset: d16a53d1762f Author: mfang Date: 2013-09-25 07:36 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d16a53d1762f Merge Changeset: 8f27030686a6 Author: bchristi Date: 2013-09-26 11:13 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/8f27030686a6 8025173: HashMap.put() replacing an existing key can trigger a resize() Summary: Ensure that HashMap is not resized if we're just replacing a value Reviewed-by: alanb, martin ! src/share/classes/java/util/HashMap.java + test/java/util/HashMap/ReplaceExisting.java Changeset: 78b4dc33e6e6 Author: twisti Date: 2013-09-26 18:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/78b4dc33e6e6 8019192: StringIndexOutOfBoundsException: in Class.getSimpleName() Reviewed-by: jrose ! src/share/classes/java/lang/invoke/MemberName.java Changeset: eb2c81533876 Author: weijun Date: 2013-09-27 15:25 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/eb2c81533876 8024861: Incomplete token triggers GSS-API NullPointerException Reviewed-by: mullan ! src/share/classes/sun/security/jgss/spnego/SpNegoContext.java + test/sun/security/jgss/spnego/MechTokenMissing.java Changeset: 95f609fcb639 Author: ehelin Date: 2013-09-26 16:23 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/95f609fcb639 8025502: Exclude tests due to JDK-8025427 Reviewed-by: ksrini ! test/ProblemList.txt Changeset: 914f8d4570df Author: mduigou Date: 2013-09-27 10:21 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/914f8d4570df 8025595: Remove alt-rt.jar, used by +AggressiveOps (jdk repo portion of JDK-8024826) Reviewed-by: alanb, chegar, dholmes, ksrini ! makefiles/CompileJavaClasses.gmk ! makefiles/CreateJars.gmk ! makefiles/Profiles.gmk ! makefiles/profile-includes.txt ! test/java/util/TreeMap/Clone.java Changeset: 4085cfa33507 Author: wmdietl Date: 2013-09-27 11:46 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4085cfa33507 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From wdietl at gmail.com Fri Sep 27 14:43:52 2013 From: wdietl at gmail.com (wdietl at gmail.com) Date: Fri, 27 Sep 2013 21:43:52 +0000 Subject: hg: type-annotations/type-annotations/nashorn: 6 new changesets Message-ID: <20130927214401.A00B962BAC@hg.openjdk.java.net> Changeset: c5475f5d4647 Author: sundar Date: 2013-09-24 20:43 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/c5475f5d4647 8025312: parseInt should convert 'radix' argument to ToInt32 even if empty string is parsed Reviewed-by: jlaskey, hannesw ! src/jdk/nashorn/internal/runtime/GlobalFunctions.java + test/script/basic/JDK-8025312.js + test/script/basic/JDK-8025312.js.EXPECTED Changeset: 754ecd62bde3 Author: sundar Date: 2013-09-25 08:17 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/754ecd62bde3 8025325: parseFloat does not handle '.' in exponent part Reviewed-by: hannesw ! src/jdk/nashorn/internal/runtime/GlobalFunctions.java + test/script/basic/JDK-8025325.js + test/script/basic/JDK-8025325.js.EXPECTED Changeset: 2f8f99e5ed76 Author: hannesw Date: 2013-09-25 16:37 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/2f8f99e5ed76 8025434: RegExp lastIndex can exceed int range Reviewed-by: lagergren, sundar ! src/jdk/nashorn/internal/objects/NativeRegExp.java + test/script/basic/JDK-8025434.js Changeset: 712f5e31739b Author: hannesw Date: 2013-09-26 10:14 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/712f5e31739b 8025197: String replace method fails with regexp /$/gi Reviewed-by: sundar ! src/jdk/nashorn/internal/objects/NativeRegExp.java + test/script/basic/JDK-8025197.js + test/script/basic/JDK-8025197.js.EXPECTED Changeset: 23958764f866 Author: hannesw Date: 2013-09-26 11:47 +0200 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/23958764f866 8025486: RegExp constructor arguments are not evaluated in right order Reviewed-by: sundar ! src/jdk/nashorn/internal/objects/NativeRegExp.java + test/script/basic/JDK-8025486.js + test/script/basic/JDK-8025486.js.EXPECTED Changeset: f1f027907a69 Author: sundar Date: 2013-09-26 16:37 +0530 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/f1f027907a69 Merge