From wdietl at gmail.com Sat Dec 1 15:23:00 2012 From: wdietl at gmail.com (Werner Dietl) Date: Sat, 1 Dec 2012 15:23:00 -0800 Subject: Problem with when type annotation positions are determined Message-ID: Joel, Jon, all, the trunk version of type-annotations passes the jtreg tests and also the Checker Framework tests. However, some uses of the compiler failed and I finally managed to produce a minimal test case. This problem is caused by the changes I made to when the type annotation positions for different annotations is determined, i.e. where we call com.sun.tools.javac.code.TypeAnnotations.completeTypeAnnotationsInSignatures in Enter/MemberEnter/Attr. Previous versions (e.g. the code that is still in jsr308-langtools) did not have this problem. To reproduce: 1. tar -xvzf annobug.tar.gz 2. cd annobug 3. type-annotations-build-dir/bin/javac -cp . Main.java For me, this results in a stack trace that begins with: java.lang.NullPointerException at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.setTypeAnnotationPos(TypeAnnotations.java:789) at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.findPosition(TypeAnnotations.java:862) at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.visitAnnotatedType(TypeAnnotations.java:839) at com.sun.tools.javac.tree.JCTree$JCAnnotatedType.accept(JCTree.java:2304) at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:57) at com.sun.tools.javac.tree.TreeScanner.visitClassDef(TreeScanner.java:80) at com.sun.tools.javac.tree.JCTree$JCClassDecl.accept(JCTree.java:648) at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:57) at com.sun.tools.javac.tree.TreeScanner.visitTopLevel(TreeScanner.java:68) at com.sun.tools.javac.tree.JCTree$JCCompilationUnit.accept(JCTree.java:517) at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) at com.sun.tools.javac.code.TypeAnnotations.completeTypeAnnotationsInSignatures(TypeAnnotations.java:87) at com.sun.tools.javac.comp.Enter.complete(Enter.java:514) at com.sun.tools.javac.main.JavaCompiler.complete(JavaCompiler.java:791) at com.sun.tools.javac.jvm.ClassReader.fillIn(ClassReader.java:2425) at com.sun.tools.javac.jvm.ClassReader.complete(ClassReader.java:2332) at com.sun.tools.javac.code.Symbol.complete(Symbol.java:426) at com.sun.tools.javac.code.Symbol$ClassSymbol.complete(Symbol.java:834) at com.sun.tools.javac.jvm.ClassReader.loadClass(ClassReader.java:2513) Note that if the classes are compiled together, no problem arises, i.e. javac *.java works as expected. Also, compiling the classes in the right sequence works: javac -cp . Anno.java javac -cp . Dep.java javac -cp . Main.java In the invocation that gives an exception we're trying to determine the position for an annotation that doesn't have its TypeCompound set yet. I failed at tracking down why the TypeCompound is set when invoked with all classes, but not when invoked with just one. Ideas? Thanks, cu, WMD. -- http://www.google.com/profiles/wdietl -------------- next part -------------- A non-text attachment was scrubbed... Name: annobug.tar.gz Type: application/x-gzip Size: 337 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20121201/dde2c4ee/annobug.tar.gz From wdietl at gmail.com Mon Dec 3 01:00:56 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:00:56 +0000 Subject: hg: type-annotations/type-annotations/langtools: 16 new changesets Message-ID: <20121203090142.A1B4247CC8@hg.openjdk.java.net> Changeset: e4c9e2831188 Author: wmdietl Date: 2012-11-25 00:16 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e4c9e2831188 Fix output of receiver parameter. ! src/share/classes/com/sun/tools/javac/tree/Pretty.java Changeset: 31f42962be9f Author: wmdietl Date: 2012-11-25 00:17 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/31f42962be9f Fix typo in comment. ! src/share/classes/com/sun/tools/javac/util/Log.java Changeset: 4d68e2a05b50 Author: jjg Date: 2012-11-27 13:55 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4d68e2a05b50 8004068: Fix build problems caused by on-demand imports Reviewed-by: jjg Contributed-by: eric.caspole at amd.com ! src/share/classes/com/sun/tools/javac/code/Types.java Changeset: 1f41a5758cf7 Author: vromero Date: 2012-11-23 15:13 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/1f41a5758cf7 7144981: javac should ignore ignorable characters in input Reviewed-by: jjg, mcimadamore ! src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java + test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java Changeset: 969c96b980b7 Author: vromero Date: 2012-11-29 09:41 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/969c96b980b7 7153958: add constant pool reference to class containing inlined constants Reviewed-by: jjg, mcimadamore ! src/share/classes/com/sun/tools/javac/comp/Lower.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java + test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java + test/tools/javac/7153958/pkg/ClassToBeStaticallyImported.java Changeset: 4f9853659bf1 Author: mcimadamore Date: 2012-11-30 15:14 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4f9853659bf1 8004105: Expression statement lambdas should be void-compatible Summary: Fix lambda compatibility rules as per latest EDR Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java ! test/tools/javac/lambda/LambdaConv21.java ! test/tools/javac/lambda/LambdaConv21.out ! test/tools/javac/lambda/VoidCompatibility.out Changeset: 34d1ebaf4645 Author: mcimadamore Date: 2012-11-30 15:14 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/34d1ebaf4645 8004102: Add support for generic functional descriptors Summary: Method references are allowed to have a generic functional interface descriptor target Reviewed-by: jjg ! 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/resources/compiler.properties - test/tools/javac/diags/examples/InvalidGenericDescInFunctionalInterface.java + test/tools/javac/diags/examples/InvalidGenericLambdaTarget.java + test/tools/javac/lambda/FunctionalInterfaceConversionTest.java - test/tools/javac/lambda/LambdaConversionTest.java + test/tools/javac/lambda/MethodReference57.java + test/tools/javac/lambda/MethodReference58.java + test/tools/javac/lambda/MethodReference58.out Changeset: 9b26c96f5138 Author: mcimadamore Date: 2012-11-30 15:14 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9b26c96f5138 8004101: Add checks for method reference well-formedness Summary: Bring method reference type-checking in sync with latest EDR Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.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 + test/tools/javac/diags/examples/StaticBoundMref.java + test/tools/javac/diags/examples/StaticMrefWithTargs.java ! test/tools/javac/lambda/MethodReference30.java + test/tools/javac/lambda/MethodReference55.java + test/tools/javac/lambda/MethodReference55.out + test/tools/javac/lambda/MethodReference56.java + test/tools/javac/lambda/MethodReference56.out ! test/tools/javac/lambda/methodReference/MethodRef1.java ! test/tools/javac/lambda/methodReference/SamConversion.java ! test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java Changeset: f6f1fd261f57 Author: mcimadamore Date: 2012-11-30 15:14 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f6f1fd261f57 8002099: Add support for intersection types in cast expression Summary: Add parser and type-checking support for intersection types in cast expressions Reviewed-by: jjg + src/share/classes/com/sun/source/tree/IntersectionTypeTree.java ! src/share/classes/com/sun/source/tree/Tree.java ! src/share/classes/com/sun/source/tree/TreeVisitor.java ! src/share/classes/com/sun/source/util/SimpleTreeVisitor.java ! src/share/classes/com/sun/source/util/TreeScanner.java ! src/share/classes/com/sun/tools/javac/code/Source.java ! 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/comp/Attr.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/model/JavacTypes.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.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/tree/Pretty.java ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java ! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java ! src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java + src/share/classes/javax/lang/model/type/IntersectionType.java ! src/share/classes/javax/lang/model/type/TypeKind.java ! src/share/classes/javax/lang/model/type/TypeVisitor.java ! src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java ! src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java + test/tools/javac/cast/intersection/IntersectionTypeCastTest.java + test/tools/javac/cast/intersection/IntersectionTypeParserTest.java + test/tools/javac/cast/intersection/model/Check.java + test/tools/javac/cast/intersection/model/IntersectionTypeInfo.java + test/tools/javac/cast/intersection/model/Member.java + test/tools/javac/cast/intersection/model/Model01.java + test/tools/javac/cast/intersection/model/ModelChecker.java + test/tools/javac/diags/examples/IntersectionTypesInCastNotSupported.java + test/tools/javac/diags/examples/SecondaryBoundMustBeMarkerIntf.java + test/tools/javac/lambda/Intersection01.java + test/tools/javac/lambda/Intersection01.out ! test/tools/javac/lambda/LambdaParserTest.java + test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java Changeset: 09ba1bfab344 Author: lana Date: 2012-11-20 11:50 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/09ba1bfab344 Merge - src/share/classes/com/sun/tools/javac/parser/SimpleDocCommentTable.java - test/tools/javac/defaultMethods/fd/FDTest.java - test/tools/javac/defaultMethods/fd/shapegen/ClassCase.java - test/tools/javac/defaultMethods/fd/shapegen/Hierarchy.java - test/tools/javac/defaultMethods/fd/shapegen/HierarchyGenerator.java - test/tools/javac/defaultMethods/fd/shapegen/Rule.java - test/tools/javac/defaultMethods/fd/shapegen/RuleGroup.java - test/tools/javac/defaultMethods/fd/shapegen/TTNode.java - test/tools/javac/defaultMethods/fd/shapegen/TTParser.java - test/tools/javac/defaultMethods/fd/shapegen/TTShape.java - test/tools/javac/diags/examples/CantAccessArgTypeInFunctionalDesc.java - test/tools/javac/diags/examples/CantAccessReturnTypeInFunctionalDesc.java - test/tools/javac/diags/examples/CantAccessThrownTypesInFunctionalDesc.java - test/tools/javac/diags/examples/CantReturnValueForVoid.java Changeset: da48ab364ea4 Author: erikj Date: 2012-11-28 13:37 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/da48ab364ea4 8003844: build-infra: docs target isn't working properly Summary: Adding resources to bootstrap javadoc.jar. Adding missing .js resource suffix Reviewed-by: ohair, jjg, ohrstrom ! makefiles/BuildLangtools.gmk Changeset: 20230f8b0eef Author: katleman Date: 2012-11-28 14:07 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/20230f8b0eef Merge Changeset: 303b09787a69 Author: katleman Date: 2012-11-29 11:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/303b09787a69 Added tag jdk8-b66 for changeset 20230f8b0eef ! .hgtags Changeset: 98e14fc9ee11 Author: lana Date: 2012-11-30 16:34 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/98e14fc9ee11 Merge Changeset: 2e6259729f33 Author: wmdietl Date: 2012-12-01 17:49 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2e6259729f33 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! .hgtags ! src/share/classes/com/sun/source/tree/Tree.java ! src/share/classes/com/sun/source/tree/TreeVisitor.java ! src/share/classes/com/sun/source/util/SimpleTreeVisitor.java ! src/share/classes/com/sun/source/util/TreeScanner.java ! src/share/classes/com/sun/tools/javac/code/Source.java ! 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/comp/Attr.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/Gen.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/resources/compiler.properties ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/tree/Pretty.java ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java ! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java ! src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out Changeset: dc3cd9c15b40 Author: wmdietl Date: 2012-12-01 18:40 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/dc3cd9c15b40 Fix small merge errors. ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java From wdietl at gmail.com Mon Dec 3 01:07:32 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:07:32 +0000 Subject: hg: type-annotations/type-annotations/corba: 3 new changesets Message-ID: <20121203090738.9CC4F47CCA@hg.openjdk.java.net> Changeset: 65771ad1ca55 Author: katleman Date: 2012-11-15 15:38 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/65771ad1ca55 Added tag jdk8-b65 for changeset 5132f7900a8f ! .hgtags Changeset: 394515ad2a55 Author: katleman Date: 2012-11-29 11:29 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/394515ad2a55 Added tag jdk8-b66 for changeset 65771ad1ca55 ! .hgtags Changeset: d6511ff54aec Author: wmdietl Date: 2012-12-01 18:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/d6511ff54aec Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba ! .hgtags From wdietl at gmail.com Mon Dec 3 01:06:51 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:06:51 +0000 Subject: hg: type-annotations/type-annotations/hotspot: 26 new changesets Message-ID: <20121203090758.84F5F47CCB@hg.openjdk.java.net> Changeset: 4e3e685dbc9d Author: katleman Date: 2012-11-15 15:39 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4e3e685dbc9d Added tag jdk8-b65 for changeset 0f7290a03b24 ! .hgtags Changeset: 3be318ecfae5 Author: amurillo Date: 2012-11-09 08:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3be318ecfae5 8003231: new hotspot build - hs25-b10 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 6cb0d32b828b Author: bpittore Date: 2012-11-07 17:53 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6cb0d32b828b 8001185: parsing of sun.boot.library.path in os::dll_build_name somewhat broken Summary: dll_dir can contain multiple paths, need to parse them correctly when loading agents Reviewed-by: dholmes, dlong Contributed-by: bill.pittore at oracle.com ! src/os/bsd/vm/os_bsd.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/classfile/classLoader.cpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/os.hpp ! src/share/vm/runtime/thread.cpp Changeset: d9a84e246cce Author: cjplummer Date: 2012-11-09 09:45 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d9a84e246cce Merge ! src/share/vm/runtime/thread.cpp Changeset: 429994fc0754 Author: cjplummer Date: 2012-11-14 10:13 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/429994fc0754 Merge Changeset: 6bc207d87e5d Author: mgerdin Date: 2012-11-09 00:38 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6bc207d87e5d 7200229: NPG: possible performance issue exposed by closed/runtime/6559877/Test6559877.java Summary: Reduce the amount of calls to ChunkManager verification code Reviewed-by: jmasa, coleenp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/metaspace.hpp ! src/share/vm/memory/universe.cpp Changeset: 0400886d2613 Author: coleenp Date: 2012-11-14 22:37 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0400886d2613 8003259: NPG: Build with gcc 4.7.2 broken by 7045397 Summary: Qualify calls with this pointers to make gcc accept this code. Reviewed-by: coleenp, andrew Contributed-by: peter.levart at gmail.com ! src/share/vm/memory/binaryTreeDictionary.cpp Changeset: c5d4acbb943d Author: johnc Date: 2012-11-15 14:29 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c5d4acbb943d Merge Changeset: bd7a7ce2e264 Author: minqi Date: 2012-11-12 14:03 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/bd7a7ce2e264 6830717: replay of compilations would help with debugging Summary: When java process crashed in compiler thread, repeat the compilation process will help finding root cause. This is done with using SA dump application class data and replay data from core dump, then use debug version of jvm to recompile the problematic java method. Reviewed-by: kvn, twisti, sspitsyn Contributed-by: yumin.qi at oracle.com + agent/doc/c2replay.html ! agent/doc/clhsdb.html ! agent/doc/index.html ! agent/make/Makefile ! agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java ! agent/src/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java ! agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java ! agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java ! agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java ! agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java ! agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java ! agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java ! agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java ! agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java ! agent/src/share/classes/sun/jvm/hotspot/oops/Field.java ! agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java ! agent/src/share/classes/sun/jvm/hotspot/oops/Metadata.java ! agent/src/share/classes/sun/jvm/hotspot/oops/Method.java ! agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java ! src/share/vm/ci/ciClassList.hpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciEnv.hpp ! src/share/vm/ci/ciInstanceKlass.cpp ! src/share/vm/ci/ciInstanceKlass.hpp ! src/share/vm/ci/ciMetadata.hpp ! src/share/vm/ci/ciMethod.cpp ! src/share/vm/ci/ciMethod.hpp ! src/share/vm/ci/ciMethodData.cpp ! src/share/vm/ci/ciMethodData.hpp ! src/share/vm/ci/ciObject.hpp ! src/share/vm/ci/ciObjectFactory.hpp + src/share/vm/ci/ciReplay.cpp + src/share/vm/ci/ciReplay.hpp ! src/share/vm/ci/ciSymbol.cpp ! src/share/vm/ci/ciSymbol.hpp ! src/share/vm/ci/ciUtilities.hpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/code/dependencies.cpp ! src/share/vm/interpreter/invocationCounter.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/oops/symbol.cpp ! src/share/vm/oops/symbol.hpp ! src/share/vm/opto/bytecodeInfo.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/prims/jvmtiExport.hpp ! src/share/vm/runtime/compilationPolicy.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/utilities/array.hpp ! src/share/vm/utilities/utf8.cpp ! src/share/vm/utilities/utf8.hpp ! src/share/vm/utilities/vmError.cpp Changeset: bb33c6fdcf0d Author: bharadwaj Date: 2012-11-15 10:42 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/bb33c6fdcf0d 8001077: remove ciMethod::will_link Summary: Removed will_link and changed all calls to is_loaded(). Reviewed-by: kvn ! src/share/vm/c1/c1_GraphBuilder.cpp ! src/share/vm/ci/bcEscapeAnalyzer.cpp ! src/share/vm/ci/ciMethod.cpp ! src/share/vm/ci/ciMethod.hpp ! src/share/vm/opto/doCall.cpp Changeset: 6b6ddf8c4329 Author: neliasso Date: 2012-11-16 09:59 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6b6ddf8c4329 Merge Changeset: 64812523d72e Author: sspitsyn Date: 2012-10-31 16:20 -0700 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/64812523d72e 7194607: VerifyLocalVariableTableOnRetransformTest.sh fails after JSR-292 merge Summary: Use verifier_max_size instead of max_size to get code attribute max stack size. Reviewed-by: dcubed, minqi Contributed-by: serguei.spitsyn at oracle.com ! src/share/vm/prims/jvmtiClassFileReconstituter.cpp Changeset: 8aaef2cee3b2 Author: minqi Date: 2012-11-08 16:48 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8aaef2cee3b2 Merge ! src/share/vm/prims/jvmtiClassFileReconstituter.cpp - test/runtime/7158800/BadUtf8.java - test/runtime/7158800/InternTest.java - test/runtime/7158800/Test7158800.sh - test/runtime/7158800/badstrings.txt Changeset: ed8b1e39ff4f Author: zgu Date: 2012-11-09 11:04 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ed8b1e39ff4f 8002273: NMT to report JNI memory leaks when -Xcheck:jni is on Summary: Allows NMT to report that JNI thread failed to detach from JVM before exiting, which leaks the JavaThread object when check:jni option is on. Reviewed-by: acorn, dholmes, coleenp, ctornqvi ! src/share/vm/services/memSnapshot.cpp Changeset: 4efcd79826f2 Author: zgu Date: 2012-11-09 11:47 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/4efcd79826f2 Merge Changeset: fb3190e77d3c Author: zgu Date: 2012-11-09 19:24 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/fb3190e77d3c 8001592: NMT: assertion failed: assert(_amount >= amt) failed: Just check: memBaseline.hpp:180 Summary: Fixed NMT that miscounted arena memory when it is used as value or stack object. Reviewed-by: acorn, coleenp ! src/share/vm/services/memBaseline.cpp ! src/share/vm/services/memPtr.hpp ! src/share/vm/services/memSnapshot.cpp ! src/share/vm/services/memSnapshot.hpp ! src/share/vm/services/memTracker.hpp Changeset: e26ce0e8b666 Author: zgu Date: 2012-11-09 16:45 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e26ce0e8b666 Merge Changeset: 8c413497f434 Author: zgu Date: 2012-11-09 22:22 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8c413497f434 Merge ! src/share/vm/services/memSnapshot.cpp Changeset: e4f764ddb06a Author: hseigel Date: 2012-11-12 15:58 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e4f764ddb06a 7122219: Passed StringTableSize value not verified Summary: Check that the values specified for -XX:StringTableSize are within a certain range. Reviewed-by: dholmes, coleenp ! src/share/vm/classfile/symbolTable.hpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/os.cpp ! src/share/vm/utilities/globalDefinitions.hpp Changeset: 070d523b96a7 Author: hseigel Date: 2012-11-12 16:15 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/070d523b96a7 8001471: Klass::cast() does nothing Summary: Remove function Klass::cast() and calls to it. Reviewed-by: dholmes, coleenp ! src/share/vm/c1/c1_Runtime1.cpp ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciType.cpp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/dictionary.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/loaderConstraints.cpp ! src/share/vm/classfile/placeholders.cpp ! src/share/vm/classfile/placeholders.hpp ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/code/dependencies.cpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/compiler/disassembler.cpp ! src/share/vm/interpreter/bytecodeInterpreter.cpp ! src/share/vm/interpreter/interpreterRuntime.cpp ! src/share/vm/interpreter/linkResolver.cpp ! src/share/vm/memory/metaspaceShared.cpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/arrayKlass.cpp ! src/share/vm/oops/cpCache.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/klass.cpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/klassVtable.cpp ! src/share/vm/oops/method.cpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/objArrayKlass.hpp ! src/share/vm/opto/runtime.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/prims/jniCheck.cpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/prims/jvmtiEnvBase.cpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/prims/jvmtiGetLoadedClasses.cpp ! src/share/vm/prims/jvmtiImpl.cpp ! src/share/vm/prims/jvmtiRedefineClasses.cpp ! src/share/vm/prims/jvmtiTagMap.cpp ! src/share/vm/prims/jvmtiTrace.cpp ! src/share/vm/prims/methodHandles.cpp ! src/share/vm/prims/nativeLookup.cpp ! src/share/vm/prims/unsafe.cpp ! src/share/vm/runtime/biasedLocking.cpp ! src/share/vm/runtime/reflection.cpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/signature.cpp ! src/share/vm/runtime/synchronizer.cpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/vframe.cpp ! src/share/vm/services/classLoadingService.hpp ! src/share/vm/services/heapDumper.cpp ! src/share/vm/services/management.cpp ! src/share/vm/services/serviceUtil.hpp Changeset: 24e193d2a007 Author: coleenp Date: 2012-11-13 15:14 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/24e193d2a007 Merge Changeset: 80e866b1d053 Author: coleenp Date: 2012-11-16 09:19 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/80e866b1d053 Merge ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/code/dependencies.cpp ! src/share/vm/interpreter/interpreterRuntime.cpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/cpCache.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/thread.cpp Changeset: cfc5309f03b7 Author: amurillo Date: 2012-11-16 09:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cfc5309f03b7 Merge Changeset: 01684f7fee1b Author: amurillo Date: 2012-11-16 09:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/01684f7fee1b Added tag hs25-b10 for changeset cfc5309f03b7 ! .hgtags Changeset: 2f6dc76eb8e5 Author: katleman Date: 2012-11-29 11:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2f6dc76eb8e5 Added tag jdk8-b66 for changeset 01684f7fee1b ! .hgtags Changeset: 9a1a4428944c Author: wmdietl Date: 2012-12-01 18:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/9a1a4428944c Automated merge with http://hg.openjdk.java.net/jdk8/tl/hotspot ! .hgtags From wdietl at gmail.com Mon Dec 3 01:08:16 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:08:16 +0000 Subject: hg: type-annotations/type-annotations/jaxws: 3 new changesets Message-ID: <20121203090827.7EC9A47CCC@hg.openjdk.java.net> Changeset: 3eb7f11cb4e0 Author: katleman Date: 2012-11-15 15:39 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/3eb7f11cb4e0 Added tag jdk8-b65 for changeset fbe54291c9d3 ! .hgtags Changeset: eb06aa51dfc2 Author: katleman Date: 2012-11-29 11:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/eb06aa51dfc2 Added tag jdk8-b66 for changeset 3eb7f11cb4e0 ! .hgtags Changeset: c32471537ad9 Author: wmdietl Date: 2012-12-01 18:44 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/c32471537ad9 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxws ! .hgtags From wdietl at gmail.com Mon Dec 3 01:09:10 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:09:10 +0000 Subject: hg: type-annotations/type-annotations/jaxp: 3 new changesets Message-ID: <20121203090927.41FE247CCF@hg.openjdk.java.net> Changeset: e6af1ad464e3 Author: katleman Date: 2012-11-15 15:39 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/e6af1ad464e3 Added tag jdk8-b65 for changeset 5cf3c69a93d6 ! .hgtags Changeset: 83df3493ca3c Author: katleman Date: 2012-11-29 11:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/83df3493ca3c Added tag jdk8-b66 for changeset e6af1ad464e3 ! .hgtags Changeset: aecc13fba2e8 Author: wmdietl Date: 2012-12-01 18:44 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/aecc13fba2e8 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxp ! .hgtags From wdietl at gmail.com Mon Dec 3 01:10:37 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:10:37 +0000 Subject: hg: type-annotations/type-annotations: 16 new changesets Message-ID: <20121203091039.43CF547CD0@hg.openjdk.java.net> Changeset: ab1ab9b148dd Author: smarks Date: 2012-11-28 17:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/ab1ab9b148dd 8004131: move jdi tests out of core testset Reviewed-by: alanb, chegar ! make/jprt.properties Changeset: 0e1b5886b06c Author: katleman Date: 2012-11-15 15:38 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/0e1b5886b06c Added tag jdk8-b65 for changeset b772de306dc2 ! .hgtags Changeset: a2df4ee40ecb Author: tbell Date: 2012-11-14 10:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/a2df4ee40ecb 8002026: build-infra: deploy repository building Summary: Change the compare script to handle deploy build artifacts. Reviewed-by: ohair, tbell Contributed-by: erik.joelsson at oracle.com ! common/bin/compare.sh ! common/bin/compare_exceptions.sh.incl Changeset: c81c4a5d8b50 Author: tbell Date: 2012-11-14 10:13 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/c81c4a5d8b50 8001875: build-infra: We must be able to force static linking of stdc++ Summary: Ensure that we build with static linking when requested, or do not build at all Reviewed-by: ohair, tbell Contributed-by: erik.joelsson at oracle.com ! common/autoconf/generated-configure.sh ! common/autoconf/libraries.m4 Changeset: 582c696033f5 Author: tbell Date: 2012-11-14 10:16 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/582c696033f5 8001941: build-infra: --disable-precompiled-headers does not seem to work Summary: With this fix the flag will do what it advertises Reviewed-by: ohair, tbell Contributed-by: erik.joelsson at oracle.com ! common/autoconf/build-performance.m4 ! common/autoconf/generated-configure.sh ! common/autoconf/hotspot-spec.gmk.in Changeset: f59a07f85125 Author: tbell Date: 2012-11-14 10:18 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/f59a07f85125 8003317: build-infra: Configure fails when current dir is part of a symlink Summary: Call macro for removing symbolic links on a copy of the CURDIR variable before comparing Reviewed-by: ohair, tbell Contributed-by: erik.joelsson at oracle.com ! common/autoconf/basics.m4 ! common/autoconf/generated-configure.sh Changeset: e69396d6d3e8 Author: tbell Date: 2012-11-14 10:20 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/e69396d6d3e8 8003327: build-infra: "/bin/sh: : cannot execute" on solaris Summary: Fix quoting inside cut command used in the pipeline Reviewed-by: ohair, tbell Contributed-by: erik.joelsson at oracle.com ! common/makefiles/MakeHelpers.gmk Changeset: 06f146c05f49 Author: tbell Date: 2012-11-15 00:54 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/06f146c05f49 Merge Changeset: ecf751a69f6a Author: tbell Date: 2012-11-19 14:06 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/ecf751a69f6a 8003300: build-infra: fails on solaris when objcopy is not found Summary: Only call BASIC_FIXUP_EXECUTABLE() if objcopy was found. Reviewed-by: tbell Contributed-by: erik.joelsson at oracle.com ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain.m4 Changeset: f8b0bacd4de5 Author: erikj Date: 2012-11-28 13:15 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/f8b0bacd4de5 8001460: build-infra: Linker warnings on macosx Summary: Only linking against jvm variant specific dirs if they are expected to exist. Reviewed-by: ohair ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain.m4 Changeset: 6ff2e1280dc3 Author: erikj Date: 2012-11-28 13:40 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/6ff2e1280dc3 8003844: build-infra: docs target isn't working properly Summary: Fixed docs and docs-clean target. Added compare support for docs. Reviewed-by: ohair, jjg, ohrstrom ! common/bin/compare.sh ! common/makefiles/Main.gmk ! common/makefiles/javadoc/Javadoc.gmk Changeset: 7d7dd520ebfd Author: erikj Date: 2012-11-28 13:48 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/7d7dd520ebfd 8003528: build-infra: Diffs in libjava and hotspot libs on solaris. Summary: Linking against server jvm first if available. Adding filters and exceptions for hotspot lib compare on solaris. Reviewed-by: ohair, ohrstrom ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain.m4 ! common/bin/compare_exceptions.sh.incl Changeset: 13bb8c326e7b Author: katleman Date: 2012-11-28 14:03 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/13bb8c326e7b Merge Changeset: 16292f54195c Author: katleman Date: 2012-11-29 11:29 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/16292f54195c Added tag jdk8-b66 for changeset 13bb8c326e7b ! .hgtags Changeset: ad54163c95f5 Author: lana Date: 2012-11-30 16:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/ad54163c95f5 Merge Changeset: 28f89b01bdff Author: wmdietl Date: 2012-12-01 18:45 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/28f89b01bdff Automated merge with http://hg.openjdk.java.net/jdk8/tl/ ! .hgtags From wdietl at gmail.com Mon Dec 3 01:03:47 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 03 Dec 2012 09:03:47 +0000 Subject: hg: type-annotations/type-annotations/jdk: 53 new changesets Message-ID: <20121203091504.5C85047CD2@hg.openjdk.java.net> Changeset: ee6e5b7d5d55 Author: uta Date: 2012-11-23 13:07 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ee6e5b7d5d55 8003898: X11 toolkit can be chosen as the default toolkit Summary: XToolkit is not selected for any values of system-wide environment variables (ex. DISPLAY). Reviewed-by: anthony, art ! src/solaris/native/java/lang/java_props_macosx.c Changeset: 621c379d909d Author: xuelei Date: 2012-11-24 03:34 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/621c379d909d 8001751: Javadoc warnings in JSSE code Reviewed-by: alanb ! src/share/classes/javax/net/ssl/HostnameVerifier.java ! src/share/classes/javax/net/ssl/SNIHostName.java ! src/share/classes/javax/net/ssl/SNIMatcher.java ! src/share/classes/javax/net/ssl/SNIServerName.java ! src/share/classes/javax/net/ssl/SSLParameters.java ! src/share/classes/javax/net/ssl/SSLSocketFactory.java Changeset: f7d45462b225 Author: xuelei Date: 2012-11-24 04:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f7d45462b225 8003950: Adds missing Override annotations and removes unnecessary imports in sun.security.ssl Reviewed-by: xuelei Contributed-by: Florian Weimer ! src/share/classes/sun/security/ssl/AppInputStream.java ! src/share/classes/sun/security/ssl/AppOutputStream.java ! src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java ! src/share/classes/sun/security/ssl/ByteBufferInputStream.java ! src/share/classes/sun/security/ssl/CipherBox.java ! src/share/classes/sun/security/ssl/CipherSuite.java ! src/share/classes/sun/security/ssl/CipherSuiteList.java ! src/share/classes/sun/security/ssl/ClientHandshaker.java ! src/share/classes/sun/security/ssl/DHClientKeyExchange.java ! src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java ! src/share/classes/sun/security/ssl/ECDHCrypt.java ! src/share/classes/sun/security/ssl/EngineInputRecord.java ! src/share/classes/sun/security/ssl/EngineOutputRecord.java ! src/share/classes/sun/security/ssl/EngineWriter.java ! src/share/classes/sun/security/ssl/ExtensionType.java ! src/share/classes/sun/security/ssl/HandshakeHash.java ! src/share/classes/sun/security/ssl/HandshakeInStream.java ! src/share/classes/sun/security/ssl/HandshakeMessage.java ! src/share/classes/sun/security/ssl/HandshakeOutStream.java ! src/share/classes/sun/security/ssl/Handshaker.java ! src/share/classes/sun/security/ssl/HelloExtension.java ! src/share/classes/sun/security/ssl/HelloExtensions.java ! src/share/classes/sun/security/ssl/InputRecord.java ! src/share/classes/sun/security/ssl/JsseJce.java ! src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java ! src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java ! src/share/classes/sun/security/ssl/Krb5Helper.java ! src/share/classes/sun/security/ssl/OutputRecord.java ! src/share/classes/sun/security/ssl/ProtocolList.java ! src/share/classes/sun/security/ssl/ProtocolVersion.java ! src/share/classes/sun/security/ssl/RSAClientKeyExchange.java ! src/share/classes/sun/security/ssl/RSASignature.java ! src/share/classes/sun/security/ssl/RenegotiationInfoExtension.java ! src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java ! src/share/classes/sun/security/ssl/SSLContextImpl.java ! src/share/classes/sun/security/ssl/SSLEngineImpl.java ! src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java ! src/share/classes/sun/security/ssl/SSLServerSocketImpl.java ! src/share/classes/sun/security/ssl/SSLSessionContextImpl.java ! src/share/classes/sun/security/ssl/SSLSessionImpl.java ! src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java ! src/share/classes/sun/security/ssl/SSLSocketImpl.java ! src/share/classes/sun/security/ssl/ServerHandshaker.java ! src/share/classes/sun/security/ssl/ServerNameExtension.java ! src/share/classes/sun/security/ssl/SessionId.java ! src/share/classes/sun/security/ssl/SunJSSE.java ! src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java ! src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java ! src/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java ! src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ! src/share/classes/sun/security/ssl/UnknownExtension.java ! src/share/classes/sun/security/ssl/X509KeyManagerImpl.java ! src/share/classes/sun/security/ssl/X509TrustManagerImpl.java Changeset: d30c13172254 Author: xuelei Date: 2012-11-24 04:27 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d30c13172254 8003951: Removes unused variables in sun.security.ssl Reviewed-by: xuelei Contributed-by: Florian Weimer ! src/share/classes/sun/security/ssl/HandshakeMessage.java ! src/share/classes/sun/security/ssl/JsseJce.java ! src/share/classes/sun/security/ssl/SSLServerSocketImpl.java ! src/share/classes/sun/security/ssl/SSLSessionContextImpl.java ! src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java ! src/share/classes/sun/security/ssl/X509TrustManagerImpl.java Changeset: 8970128e040d Author: uta Date: 2012-11-26 15:54 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/8970128e040d 7162111: TEST_BUG: change tests run in headless mode [macosx] (open) Summary: In problem tests detection of AWT headless mode was introduced or AWT dependence was removed. Reviewed-by: alanb ! test/ProblemList.txt ! test/demo/jvmti/mtrace/TraceJFrame.java ! test/java/io/Serializable/resolveClass/deserializeButton/Foo.java ! test/java/io/Serializable/resolveClass/deserializeButton/Test.java ! test/java/io/Serializable/resolveClass/deserializeButton/run.sh Changeset: 054470092795 Author: mullan Date: 2012-11-26 08:12 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/054470092795 7167056: Clarify that BasicPermission names that contain non-wildcard asterisks are not invalid Reviewed-by: weijun, xuelei ! src/share/classes/com/sun/net/ssl/SSLPermission.java ! src/share/classes/java/lang/RuntimePermission.java ! src/share/classes/java/net/NetPermission.java ! src/share/classes/java/security/BasicPermission.java ! src/share/classes/java/sql/SQLPermission.java ! src/share/classes/java/util/PropertyPermission.java ! src/share/classes/javax/net/ssl/SSLPermission.java + test/java/security/BasicPermission/Wildcard.java Changeset: ea66140be78d Author: mullan Date: 2012-11-26 08:23 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ea66140be78d Merge - makefiles/docs/CORE_PKGS.gmk - makefiles/docs/Makefile - makefiles/docs/NON_CORE_PKGS.gmk - makefiles/docs/Notes.html - makefiles/mapfiles/launchers/mapfile-amd64 - makefiles/mapfiles/launchers/mapfile-i586 - makefiles/mapfiles/libawt_headless/reorder-i586 - makefiles/mapfiles/libjava/reorder-i586 - makefiles/mapfiles/libjpeg/reorder-i586 - makefiles/mapfiles/libnio/mapfile-bsd - makefiles/mapfiles/libnio/reorder-i586 - makefiles/mapfiles/libverify/reorder-i586 - makefiles/mapfiles/libzip/reorder-i586 - makefiles/sun/xawt/ToBin.java ! src/share/classes/java/security/BasicPermission.java ! src/share/classes/java/sql/SQLPermission.java ! src/share/classes/java/util/PropertyPermission.java ! src/share/classes/javax/net/ssl/SSLPermission.java - src/share/classes/sun/net/www/protocol/gopher/GopherClient.java - src/share/classes/sun/net/www/protocol/gopher/Handler.java Changeset: d7ed56d57d97 Author: mullan Date: 2012-11-26 08:34 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d7ed56d57d97 Merge Changeset: c2e80176a697 Author: mduigou Date: 2012-11-26 15:08 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c2e80176a697 8001634: Initial set of functional interface types Summary: Add the core functional interfaces used by the JSR335 libraries. Reviewed-by: dholmes, briangoetz, darcy ! make/docs/CORE_PKGS.gmk ! make/java/java/Makefile + src/share/classes/java/util/function/BinaryOperator.java + src/share/classes/java/util/function/Block.java + src/share/classes/java/util/function/DoubleBinaryOperator.java + src/share/classes/java/util/function/DoubleBlock.java + src/share/classes/java/util/function/DoubleFunction.java + src/share/classes/java/util/function/DoubleSupplier.java + src/share/classes/java/util/function/DoubleUnaryOperator.java + src/share/classes/java/util/function/Function.java + src/share/classes/java/util/function/IntBinaryOperator.java + src/share/classes/java/util/function/IntBlock.java + src/share/classes/java/util/function/IntFunction.java + src/share/classes/java/util/function/IntSupplier.java + src/share/classes/java/util/function/IntUnaryOperator.java + src/share/classes/java/util/function/LongBinaryOperator.java + src/share/classes/java/util/function/LongBlock.java + src/share/classes/java/util/function/LongFunction.java + src/share/classes/java/util/function/LongSupplier.java + src/share/classes/java/util/function/LongUnaryOperator.java + src/share/classes/java/util/function/Predicate.java + src/share/classes/java/util/function/Supplier.java + src/share/classes/java/util/function/UnaryOperator.java + src/share/classes/java/util/function/package-info.java Changeset: ddf97baea570 Author: chegar Date: 2012-11-27 17:15 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ddf97baea570 8003833: Spurious NPE from Socket.getIn/OutputStream Reviewed-by: alanb, dsamersoff ! src/share/classes/java/net/AbstractPlainSocketImpl.java + test/java/net/Socket/Streams.java Changeset: 40311b5f478f Author: robm Date: 2012-11-28 00:47 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/40311b5f478f 8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests Reviewed-by: chegar + test/java/net/ResponseCache/Test.java + test/java/net/Socket/B6210227.java Changeset: 39b25d5880c6 Author: sherman Date: 2012-11-27 21:51 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/39b25d5880c6 4235519: Make sun.misc.BASE64{De,En}coder classes public Summary: to add java.util.Base64 Reviewed-by: alanb, mduigou ! make/java/java/FILES_java.gmk Changeset: c6ed2c238d4f Author: sherman Date: 2012-11-27 22:07 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c6ed2c238d4f 8004088: hg push for bug#4235519 failed to push all files Summary: pushed all base64 files Reviewed-by: alanb, mduigou + src/share/classes/java/util/Base64.java + test/java/util/Base64/TestBase64.java + test/java/util/Base64/TestBase64Golden.java + test/java/util/Base64/baseEncode.txt + test/java/util/Base64/mimeEncode.txt + test/java/util/Base64/plain.txt + test/java/util/Base64/urlEncode.txt Changeset: 46c627801490 Author: xuelei Date: 2012-11-28 05:18 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/46c627801490 8004019: Removes unused method HandshakeHash.setCertificateVerifyAlg() Summary: certification verification in HandshakeHash was abandoned during TLS 1.2 implementation Reviewed-by: xuelei, weijun Contributed-by: Florian Weimer ! src/share/classes/sun/security/ssl/ClientHandshaker.java ! src/share/classes/sun/security/ssl/HandshakeHash.java ! src/share/classes/sun/security/ssl/Handshaker.java ! src/share/classes/sun/security/ssl/MAC.java ! src/share/classes/sun/security/ssl/ServerHandshaker.java ! src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java Changeset: 735b93462eed Author: jfranck Date: 2012-11-28 09:21 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/735b93462eed 7154390: Add support for repeating annotations in j.l.r.AnnotatedElement Reviewed-by: darcy ! src/share/classes/java/lang/Class.java ! src/share/classes/java/lang/Package.java ! src/share/classes/java/lang/System.java ! src/share/classes/java/lang/annotation/ContainedBy.java ! src/share/classes/java/lang/annotation/ContainerFor.java + src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java ! src/share/classes/java/lang/reflect/AccessibleObject.java ! src/share/classes/java/lang/reflect/AnnotatedElement.java ! src/share/classes/java/lang/reflect/Executable.java ! src/share/classes/java/lang/reflect/Field.java ! src/share/classes/sun/misc/JavaLangAccess.java ! src/share/classes/sun/reflect/annotation/AnnotationParser.java + src/share/classes/sun/reflect/annotation/AnnotationSupport.java ! src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java + test/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java + test/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java + test/java/lang/annotation/repeatingAnnotations/subpackage/Container.java + test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java + test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java + test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedNonRepeated.java + test/java/lang/annotation/repeatingAnnotations/subpackage/NonRepeated.java + test/java/lang/annotation/repeatingAnnotations/subpackage/package-info.java Changeset: 3b6a2fe6d75c Author: dfuchs Date: 2012-11-28 15:14 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3b6a2fe6d75c 8003476: Cleanup warnings in com.sun.jmx.snmp code Reviewed-by: alanb, smarks ! src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java ! src/share/classes/com/sun/jmx/snmp/Enumerated.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformBlock.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java ! src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java ! src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java ! src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java ! src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServer.java ! src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java ! src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java ! src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java ! src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java ! src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java ! src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java ! src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java ! src/share/classes/sun/management/snmp/AdaptorBootstrap.java Changeset: 262b3b2f3aa3 Author: dfuchs Date: 2012-11-28 10:08 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/262b3b2f3aa3 Merge Changeset: 09bef1e118e3 Author: mchung Date: 2012-11-28 10:49 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/09bef1e118e3 8003851: MethodHandleNatives dependency on java.sql.DriverManager Reviewed-by: alanb, dholmes ! src/share/classes/java/lang/invoke/MethodHandleNatives.java Changeset: 80ddee59a21d Author: mchung Date: 2012-11-28 10:50 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/80ddee59a21d 8003869: Eliminate java.lang.invoke.InnerClassLambdaMetafactory dependency on java.util.logging Reviewed-by: alanb, dholmes ! src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Changeset: 13ec794734f5 Author: michaelm Date: 2012-11-29 09:41 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/13ec794734f5 7200720: crash in net.dll during NTLM authentication Reviewed-by: chegar, dsamersoff ! make/java/net/Makefile ! src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java ! src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java ! src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c Changeset: ba5eabd6a37b Author: michaelm Date: 2012-11-29 09:47 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ba5eabd6a37b Merge Changeset: 2b829a5a46ee Author: jgish Date: 2012-11-29 12:28 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2b829a5a46ee 8003380: Compiler warnings in logging test code Summary: Use generics, suppress warnings where appropriate, remove unused imports, etc. Reviewed-by: lancea, chegar ! test/java/util/logging/ClassLoaderLeakTest.java ! test/java/util/logging/Listeners.java ! test/java/util/logging/ListenersWithSM.java ! test/java/util/logging/LoggerResourceBundleRace.java ! test/java/util/logging/LoggingDeadlock2.java ! test/java/util/logging/LoggingDeadlock3.java ! test/java/util/logging/LoggingDeadlock4.java ! test/java/util/logging/LoggingMXBeanTest.java ! test/java/util/logging/LoggingMXBeanTest2.java ! test/java/util/logging/MemoryHandlerTest.java ! test/java/util/logging/ParentLoggersTest.java ! test/java/util/logging/SimpleFormatterFormat.java Changeset: d91e6cb1da41 Author: shade Date: 2012-11-29 17:03 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d91e6cb1da41 8004141: UnsafeStaticFieldAccessorImpl#base should be final Reviewed-by: chegar, alanb Contributed-by: peter.levart at gmail.com ! src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java Changeset: bf6ceb6b8f80 Author: mduigou Date: 2012-11-29 14:07 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bf6ceb6b8f80 7175464: entrySetView field is never updated in NavigableSubMap Summary: The method entrySet() in AscendingSubMap and DescendingSubMap failed to cache the entrySetView. Reviewed-by: alanb, psandoz ! src/share/classes/java/util/TreeMap.java Changeset: 75cb07a7b622 Author: mduigou Date: 2012-11-29 14:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/75cb07a7b622 6553074: String{Buffer,Builder}.indexOf(Str, int) contains unnecessary allocation Summary: It is not necessary to extract the value array with toCharArray. The value array can now be used directly. Reviewed-by: alanb ! src/share/classes/java/lang/AbstractStringBuilder.java ! src/share/classes/java/lang/String.java Changeset: 83d9f30ebeed Author: smarks Date: 2012-11-28 17:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/83d9f30ebeed 8004131: move jdi tests out of core testset Reviewed-by: alanb, chegar ! make/jprt.properties Changeset: 7ccf93c60c4d Author: smarks Date: 2012-11-29 14:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7ccf93c60c4d 8004134: More ProblemList.txt updates (11/2012) Reviewed-by: alanb Contributed-by: amy.lu at oracle.com ! test/ProblemList.txt Changeset: 55f8ddc2f9c6 Author: sla Date: 2012-11-30 08:17 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/55f8ddc2f9c6 7155168: java/util/TimeZone/Bug6912560.java: expected Asia/Tokyo Reviewed-by: okutsu ! test/java/util/TimeZone/Bug6912560.java Changeset: e988de7465d4 Author: zhangshj Date: 2012-11-30 17:24 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e988de7465d4 8004211: Remove unused dlinfo local variable in launcher code Reviewed-by: alanb ! src/solaris/bin/java_md_solinux.c Changeset: 72d3d07b625d Author: alanb Date: 2012-11-30 11:18 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/72d3d07b625d 8003949: LogManager, downgrade normative reference to ${java.home}/lib/logging.properties Reviewed-by: psandoz, mchung ! src/share/classes/java/util/logging/LogManager.java Changeset: c370048be8fc Author: alanb Date: 2012-11-30 16:29 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c370048be8fc 7165762: (aio) Default thread pool should be configured so that threads terminated after a timeout period Reviewed-by: chegar ! src/share/classes/sun/nio/ch/ThreadPool.java Changeset: e7edb0da9c6a Author: jfranck Date: 2012-11-30 09:47 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e7edb0da9c6a 8004110: Remove debug code form sun/reflect/annotation/AnnotationSupport.java Reviewed-by: jjg, darcy ! src/share/classes/sun/reflect/annotation/AnnotationSupport.java Changeset: 43d2e02c4098 Author: khazra Date: 2012-11-30 12:00 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/43d2e02c4098 7197662: (prefs) java/util/prefs/AddNodeChangeListener.java fails by timeout or by "couldn't get file lock" Summary: Set -Djava.util.prefs.userRoot to current working directory of user in the prefs tests Reviewed-by: alanb, chegar, weijun, dxu ! test/java/util/prefs/AddNodeChangeListener.java ! test/java/util/prefs/CheckUserPrefsStorage.sh ! test/java/util/prefs/CommentsInXml.java ! test/java/util/prefs/ConflictInFlush.java ! test/java/util/prefs/ExportNode.java ! test/java/util/prefs/ExportSubtree.java ! test/java/util/prefs/PrefsSpi.sh ! test/java/util/prefs/RemoveNullKeyCheck.java ! test/java/util/prefs/RemoveReadOnlyNode.java ! test/java/util/prefs/RemoveUnregedListener.java Changeset: c87df8b1f55e Author: katleman Date: 2012-11-15 15:40 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c87df8b1f55e Added tag jdk8-b65 for changeset 130d3a54d28b ! .hgtags Changeset: 03d22c98b30a Author: ceisserer Date: 2012-11-13 16:12 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/03d22c98b30a 7105461: Large JTables are not rendered correctly with Xrender pipeline Reviewed-by: flar, prr ! src/solaris/classes/sun/java2d/xr/XRRenderer.java ! src/solaris/classes/sun/java2d/xr/XRUtils.java Changeset: ed977ca9a969 Author: lana Date: 2012-11-20 11:46 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ed977ca9a969 Merge Changeset: 11ba8795bbe9 Author: kshefov Date: 2012-11-14 11:37 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/11ba8795bbe9 7147408: [macosx] Add autodelay to fix a regression test Reviewed-by: serb, alexsch + test/javax/swing/text/StyledEditorKit/4506788/bug4506788.html + test/javax/swing/text/StyledEditorKit/4506788/bug4506788.java Changeset: f32a0aee7bb9 Author: alitvinov Date: 2012-11-14 18:40 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f32a0aee7bb9 6789984: JPasswordField can not receive keyboard input Reviewed-by: naoto, anthony ! src/share/classes/sun/awt/im/InputContext.java ! src/share/classes/sun/awt/im/InputMethodAdapter.java ! src/solaris/classes/sun/awt/X11InputMethod.java Changeset: 0269459afe2a Author: malenkov Date: 2012-11-20 18:56 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0269459afe2a 8003333: Regression: java/beans/EventHandler/Test6277266.java fails with ACE Reviewed-by: art ! test/java/beans/EventHandler/Test6277266.java Changeset: ea368459cca5 Author: lana Date: 2012-11-20 11:47 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ea368459cca5 Merge Changeset: 107a7a52a3c0 Author: lana Date: 2012-11-20 11:49 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/107a7a52a3c0 Merge Changeset: ccff3b663797 Author: tbell Date: 2012-11-14 10:21 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ccff3b663797 8001906: build-infra: warning: [path] bad path element on Solaris Summary: Remove unnecesary -cp parameter from compile line Reviewed-by: ohair, tbell Contributed-by: erik.joelsson at oracle.com ! makefiles/CompileDemos.gmk Changeset: 716efc201640 Author: tbell Date: 2012-11-15 00:55 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/716efc201640 Merge Changeset: 44e845bb5f76 Author: erikj Date: 2012-11-28 09:47 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/44e845bb5f76 8003960: build-infra: Jarsigner launcher has wrong classname Summary: Fixed package name in launcher Reviewed-by: alanb, ohair, ohrstrom ! makefiles/CompileLaunchers.gmk Changeset: ad5741112252 Author: erikj Date: 2012-11-28 13:20 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ad5741112252 8001460: build-infra: Linker warnings on macosx Summary: Remove creation of empty i386 section from fdlibm Reviewed-by: ohair ! makefiles/CompileNativeLibraries.gmk Changeset: 7ecc80d2ff2e Author: erikj Date: 2012-11-28 13:29 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7ecc80d2ff2e 8003477: build-infra: Remove explicit source file listings for libs when possible Reviewed-by: ohair, ohrstrom ! makefiles/CompileNativeLibraries.gmk Changeset: 51d2fd6d9850 Author: erikj Date: 2012-11-28 13:49 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/51d2fd6d9850 8003528: build-infra: Diffs in libjava and hotspot libs on solaris. Summary: Reorder libraries on link command line to match old build. Reviewed-by: ohair, ohrstrom ! makefiles/CompileNativeLibraries.gmk Changeset: 54516ed0f99f Author: erikj Date: 2012-11-28 14:10 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/54516ed0f99f 8003482: build-infra: Use correct manifest in security jars Reviewed-by: ohair, ohrstrom ! makefiles/CreateJars.gmk Changeset: 4d337fae2250 Author: katleman Date: 2012-11-28 14:06 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4d337fae2250 Merge Changeset: df5619994dc3 Author: katleman Date: 2012-11-29 11:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/df5619994dc3 Added tag jdk8-b66 for changeset 4d337fae2250 ! .hgtags Changeset: e66ec5b8c15e Author: lana Date: 2012-11-30 16:33 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e66ec5b8c15e Merge Changeset: fd8ba2d8baec Author: sherman Date: 2012-12-01 11:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/fd8ba2d8baec 8004212: java.util.Base64 methods decodeArray and decodeBuffer should return the number of bytes written Summary: to return the length instead of position Reviewed-by: alanb ! src/share/classes/java/util/Base64.java ! test/java/util/Base64/TestBase64.java Changeset: ec618ee098aa Author: wmdietl Date: 2012-12-01 18:42 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ec618ee098aa Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk ! .hgtags From wdietl at gmail.com Mon Dec 3 01:15:49 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 3 Dec 2012 01:15:49 -0800 Subject: Implementation of changed bytecode representation Message-ID: Please find a patch against the type-annotations/langtools repository attached (I just pushed a recent merge with tl). I implemented many of the recently discussed bytecode changes: reorder elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. It's not quite done yet: I still need to separate numbering of type arguments and arrays/inner types, renumber inner types, and adapt the referenceinfo test cases (which will be a big pain and I would prefer doing this only once). I would appreciate feedback on the changes to class com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I added TypePathEntry, TPEKind, and the new location field. The whole com.sun.tools.javac package hierarchy compiles; packages classfile and javap currently won't compile, as they depend on code duplicated from TypeAnnotationPosition and I only want to copy that code over once. The uses are however mostly adapted already. All comments very welcome! cu, WMD. -- http://www.google.com/profiles/wdietl -------------- next part -------------- A non-text attachment was scrubbed... Name: 2012_12_02-type-annotations-langtools.diff.bz2 Type: application/x-bzip2 Size: 11361 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20121203/54f1b325/2012_12_02-type-annotations-langtools.diff.bz2 From jonathan.gibbons at oracle.com Wed Dec 5 17:20:09 2012 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 05 Dec 2012 17:20:09 -0800 Subject: Problem with when type annotation positions are determined In-Reply-To: References: Message-ID: <50BFF2C9.3080106@oracle.com> Werner, It seems to me there are problems arising from these lines at the end of Enter annotate.enterDone(); for (JCCompilationUnit tree : trees) { TypeAnnotations.completeTypeAnnotationsInSignatures(this.names, tree); } At least conceptually, the for-loop calling completeTypeAnnotationsInSignatures should logically be done inside annotate.enterDone, not after it. Code in enterDone will be analyzing annotations, including repeated annotations, and will presumably trip up over type annotations. Separately, very minor, it looks like TypeAnnotations should be an instance obtained from a Context -- that would save you having to pass in a Names. -- Jon On 12/01/2012 03:23 PM, Werner Dietl wrote: > Joel, Jon, all, > > the trunk version of type-annotations passes the jtreg tests and also > the Checker Framework tests. > However, some uses of the compiler failed and I finally managed to > produce a minimal test case. > This problem is caused by the changes I made to when the type > annotation positions for different annotations is determined, i.e. > where we call com.sun.tools.javac.code.TypeAnnotations.completeTypeAnnotationsInSignatures > in Enter/MemberEnter/Attr. > Previous versions (e.g. the code that is still in jsr308-langtools) > did not have this problem. > > To reproduce: > > 1. tar -xvzf annobug.tar.gz > 2. cd annobug > 3. type-annotations-build-dir/bin/javac -cp . Main.java > > For me, this results in a stack trace that begins with: > > java.lang.NullPointerException > at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.setTypeAnnotationPos(TypeAnnotations.java:789) > at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.findPosition(TypeAnnotations.java:862) > at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.visitAnnotatedType(TypeAnnotations.java:839) > at com.sun.tools.javac.tree.JCTree$JCAnnotatedType.accept(JCTree.java:2304) > at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) > at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) > at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:57) > at com.sun.tools.javac.tree.TreeScanner.visitClassDef(TreeScanner.java:80) > at com.sun.tools.javac.tree.JCTree$JCClassDecl.accept(JCTree.java:648) > at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) > at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) > at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:57) > at com.sun.tools.javac.tree.TreeScanner.visitTopLevel(TreeScanner.java:68) > at com.sun.tools.javac.tree.JCTree$JCCompilationUnit.accept(JCTree.java:517) > at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) > at com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) > at com.sun.tools.javac.code.TypeAnnotations.completeTypeAnnotationsInSignatures(TypeAnnotations.java:87) > at com.sun.tools.javac.comp.Enter.complete(Enter.java:514) > at com.sun.tools.javac.main.JavaCompiler.complete(JavaCompiler.java:791) > at com.sun.tools.javac.jvm.ClassReader.fillIn(ClassReader.java:2425) > at com.sun.tools.javac.jvm.ClassReader.complete(ClassReader.java:2332) > at com.sun.tools.javac.code.Symbol.complete(Symbol.java:426) > at com.sun.tools.javac.code.Symbol$ClassSymbol.complete(Symbol.java:834) > at com.sun.tools.javac.jvm.ClassReader.loadClass(ClassReader.java:2513) > > > Note that if the classes are compiled together, no problem arises, i.e. > > javac *.java > > works as expected. Also, compiling the classes in the right sequence works: > > javac -cp . Anno.java > javac -cp . Dep.java > javac -cp . Main.java > > In the invocation that gives an exception we're trying to determine > the position for an annotation that doesn't have its TypeCompound set > yet. > I failed at tracking down why the TypeCompound is set when invoked > with all classes, but not when invoked with just one. > > Ideas? > > Thanks, > cu, WMD. > From jonathan.gibbons at oracle.com Wed Dec 5 18:03:12 2012 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 05 Dec 2012 18:03:12 -0800 Subject: Implementation of changed bytecode representation In-Reply-To: References: Message-ID: <50BFFCE0.5090806@oracle.com> On 12/03/2012 01:15 AM, Werner Dietl wrote: > Please find a patch against the type-annotations/langtools repository > attached (I just pushed a recent merge with tl). > I implemented many of the recently discussed bytecode changes: reorder > elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. > It's not quite done yet: I still need to separate numbering of type > arguments and arrays/inner types, renumber inner types, and adapt the > referenceinfo test cases (which will be a big pain and I would prefer > doing this only once). > > I would appreciate feedback on the changes to class > com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I > added TypePathEntry, TPEKind, and the new location field. > The whole com.sun.tools.javac package hierarchy compiles; packages > classfile and javap currently won't compile, as they depend on code > duplicated from TypeAnnotationPosition and I only want to copy that > code over once. The uses are however mostly adapted already. > > All comments very welcome! > cu, WMD. > Generally, code looks good, except for the //TODO's. -- Jon From wdietl at gmail.com Mon Dec 10 04:32:31 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 10 Dec 2012 12:32:31 +0000 Subject: hg: type-annotations/type-annotations/langtools: 4 new changesets Message-ID: <20121210123251.2006E4700C@hg.openjdk.java.net> Changeset: c055a422ccbf Author: wmdietl Date: 2012-12-10 04:23 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c055a422ccbf Big changes to the bytecode representation of type annotations: renaming of enum constants, completely different storage of generic/arrays/wildcards/inner types, changed order of annotations/positions, and many other changes. ! src/share/classes/com/sun/tools/classfile/ClassWriter.java ! src/share/classes/com/sun/tools/classfile/TypeAnnotation.java ! src/share/classes/com/sun/tools/javac/code/TargetType.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/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Changeset: 4e24226764cb Author: wmdietl Date: 2012-12-10 04:26 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4e24226764cb The syntax change from "@A java.lang.Object" to "java.lang. at A Object" allows us to remove the onRightType hackery in the tree. ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/tree/Pretty.java ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Changeset: c57767f264d6 Author: wmdietl Date: 2012-12-10 04:27 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c57767f264d6 Adapt to changed constants. ! src/share/classes/com/sun/tools/javap/AnnotationWriter.java Changeset: cb7b7f789075 Author: wmdietl Date: 2012-12-10 04:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cb7b7f789075 Update bytecode test cases to changed format. The genericLocation attribute contains the bytes directly, making the tests hard to read. Better testing infrastructure would be good. Everything but inner types should work correctly. I updated the genericLocation in most places, except for inner/nested types. ! test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java From wdietl at gmail.com Mon Dec 10 04:45:01 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 10 Dec 2012 04:45:01 -0800 Subject: Implementation of changed bytecode representation In-Reply-To: <50BFFCE0.5090806@oracle.com> References: <50BFFCE0.5090806@oracle.com> Message-ID: Jon, all, I pushed my first version of the new bytecode representation. This is my interpretation of what the consensus from the different "spec" lists was. Once we have a final spec, I can double check everything. I currently have 5 tests failing, all related to the changed numbering of inner types. I need to think this through some more and hopefully can clean up a few more things. I also did the "@A java.lang.Object" to "java.lang. at A Object" change, which made the AST nicer, because we no longer need the onRightType hackery. I renamed the constants and updated the tests in langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ to the new location format. It's a pain to write these byte arrays by hand, but I didn't see a quick way to update the testing infrastructure. Please have a look at the tests and the code and let me know whether you see any problems. I will next: - fix inner type numbering - fix JavaDoc/Symbol issue - look at exception and lambda storage (I added constants and some groundwork; for lambda i really need a spec to know what has to be stored.) - the few small other things from previous mail cu, WMD. On Wed, Dec 5, 2012 at 6:03 PM, Jonathan Gibbons wrote: > On 12/03/2012 01:15 AM, Werner Dietl wrote: >> >> Please find a patch against the type-annotations/langtools repository >> attached (I just pushed a recent merge with tl). >> I implemented many of the recently discussed bytecode changes: reorder >> elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. >> It's not quite done yet: I still need to separate numbering of type >> arguments and arrays/inner types, renumber inner types, and adapt the >> referenceinfo test cases (which will be a big pain and I would prefer >> doing this only once). >> >> I would appreciate feedback on the changes to class >> com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I >> added TypePathEntry, TPEKind, and the new location field. >> The whole com.sun.tools.javac package hierarchy compiles; packages >> classfile and javap currently won't compile, as they depend on code >> duplicated from TypeAnnotationPosition and I only want to copy that >> code over once. The uses are however mostly adapted already. >> >> All comments very welcome! >> cu, WMD. >> > > Generally, code looks good, except for the //TODO's. > > -- Jon > > > > -- http://www.google.com/profiles/wdietl From steve.sides at oracle.com Mon Dec 10 13:11:46 2012 From: steve.sides at oracle.com (Steve Sides) Date: Mon, 10 Dec 2012 13:11:46 -0800 Subject: Some questions In-Reply-To: References: <50BFFCE0.5090806@oracle.com> Message-ID: <50C65012.3000607@oracle.com> Hi, I starting writing some tests mixing a combination of ElementType targets and ran into some questions. Section 2.3 says, "A type annotation (one meta-annotated with @Target(ElementType.TYPE_USE)) is permitted to be written anywhere @Target(ElementType.TYPE) or @Target(ElementType.TYPE_PARAMETER) would permit ? that is, on a class, interface, or enum declaration, or on a type parameter declaration." Should this mean that an annotations such as @Retention(RUNTIME) @Target(ElementType.TYPE_USE) @interface Uv {} should be able to be used as @Uv public class Test1 { <@Uv T> String g(T t) { return null; } } In the case of the first usage, it appears as RuntimeVisibleAnnotations and not RuntimeVisibleTypeAnnotations. The second is not accepted by the compiler. Are both these current behaviors expected? Am I reading that correctly? thanks, steve > which made the AST nicer, because we no longer need the onRightType > hackery. > I renamed the constants and updated the tests in > > langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ > > to the new location format. It's a pain to write these byte arrays by > hand, but I didn't see a quick way to update the testing > infrastructure. > > Please have a look at the tests and the code and let me know whether > you see any problems. > > I will next: > - fix inner type numbering > - fix JavaDoc/Symbol issue > - look at exception and lambda storage (I added constants and some > groundwork; for lambda i really need a spec to know what has to be > stored.) > - the few small other things from previous mail > > cu, WMD. > > > On Wed, Dec 5, 2012 at 6:03 PM, Jonathan Gibbons > wrote: >> On 12/03/2012 01:15 AM, Werner Dietl wrote: >>> Please find a patch against the type-annotations/langtools repository >>> attached (I just pushed a recent merge with tl). >>> I implemented many of the recently discussed bytecode changes: reorder >>> elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. >>> It's not quite done yet: I still need to separate numbering of type >>> arguments and arrays/inner types, renumber inner types, and adapt the >>> referenceinfo test cases (which will be a big pain and I would prefer >>> doing this only once). >>> >>> I would appreciate feedback on the changes to class >>> com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I >>> added TypePathEntry, TPEKind, and the new location field. >>> The whole com.sun.tools.javac package hierarchy compiles; packages >>> classfile and javap currently won't compile, as they depend on code >>> duplicated from TypeAnnotationPosition and I only want to copy that >>> code over once. The uses are however mostly adapted already. >>> >>> All comments very welcome! >>> cu, WMD. >>> >> Generally, code looks good, except for the //TODO's. >> >> -- Jon >> >> >> >> > > From alex.buckley at oracle.com Mon Dec 10 13:43:03 2012 From: alex.buckley at oracle.com (Alex Buckley) Date: Mon, 10 Dec 2012 13:43:03 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C65012.3000607@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> Message-ID: <50C65767.8020402@oracle.com> Hi Steve, The source you wrote below is completely valid. @Uv on the class declaration of Test1 correctly produces a RuntimeVisibleAnnotations attribute on the class. @Uv on the type parameter declaration of g should produce a RuntimeVisibleTypeAnnotations attribute on the method. (A type parameter annotation on a generic type or method is technically on a declaration, and so "ought" to get RuntimeVisibleAnnotations, but this is impractical, so in fact it gets RuntimeVisibleTypeAnnotations.) There must a bug in the treatment of TYPE_USE annotations on type parameters. It fails in a generic class declaration too: "class Test1<@Uv X> ...". But @Uv does work as a pure use-site annotation: "class Test1 { @Uv int f; }" Summary: a TYPE_USE annotation works in TYPE and "use" locations, but not TYPE_PARAMETER locations. Alex On 12/10/2012 1:11 PM, Steve Sides wrote: > Hi, > > I starting writing some tests mixing a combination of ElementType > targets and ran into some questions. > Section 2.3 says, > > "A type annotation (one meta-annotated with > @Target(ElementType.TYPE_USE)) is permitted to be written anywhere > @Target(ElementType.TYPE) or @Target(ElementType.TYPE_PARAMETER) would > permit ? that is, on a class, interface, or enum declaration, or on a > type parameter declaration." > > Should this mean that an annotations such as > @Retention(RUNTIME) > @Target(ElementType.TYPE_USE) > @interface Uv {} > > should be able to be used as > > @Uv public class Test1 { > <@Uv T> String g(T t) { return null; } > } > > In the case of the first usage, it appears as RuntimeVisibleAnnotations > and not RuntimeVisibleTypeAnnotations. > The second is not accepted by the compiler. > > Are both these current behaviors expected? Am I reading that correctly? > > thanks, > steve > > >> which made the AST nicer, because we no longer need the onRightType >> hackery. >> I renamed the constants and updated the tests in >> >> langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ >> >> to the new location format. It's a pain to write these byte arrays by >> hand, but I didn't see a quick way to update the testing >> infrastructure. >> >> Please have a look at the tests and the code and let me know whether >> you see any problems. >> >> I will next: >> - fix inner type numbering >> - fix JavaDoc/Symbol issue >> - look at exception and lambda storage (I added constants and some >> groundwork; for lambda i really need a spec to know what has to be >> stored.) >> - the few small other things from previous mail >> >> cu, WMD. >> >> >> On Wed, Dec 5, 2012 at 6:03 PM, Jonathan Gibbons >> wrote: >>> On 12/03/2012 01:15 AM, Werner Dietl wrote: >>>> Please find a patch against the type-annotations/langtools repository >>>> attached (I just pushed a recent merge with tl). >>>> I implemented many of the recently discussed bytecode changes: reorder >>>> elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. >>>> It's not quite done yet: I still need to separate numbering of type >>>> arguments and arrays/inner types, renumber inner types, and adapt the >>>> referenceinfo test cases (which will be a big pain and I would prefer >>>> doing this only once). >>>> >>>> I would appreciate feedback on the changes to class >>>> com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I >>>> added TypePathEntry, TPEKind, and the new location field. >>>> The whole com.sun.tools.javac package hierarchy compiles; packages >>>> classfile and javap currently won't compile, as they depend on code >>>> duplicated from TypeAnnotationPosition and I only want to copy that >>>> code over once. The uses are however mostly adapted already. >>>> >>>> All comments very welcome! >>>> cu, WMD. >>>> >>> Generally, code looks good, except for the //TODO's. >>> >>> -- Jon >>> >>> >>> >>> >> >> > From wdietl at gmail.com Mon Dec 10 15:04:40 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 10 Dec 2012 23:04:40 +0000 Subject: hg: type-annotations/type-annotations/langtools: Allow TYPE_USE annotations on type parameter declarations. Message-ID: <20121210230447.EA2FE4701F@hg.openjdk.java.net> Changeset: bf0c0c96388b Author: wmdietl Date: 2012-12-10 15:03 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bf0c0c96388b Allow TYPE_USE annotations on type parameter declarations. ! src/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.java ! test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.out ! test/tools/javac/annotations/typeAnnotations/newlocations/TypeParameters.java From wdietl at gmail.com Mon Dec 10 15:08:14 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 10 Dec 2012 15:08:14 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C65767.8020402@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> Message-ID: Hi Steve, Alex, I changed the checks to allow TYPE_USE annotations on type parameter declarations and expanded the corresponding test case. See: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bf0c0c96388b One test case did expect this error, so I assume this was a spec change that hadn't been implemented yet. Please do let me know whether this now behaves as expected. cu, WMD. On Mon, Dec 10, 2012 at 1:43 PM, Alex Buckley wrote: > Hi Steve, > > The source you wrote below is completely valid. > > @Uv on the class declaration of Test1 correctly produces a > RuntimeVisibleAnnotations attribute on the class. > > @Uv on the type parameter declaration of g should produce a > RuntimeVisibleTypeAnnotations attribute on the method. > > (A type parameter annotation on a generic type or method is technically on a > declaration, and so "ought" to get RuntimeVisibleAnnotations, but this is > impractical, so in fact it gets RuntimeVisibleTypeAnnotations.) > > There must a bug in the treatment of TYPE_USE annotations on type > parameters. It fails in a generic class declaration too: "class Test1<@Uv X> > ...". But @Uv does work as a pure use-site annotation: "class Test1 extends @Uv String> { @Uv int f; }" > > Summary: a TYPE_USE annotation works in TYPE and "use" locations, but not > TYPE_PARAMETER locations. > > Alex > > On 12/10/2012 1:11 PM, Steve Sides wrote: >> >> Hi, >> >> I starting writing some tests mixing a combination of ElementType >> targets and ran into some questions. >> Section 2.3 says, >> >> "A type annotation (one meta-annotated with >> @Target(ElementType.TYPE_USE)) is permitted to be written anywhere >> @Target(ElementType.TYPE) or @Target(ElementType.TYPE_PARAMETER) would >> permit ? that is, on a class, interface, or enum declaration, or on a >> type parameter declaration." >> >> Should this mean that an annotations such as >> @Retention(RUNTIME) >> @Target(ElementType.TYPE_USE) >> @interface Uv {} >> >> should be able to be used as >> >> @Uv public class Test1 { >> <@Uv T> String g(T t) { return null; } >> } >> >> In the case of the first usage, it appears as RuntimeVisibleAnnotations >> and not RuntimeVisibleTypeAnnotations. >> The second is not accepted by the compiler. >> >> Are both these current behaviors expected? Am I reading that correctly? >> >> thanks, >> steve >> >> >>> which made the AST nicer, because we no longer need the onRightType >>> hackery. >>> I renamed the constants and updated the tests in >>> >>> langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ >>> >>> to the new location format. It's a pain to write these byte arrays by >>> hand, but I didn't see a quick way to update the testing >>> infrastructure. >>> >>> Please have a look at the tests and the code and let me know whether >>> you see any problems. >>> >>> I will next: >>> - fix inner type numbering >>> - fix JavaDoc/Symbol issue >>> - look at exception and lambda storage (I added constants and some >>> groundwork; for lambda i really need a spec to know what has to be >>> stored.) >>> - the few small other things from previous mail >>> >>> cu, WMD. >>> >>> >>> On Wed, Dec 5, 2012 at 6:03 PM, Jonathan Gibbons >>> wrote: >>>> >>>> On 12/03/2012 01:15 AM, Werner Dietl wrote: >>>>> >>>>> Please find a patch against the type-annotations/langtools repository >>>>> attached (I just pushed a recent merge with tl). >>>>> I implemented many of the recently discussed bytecode changes: reorder >>>>> elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. >>>>> It's not quite done yet: I still need to separate numbering of type >>>>> arguments and arrays/inner types, renumber inner types, and adapt the >>>>> referenceinfo test cases (which will be a big pain and I would prefer >>>>> doing this only once). >>>>> >>>>> I would appreciate feedback on the changes to class >>>>> com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I >>>>> added TypePathEntry, TPEKind, and the new location field. >>>>> The whole com.sun.tools.javac package hierarchy compiles; packages >>>>> classfile and javap currently won't compile, as they depend on code >>>>> duplicated from TypeAnnotationPosition and I only want to copy that >>>>> code over once. The uses are however mostly adapted already. >>>>> >>>>> All comments very welcome! >>>>> cu, WMD. >>>>> >>>> Generally, code looks good, except for the //TODO's. >>>> >>>> -- Jon >>>> >>>> >>>> >>>> >>> >>> >> > -- http://www.google.com/profiles/wdietl From alex.buckley at oracle.com Mon Dec 10 15:12:46 2012 From: alex.buckley at oracle.com (Alex Buckley) Date: Mon, 10 Dec 2012 15:12:46 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> Message-ID: <50C66C6E.10804@oracle.com> Hi Werner, Thanks for the quick changeset! The policy of allowing TYPE_USE annotations at TYPE and TYPE_PARAMETER declaration sites (as well as use sites) is pretty clear in the spec. I also assume it was just an oversight in javac. FYI we will be pushing new binaries for the type-annotations forest to jdk8.java.net/type-annotations very soon. Maybe with this changeset. Alex On 12/10/2012 3:08 PM, Werner Dietl wrote: > Hi Steve, Alex, > > I changed the checks to allow TYPE_USE annotations on type parameter > declarations and expanded the corresponding test case. See: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bf0c0c96388b > > One test case did expect this error, so I assume this was a spec > change that hadn't been implemented yet. > Please do let me know whether this now behaves as expected. > > cu, WMD. > > On Mon, Dec 10, 2012 at 1:43 PM, Alex Buckley wrote: >> Hi Steve, >> >> The source you wrote below is completely valid. >> >> @Uv on the class declaration of Test1 correctly produces a >> RuntimeVisibleAnnotations attribute on the class. >> >> @Uv on the type parameter declaration of g should produce a >> RuntimeVisibleTypeAnnotations attribute on the method. >> >> (A type parameter annotation on a generic type or method is technically on a >> declaration, and so "ought" to get RuntimeVisibleAnnotations, but this is >> impractical, so in fact it gets RuntimeVisibleTypeAnnotations.) >> >> There must a bug in the treatment of TYPE_USE annotations on type >> parameters. It fails in a generic class declaration too: "class Test1<@Uv X> >> ...". But @Uv does work as a pure use-site annotation: "class Test1> extends @Uv String> { @Uv int f; }" >> >> Summary: a TYPE_USE annotation works in TYPE and "use" locations, but not >> TYPE_PARAMETER locations. >> >> Alex >> >> On 12/10/2012 1:11 PM, Steve Sides wrote: >>> >>> Hi, >>> >>> I starting writing some tests mixing a combination of ElementType >>> targets and ran into some questions. >>> Section 2.3 says, >>> >>> "A type annotation (one meta-annotated with >>> @Target(ElementType.TYPE_USE)) is permitted to be written anywhere >>> @Target(ElementType.TYPE) or @Target(ElementType.TYPE_PARAMETER) would >>> permit ? that is, on a class, interface, or enum declaration, or on a >>> type parameter declaration." >>> >>> Should this mean that an annotations such as >>> @Retention(RUNTIME) >>> @Target(ElementType.TYPE_USE) >>> @interface Uv {} >>> >>> should be able to be used as >>> >>> @Uv public class Test1 { >>> <@Uv T> String g(T t) { return null; } >>> } >>> >>> In the case of the first usage, it appears as RuntimeVisibleAnnotations >>> and not RuntimeVisibleTypeAnnotations. >>> The second is not accepted by the compiler. >>> >>> Are both these current behaviors expected? Am I reading that correctly? >>> >>> thanks, >>> steve >>> >>> >>>> which made the AST nicer, because we no longer need the onRightType >>>> hackery. >>>> I renamed the constants and updated the tests in >>>> >>>> langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ >>>> >>>> to the new location format. It's a pain to write these byte arrays by >>>> hand, but I didn't see a quick way to update the testing >>>> infrastructure. >>>> >>>> Please have a look at the tests and the code and let me know whether >>>> you see any problems. >>>> >>>> I will next: >>>> - fix inner type numbering >>>> - fix JavaDoc/Symbol issue >>>> - look at exception and lambda storage (I added constants and some >>>> groundwork; for lambda i really need a spec to know what has to be >>>> stored.) >>>> - the few small other things from previous mail >>>> >>>> cu, WMD. >>>> >>>> >>>> On Wed, Dec 5, 2012 at 6:03 PM, Jonathan Gibbons >>>> wrote: >>>>> >>>>> On 12/03/2012 01:15 AM, Werner Dietl wrote: >>>>>> >>>>>> Please find a patch against the type-annotations/langtools repository >>>>>> attached (I just pushed a recent merge with tl). >>>>>> I implemented many of the recently discussed bytecode changes: reorder >>>>>> elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. >>>>>> It's not quite done yet: I still need to separate numbering of type >>>>>> arguments and arrays/inner types, renumber inner types, and adapt the >>>>>> referenceinfo test cases (which will be a big pain and I would prefer >>>>>> doing this only once). >>>>>> >>>>>> I would appreciate feedback on the changes to class >>>>>> com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I >>>>>> added TypePathEntry, TPEKind, and the new location field. >>>>>> The whole com.sun.tools.javac package hierarchy compiles; packages >>>>>> classfile and javap currently won't compile, as they depend on code >>>>>> duplicated from TypeAnnotationPosition and I only want to copy that >>>>>> code over once. The uses are however mostly adapted already. >>>>>> >>>>>> All comments very welcome! >>>>>> cu, WMD. >>>>>> >>>>> Generally, code looks good, except for the //TODO's. >>>>> >>>>> -- Jon >>>>> >>>>> >>>>> >>>>> >>>> >>>> >>> >> > > > From wdietl at gmail.com Mon Dec 10 15:36:41 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 10 Dec 2012 15:36:41 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C66C6E.10804@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> Message-ID: Hi Alex, > FYI we will be pushing new binaries for the type-annotations forest to > jdk8.java.net/type-annotations very soon. Maybe with this changeset. I pushed a changed bytecode representation yesterday, but there are still some open issues with counting inner types. Do you have a cut-off date for what will get into this next binary build? Also, some of my comments on the Nov. 7th spec were about the bytecode representation and spec and impl might vary there. cu, WMD. > On 12/10/2012 3:08 PM, Werner Dietl wrote: >> >> Hi Steve, Alex, >> >> I changed the checks to allow TYPE_USE annotations on type parameter >> declarations and expanded the corresponding test case. See: >> >> >> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bf0c0c96388b >> >> One test case did expect this error, so I assume this was a spec >> change that hadn't been implemented yet. >> Please do let me know whether this now behaves as expected. >> >> cu, WMD. >> >> On Mon, Dec 10, 2012 at 1:43 PM, Alex Buckley >> wrote: >>> >>> Hi Steve, >>> >>> The source you wrote below is completely valid. >>> >>> @Uv on the class declaration of Test1 correctly produces a >>> RuntimeVisibleAnnotations attribute on the class. >>> >>> @Uv on the type parameter declaration of g should produce a >>> RuntimeVisibleTypeAnnotations attribute on the method. >>> >>> (A type parameter annotation on a generic type or method is technically >>> on a >>> declaration, and so "ought" to get RuntimeVisibleAnnotations, but this is >>> impractical, so in fact it gets RuntimeVisibleTypeAnnotations.) >>> >>> There must a bug in the treatment of TYPE_USE annotations on type >>> parameters. It fails in a generic class declaration too: "class Test1<@Uv >>> X> >>> ...". But @Uv does work as a pure use-site annotation: "class Test1>> extends @Uv String> { @Uv int f; }" >>> >>> Summary: a TYPE_USE annotation works in TYPE and "use" locations, but not >>> TYPE_PARAMETER locations. >>> >>> Alex >>> >>> On 12/10/2012 1:11 PM, Steve Sides wrote: >>>> >>>> >>>> Hi, >>>> >>>> I starting writing some tests mixing a combination of ElementType >>>> targets and ran into some questions. >>>> Section 2.3 says, >>>> >>>> "A type annotation (one meta-annotated with >>>> @Target(ElementType.TYPE_USE)) is permitted to be written anywhere >>>> @Target(ElementType.TYPE) or @Target(ElementType.TYPE_PARAMETER) would >>>> permit ? that is, on a class, interface, or enum declaration, or on a >>>> type parameter declaration." >>>> >>>> Should this mean that an annotations such as >>>> @Retention(RUNTIME) >>>> @Target(ElementType.TYPE_USE) >>>> @interface Uv {} >>>> >>>> should be able to be used as >>>> >>>> @Uv public class Test1 { >>>> <@Uv T> String g(T t) { return null; } >>>> } >>>> >>>> In the case of the first usage, it appears as RuntimeVisibleAnnotations >>>> and not RuntimeVisibleTypeAnnotations. >>>> The second is not accepted by the compiler. >>>> >>>> Are both these current behaviors expected? Am I reading that correctly? >>>> >>>> thanks, >>>> steve >>>> >>>> >>>>> which made the AST nicer, because we no longer need the onRightType >>>>> hackery. >>>>> I renamed the constants and updated the tests in >>>>> >>>>> langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ >>>>> >>>>> to the new location format. It's a pain to write these byte arrays by >>>>> hand, but I didn't see a quick way to update the testing >>>>> infrastructure. >>>>> >>>>> Please have a look at the tests and the code and let me know whether >>>>> you see any problems. >>>>> >>>>> I will next: >>>>> - fix inner type numbering >>>>> - fix JavaDoc/Symbol issue >>>>> - look at exception and lambda storage (I added constants and some >>>>> groundwork; for lambda i really need a spec to know what has to be >>>>> stored.) >>>>> - the few small other things from previous mail >>>>> >>>>> cu, WMD. >>>>> >>>>> >>>>> On Wed, Dec 5, 2012 at 6:03 PM, Jonathan Gibbons >>>>> wrote: >>>>>> >>>>>> >>>>>> On 12/03/2012 01:15 AM, Werner Dietl wrote: >>>>>>> >>>>>>> >>>>>>> Please find a patch against the type-annotations/langtools repository >>>>>>> attached (I just pushed a recent merge with tl). >>>>>>> I implemented many of the recently discussed bytecode changes: >>>>>>> reorder >>>>>>> elements, remove _COMPONENT TargetTypes, and introduce TypePathEntry. >>>>>>> It's not quite done yet: I still need to separate numbering of type >>>>>>> arguments and arrays/inner types, renumber inner types, and adapt the >>>>>>> referenceinfo test cases (which will be a big pain and I would prefer >>>>>>> doing this only once). >>>>>>> >>>>>>> I would appreciate feedback on the changes to class >>>>>>> com.sun.tools.javac.code.TypeAnnotationPosition, in particular how I >>>>>>> added TypePathEntry, TPEKind, and the new location field. >>>>>>> The whole com.sun.tools.javac package hierarchy compiles; packages >>>>>>> classfile and javap currently won't compile, as they depend on code >>>>>>> duplicated from TypeAnnotationPosition and I only want to copy that >>>>>>> code over once. The uses are however mostly adapted already. >>>>>>> >>>>>>> All comments very welcome! >>>>>>> cu, WMD. >>>>>>> >>>>>> Generally, code looks good, except for the //TODO's. >>>>>> >>>>>> -- Jon >>>>>> >>>>>> >>>>>> >>>>>> >>>>> >>>>> >>>> >>> >> >> >> > -- http://www.google.com/profiles/wdietl From alex.buckley at oracle.com Mon Dec 10 15:43:17 2012 From: alex.buckley at oracle.com (Alex Buckley) Date: Mon, 10 Dec 2012 15:43:17 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> Message-ID: <50C67395.7050503@oracle.com> On 12/10/2012 3:36 PM, Werner Dietl wrote: > I pushed a changed bytecode representation yesterday, but there are > still some open issues with counting inner types. > Do you have a cut-off date for what will get into this next binary build? As I understand it: (Steve, please fill in) 1. We build internally on any day when there is a change in the type-annotations forest. 2. Publishing on java.net is triggered manually, but is not difficult. At the worst, we can publish binaries built earlier today with your changed bytecode representation, and then publish new binaries later this week after you push the inner types work. Alex From wdietl at gmail.com Mon Dec 10 16:30:50 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:30:50 +0000 Subject: hg: type-annotations/type-annotations/langtools: 5 new changesets Message-ID: <20121211003105.326784702B@hg.openjdk.java.net> Changeset: 0e70eb71fec0 Author: mcimadamore Date: 2012-12-04 17:19 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0e70eb71fec0 8004360: regression test DefaultMethodRegressionTests fails in langtools Summary: ignore broken failing test Reviewed-by: jjg - test/tools/javac/defaultMethodExecution/DefaultMethodRegressionTests.java + test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java Changeset: c78acf6c2f3e Author: mcimadamore Date: 2012-12-10 12:10 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c78acf6c2f3e 8004094: Javac compiler error - synthetic method accessor generated with duplicate name Summary: method clash check logic should skip methods marked with ACC_SYNTHETIC Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Check.java + test/tools/javac/generics/8004094/B.java + test/tools/javac/generics/8004094/T8004094.java Changeset: 0b508089c9c5 Author: wmdietl Date: 2012-12-10 16:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0b508089c9c5 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! src/share/classes/com/sun/tools/javac/comp/Check.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out Changeset: e9a13a6c9d5d Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e9a13a6c9d5d Added tag jdk8-b67 for changeset 303b09787a69 ! .hgtags Changeset: bf1af6d5bdbd Author: wmdietl Date: 2012-12-10 16:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bf1af6d5bdbd Automated merge with http://hg.openjdk.java.net/jdk8/jdk8/langtools ! .hgtags - test/tools/javac/defaultMethodExecution/DefaultMethodRegressionTests.java - test/tools/javac/diags/examples/InvalidGenericDescInFunctionalInterface.java - test/tools/javac/lambda/LambdaConversionTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out From wdietl at gmail.com Mon Dec 10 16:34:47 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:34:47 +0000 Subject: hg: type-annotations/type-annotations/hotspot: 27 new changesets Message-ID: <20121211003550.B53294702C@hg.openjdk.java.net> Changeset: e1d42ba865de Author: amurillo Date: 2012-11-16 09:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/e1d42ba865de 8003541: new hotspot build - hs25-b11 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 49cbd3e25ba9 Author: zgu Date: 2012-11-16 09:05 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/49cbd3e25ba9 8003487: NMT: incorrect assertion in VMMemPointerIterator::remove_released_region method (memSnapshot.cpp) Summary: The assertion is applied to only the region to be released, also performs region integrity checking Reviewed-by: acorn, coleenp ! src/share/vm/services/memSnapshot.cpp ! src/share/vm/services/memSnapshot.hpp Changeset: 3ed6de6e139b Author: coleenp Date: 2012-11-20 20:27 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/3ed6de6e139b Merge Changeset: 73e64867adb7 Author: mikael Date: 2012-11-21 09:02 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/73e64867adb7 8003690: Example code in JVMTI GetStackTrace documentation is broken Summary: Fixed to minor errors in example code Reviewed-by: sspitsyn, dholmes ! src/share/vm/prims/jvmti.xml Changeset: 6b881a6b0665 Author: dholmes Date: 2012-11-21 20:07 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6b881a6b0665 8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use Reviewed-by: coleenp, kvn ! src/share/vm/runtime/vm_version.cpp Changeset: ca1be5fbe6ff Author: dholmes Date: 2012-11-21 21:26 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ca1be5fbe6ff Merge Changeset: 7c15faa95ce7 Author: mikael Date: 2012-11-27 07:57 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/7c15faa95ce7 8003879: Duplicate definitions in vmStructs Summary: Removed duplicate entries Reviewed-by: dholmes, sspitsyn ! src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp ! src/share/vm/prims/jni.cpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vmStructs.hpp Changeset: bbc14465e7db Author: zgu Date: 2012-11-28 09:19 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/bbc14465e7db 8003689: MemTracker::init_tracking_options() reads outside array if commandline argument is empty Summary: Fixed potential buffer overrun when giving empty option to NativeMemoryTracking commandline option Reviewed-by: ctornqvi, hseigel, kvn ! src/share/vm/services/memTracker.cpp Changeset: 5de2a5bd519e Author: zgu Date: 2012-11-28 06:42 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5de2a5bd519e Merge Changeset: fe81517cfb77 Author: hseigel Date: 2012-11-28 08:17 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/fe81517cfb77 6924920: Class Data Sharing limit on the java version string can create failures Summary: Truncate the java version string and add a hash value if it is too long. Reviewed-by: dholmes, coleenp ! src/share/vm/memory/filemap.cpp Changeset: b51dc8df86e5 Author: coleenp Date: 2012-11-28 08:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b51dc8df86e5 Merge Changeset: 59c790074993 Author: coleenp Date: 2012-11-28 17:50 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/59c790074993 8003635: NPG: AsynchGetCallTrace broken by Method* virtual call Summary: Make metaspace::contains be lock free and used to see if something is in metaspace, also compare Method* with vtbl pointer. Reviewed-by: dholmes, sspitsyn, dcubed, jmasa ! src/cpu/sparc/vm/frame_sparc.cpp ! src/cpu/x86/vm/frame_x86.cpp ! src/share/vm/gc_interface/collectedHeap.hpp ! src/share/vm/gc_interface/collectedHeap.inline.hpp ! src/share/vm/memory/allocation.cpp ! src/share/vm/memory/allocation.hpp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/metaspace.hpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/compiledICHolder.cpp ! src/share/vm/oops/method.cpp ! src/share/vm/oops/method.hpp ! src/share/vm/prims/forte.cpp ! src/share/vm/utilities/globalDefinitions.hpp Changeset: 53715fb1597d Author: brutisso Date: 2012-11-20 11:40 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/53715fb1597d 7198334: UseNUMA modifies system parameters on non-NUMA system Summary: The flags MinHeapDeltaBytes and UseNUMAInterleaving must be adjusted after the OS have adjusted the UseNUMA flag in the method os::init_2. Reviewed-by: dholmes, brutisso Contributed-by: erik.helin at oracle.com ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp ! src/share/vm/runtime/thread.cpp Changeset: 19c1bd641922 Author: coleenp Date: 2012-11-26 12:31 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/19c1bd641922 8003722: More gcc 4.7 compilation errors Summary: Add a few more this->qualifications. Reviewed-by: coleenp, dholmes Contributed-by: duboscq at ssw.jku.at ! src/share/vm/memory/binaryTreeDictionary.cpp Changeset: d0aa87f04bd5 Author: stefank Date: 2012-11-27 10:13 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d0aa87f04bd5 8003720: NPG: Method in interpreter stack frame can be deallocated Summary: Pass down a closure during root scanning to keep the class of the method alive. Reviewed-by: coleenp, jcoomes ! src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp ! src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp ! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ! src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp ! src/share/vm/memory/iterator.cpp ! src/share/vm/memory/iterator.hpp ! src/share/vm/memory/sharedHeap.cpp ! src/share/vm/runtime/deoptimization.cpp ! src/share/vm/runtime/frame.cpp ! src/share/vm/runtime/frame.hpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/thread.hpp ! src/share/vm/runtime/vmThread.cpp ! src/share/vm/runtime/vmThread.hpp + test/runtime/8003720/Asmator.java + test/runtime/8003720/Test8003720.java + test/runtime/8003720/Victim.java + test/runtime/8003720/VictimClassLoader.java Changeset: f34d701e952e Author: stefank Date: 2012-11-27 14:20 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f34d701e952e 8003935: Simplify the needed includes for using Thread::current() Reviewed-by: dholmes, rbackman, coleenp ! src/cpu/sparc/vm/interp_masm_sparc.cpp ! src/cpu/sparc/vm/stubGenerator_sparc.cpp ! src/cpu/sparc/vm/stubRoutines_sparc.cpp ! src/cpu/x86/vm/interp_masm_x86_32.cpp ! src/cpu/x86/vm/interp_masm_x86_64.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/stubRoutines_x86_32.cpp ! src/cpu/x86/vm/stubRoutines_x86_64.cpp ! src/cpu/zero/vm/interp_masm_zero.cpp ! src/cpu/zero/vm/stubGenerator_zero.cpp ! src/cpu/zero/vm/stubRoutines_zero.cpp ! src/os/bsd/vm/mutex_bsd.cpp ! src/os/bsd/vm/mutex_bsd.inline.hpp ! src/os/bsd/vm/os_bsd.cpp ! src/os/bsd/vm/threadCritical_bsd.cpp ! src/os/bsd/vm/thread_bsd.inline.hpp ! src/os/linux/vm/mutex_linux.cpp ! src/os/linux/vm/mutex_linux.inline.hpp ! src/os/linux/vm/os_linux.cpp ! src/os/linux/vm/threadCritical_linux.cpp ! src/os/linux/vm/thread_linux.inline.hpp ! src/os/solaris/vm/mutex_solaris.cpp ! src/os/solaris/vm/mutex_solaris.inline.hpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/solaris/vm/threadCritical_solaris.cpp ! src/os/solaris/vm/thread_solaris.inline.hpp ! src/os/windows/vm/mutex_windows.cpp ! src/os/windows/vm/mutex_windows.inline.hpp ! src/os/windows/vm/os_windows.cpp ! src/os/windows/vm/threadCritical_windows.cpp ! src/os/windows/vm/thread_windows.inline.hpp ! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ! src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp ! src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp ! src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp ! src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp ! src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp ! src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp ! src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp ! src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp ! src/os_cpu/linux_x86/vm/os_linux_x86.cpp ! src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp ! src/os_cpu/linux_x86/vm/thread_linux_x86.cpp ! src/os_cpu/linux_zero/vm/os_linux_zero.cpp ! src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp ! src/os_cpu/linux_zero/vm/thread_linux_zero.cpp ! src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp ! src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp ! src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp ! src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp ! src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp ! src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp ! src/os_cpu/windows_x86/vm/os_windows_x86.cpp ! src/os_cpu/windows_x86/vm/threadLS_windows_x86.cpp ! src/os_cpu/windows_x86/vm/thread_windows_x86.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp ! src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp ! src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp ! src/share/vm/gc_implementation/g1/ptrQueue.cpp ! src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp ! src/share/vm/gc_interface/collectedHeap.cpp ! src/share/vm/gc_interface/collectedHeap.inline.hpp ! src/share/vm/interpreter/abstractInterpreter.hpp ! src/share/vm/interpreter/interpreterRuntime.hpp ! src/share/vm/interpreter/linkResolver.cpp ! src/share/vm/memory/collectorPolicy.cpp ! src/share/vm/memory/defNewGeneration.cpp ! src/share/vm/memory/freeBlockDictionary.cpp ! src/share/vm/memory/gcLocker.hpp ! src/share/vm/memory/genMarkSweep.cpp ! src/share/vm/memory/resourceArea.cpp ! src/share/vm/memory/resourceArea.hpp ! src/share/vm/memory/threadLocalAllocBuffer.cpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/markOop.cpp ! src/share/vm/oops/oop.cpp ! src/share/vm/oops/oopsHierarchy.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/prims/jvmtiEnv.cpp ! src/share/vm/prims/jvmtiImpl.cpp ! src/share/vm/runtime/fprofiler.hpp ! src/share/vm/runtime/handles.cpp ! src/share/vm/runtime/handles.inline.hpp ! src/share/vm/runtime/interfaceSupport.hpp ! src/share/vm/runtime/java.cpp ! src/share/vm/runtime/javaCalls.cpp ! src/share/vm/runtime/javaCalls.hpp ! src/share/vm/runtime/jniHandles.cpp ! src/share/vm/runtime/memprofiler.cpp ! src/share/vm/runtime/mutex.cpp ! src/share/vm/runtime/mutexLocker.cpp ! src/share/vm/runtime/objectMonitor.cpp ! src/share/vm/runtime/os.cpp ! src/share/vm/runtime/safepoint.cpp ! src/share/vm/runtime/synchronizer.cpp ! src/share/vm/runtime/task.cpp ! src/share/vm/runtime/thread.cpp + src/share/vm/runtime/thread.inline.hpp ! src/share/vm/runtime/threadLocalStorage.cpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vmThread.cpp ! src/share/vm/runtime/vmThread.hpp ! src/share/vm/runtime/vm_operations.cpp ! src/share/vm/services/memTracker.hpp ! src/share/vm/utilities/array.cpp ! src/share/vm/utilities/debug.cpp ! src/share/vm/utilities/events.cpp ! src/share/vm/utilities/exceptions.cpp ! src/share/vm/utilities/growableArray.cpp ! src/share/vm/utilities/preserveException.hpp ! src/share/vm/utilities/taskqueue.cpp ! src/share/vm/utilities/workgroup.hpp Changeset: 2fc0334f613a Author: johnc Date: 2012-11-27 14:11 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2fc0334f613a 7194633: G1: Assertion and guarantee failures in block offset table Summary: Add detailed error messages to assertions and guarantees in G1's block offset table. Reviewed-by: ysr, brutisso ! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp ! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp ! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp ! src/share/vm/memory/space.cpp Changeset: c24f778e9401 Author: johnc Date: 2012-11-29 11:23 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c24f778e9401 Merge ! src/share/vm/gc_interface/collectedHeap.inline.hpp ! src/share/vm/memory/universe.cpp ! src/share/vm/prims/jni.cpp ! src/share/vm/runtime/vmStructs.cpp Changeset: b2dbd323c668 Author: jiangli Date: 2012-11-27 17:03 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b2dbd323c668 8003848: Make ConstMethod::generic_signature_index optional and move Method::_max_stack to ConstMethod. Summary: Make ConstMethod::generic_signature_index optional and move Method::_max_stack to ConstMethod. Reviewed-by: bdelsart, sspitsyn, coleenp ! agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java ! agent/src/share/classes/sun/jvm/hotspot/oops/Method.java ! src/cpu/sparc/vm/cppInterpreter_sparc.cpp ! src/cpu/sparc/vm/interp_masm_sparc.cpp ! src/cpu/sparc/vm/templateInterpreter_sparc.cpp ! src/cpu/x86/vm/cppInterpreter_x86.cpp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/defaultMethods.cpp ! src/share/vm/oops/constMethod.cpp ! src/share/vm/oops/constMethod.hpp ! src/share/vm/oops/method.cpp ! src/share/vm/oops/method.hpp ! src/share/vm/runtime/vmStructs.cpp Changeset: 5505fbbae3d3 Author: cjplummer Date: 2012-11-29 13:55 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5505fbbae3d3 Merge ! src/cpu/sparc/vm/interp_masm_sparc.cpp ! src/share/vm/oops/method.cpp ! src/share/vm/oops/method.hpp ! src/share/vm/runtime/vmStructs.cpp Changeset: 90273fc0a981 Author: coleenp Date: 2012-11-29 16:50 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/90273fc0a981 8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap Summary: Add ClassLoaderData object for each anonymous class with metaspaces to allocate in. Reviewed-by: twisti, jrose, stefank ! src/share/vm/asm/codeBuffer.cpp ! src/share/vm/ci/ciReplay.cpp ! src/share/vm/ci/ciReplay.hpp ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/classFileParser.hpp ! src/share/vm/classfile/classLoader.cpp ! src/share/vm/classfile/classLoaderData.cpp ! src/share/vm/classfile/classLoaderData.hpp ! src/share/vm/classfile/classLoaderData.inline.hpp ! src/share/vm/classfile/dictionary.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/loaderConstraints.cpp ! src/share/vm/classfile/systemDictionary.cpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/compiler/compileBroker.cpp ! src/share/vm/compiler/compileBroker.hpp ! src/share/vm/memory/metachunk.hpp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/metaspace.hpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/constantPool.cpp ! src/share/vm/oops/klass.cpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/prims/unsafe.cpp Changeset: dad48145e775 Author: stefank Date: 2012-11-29 23:02 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/dad48145e775 8004199: Change the ASM package for Test8003720 Reviewed-by: kvn, jrose ! test/runtime/8003720/Asmator.java ! test/runtime/8003720/Test8003720.java Changeset: 5fafdef522c6 Author: johnc Date: 2012-11-30 12:01 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/5fafdef522c6 Merge ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/memory/metaspace.cpp ! src/share/vm/memory/metaspace.hpp ! src/share/vm/memory/universe.cpp Changeset: b61d9c88b759 Author: amurillo Date: 2012-11-30 16:45 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b61d9c88b759 Merge Changeset: 25bdce771bb3 Author: amurillo Date: 2012-11-30 16:45 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/25bdce771bb3 Added tag hs25-b11 for changeset b61d9c88b759 ! .hgtags Changeset: 10587a580c51 Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/10587a580c51 Added tag jdk8-b67 for changeset 25bdce771bb3 ! .hgtags Changeset: 1cee6350b936 Author: wmdietl Date: 2012-12-10 16:34 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1cee6350b936 Automated merge with http://hg.openjdk.java.net/jdk8/jdk8/hotspot ! .hgtags From wdietl at gmail.com Mon Dec 10 16:36:33 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:36:33 +0000 Subject: hg: type-annotations/type-annotations/corba: 2 new changesets Message-ID: <20121211003635.EEF1B4702D@hg.openjdk.java.net> Changeset: 82000531feaa Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/82000531feaa Added tag jdk8-b67 for changeset 394515ad2a55 ! .hgtags Changeset: c4938ce63fa3 Author: wmdietl Date: 2012-12-10 16:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/c4938ce63fa3 Automated merge with http://hg.openjdk.java.net/jdk8/jdk8/corba ! .hgtags From wdietl at gmail.com Mon Dec 10 16:37:25 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:37:25 +0000 Subject: hg: type-annotations/type-annotations: 9 new changesets Message-ID: <20121211003725.E236D4702E@hg.openjdk.java.net> Changeset: fb1bf5e5bc9e Author: henryjen Date: 2012-12-06 15:38 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/fb1bf5e5bc9e 8004685: add java.util.function to CORE_PKGS.gmk Reviewed-by: mduigou ! common/makefiles/javadoc/CORE_PKGS.gmk Changeset: d6c59dfaeef9 Author: wmdietl Date: 2012-12-10 16:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/d6c59dfaeef9 Automated merge with http://hg.openjdk.java.net/jdk8/tl/ Changeset: 98a7af257bee Author: erikj Date: 2012-12-03 10:26 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/98a7af257bee 8003819: build-infra: backslashes at end of LIB and INCLUDE in spec.gmk Summary: Removing trailing backslash from LIB and INCLUDE. Reviewed-by: ohrstrom, ohair ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain_windows.m4 Changeset: 754f91d22e1c Author: erikj Date: 2012-12-05 09:39 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/754f91d22e1c 8001541: Cannot build on Solaris using softlinks Summary: Fixed softlink resolver macro in configure. Reviewed-by: tbell, ohair ! common/autoconf/basics.m4 ! common/autoconf/generated-configure.sh Changeset: ec187d02c95e Author: erikj Date: 2012-12-05 10:12 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/ec187d02c95e 8004281: build-infra: Move all jar creation to images target and put jars in images/lib Summary: Fixed bug in setting up make dependencies in SetupArchive. Reviewed-by: ohair, tbell, dholmes ! common/makefiles/JavaCompilation.gmk Changeset: bd32ef0789ca Author: erikj Date: 2012-12-05 16:35 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/bd32ef0789ca 8003414: build-infra: fails on on windows Summary: Added extra check that windows sdk is valid. Reviewed-by: tbell, ohrstrom, ohair ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain_windows.m4 Changeset: 9a6ec97ec45c Author: katleman Date: 2012-12-05 12:52 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/9a6ec97ec45c Merge Changeset: c91c581321ce Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/c91c581321ce Added tag jdk8-b67 for changeset 9a6ec97ec45c ! .hgtags Changeset: a3b6cfaeaaa1 Author: wmdietl Date: 2012-12-10 16:37 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/a3b6cfaeaaa1 Automated merge with http://hg.openjdk.java.net/jdk8/jdk8 ! .hgtags From wdietl at gmail.com Mon Dec 10 16:32:38 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:32:38 +0000 Subject: hg: type-annotations/type-annotations/jdk: 24 new changesets Message-ID: <20121211003759.5E4324702F@hg.openjdk.java.net> Changeset: f657adf4fe78 Author: alanb Date: 2012-12-02 16:37 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f657adf4fe78 8003846: Override mechanism for currency data should not require creating currency.properties in java.home Reviewed-by: naoto ! src/share/classes/java/util/Currency.java ! test/java/util/Currency/PropertiesTest.java ! test/java/util/Currency/PropertiesTest.sh Changeset: 60550cd2b527 Author: dholmes Date: 2012-12-02 19:16 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/60550cd2b527 7200297: agent code does not handle multiple boot library path elements correctly Summary: When bug 6819213 was fixed it enabled sun.boot.library.path property to contain multiple paths. Code in agents does not handle multiple paths when attempting to find dependent shared libs. Reviewed-by: dholmes, sspitsyn, dsamersoff Contributed-by: Bill Pittore ! src/share/back/debugInit.c ! src/share/back/error_messages.c ! src/share/back/transport.c ! src/share/demo/jvmti/hprof/hprof.h ! src/share/demo/jvmti/hprof/hprof_init.c ! src/solaris/back/linker_md.c ! src/solaris/demo/jvmti/hprof/hprof_md.c ! src/solaris/npt/npt_md.h ! src/windows/back/linker_md.c ! src/windows/demo/jvmti/hprof/hprof_md.c ! src/windows/npt/npt_md.h Changeset: a42da685dfca Author: weijun Date: 2012-12-03 17:14 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a42da685dfca 7198507: [TEST_BUG] sun/security/tools/keytool/console.sh should be rewritten Reviewed-by: xuelei ! test/sun/security/tools/keytool/console.sh Changeset: ead651efb271 Author: xuelei Date: 2012-12-03 06:00 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ead651efb271 8004184: security tests leave JSSEServer running Summary: Use othervm mode to release resources, and correct the system properties issues in JSSE Reviewed-by: chegar ! test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Changeset: ee9846f351d7 Author: mullan Date: 2012-12-03 11:07 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ee9846f351d7 7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout Summary: Added com.sun.security.ocsp.timeout system property to control timeout Reviewed-by: mullan, vinnie Contributed-by: jason.uh at oracle.com ! src/share/classes/sun/security/provider/certpath/OCSP.java Changeset: 38ec2838dd86 Author: dxu Date: 2012-12-04 14:07 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/38ec2838dd86 7142921: (fs) Files.probeContentType reports a MIME type of "text/plain" on Ubuntu 11.04 7144997: (fs) Files.probeContentType returns null on Solaris 64-bit Reviewed-by: alanb, mduigou ! make/java/nio/Makefile ! make/java/nio/mapfile-linux ! makefiles/CompileJavaClasses.gmk ! makefiles/CompileNativeLibraries.gmk ! makefiles/mapfiles/libnio/mapfile-linux ! src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java ! src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java ! src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java + src/solaris/classes/sun/nio/fs/MagicFileTypeDetector.java + src/solaris/classes/sun/nio/fs/MimeTypesFileTypeDetector.java ! src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java ! src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java + src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Changeset: 2e8863c4f7d0 Author: kmo Date: 2012-12-04 15:10 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2e8863c4f7d0 8004066: TEST_BUG: test/java/lang/Math/DivModTests.java assumes ArithmeticException message Reviewed-by: twisti, alanb, dholmes ! test/java/lang/Math/DivModTests.java Changeset: 7004848974a2 Author: jgish Date: 2012-12-04 20:21 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7004848974a2 8003596: TEST_BUG: java/util/logging/CheckLockLocationTest.java failing [win] Reviewed-by: alanb ! test/ProblemList.txt ! test/java/util/logging/CheckLockLocationTest.java Changeset: 44ae777564eb Author: mullan Date: 2012-12-04 17:40 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/44ae777564eb 8004188: Rename src/share/lib/security/java.security to java.security-linux Reviewed-by: mullan, mchung Contributed-by: jason.uh at oracle.com ! make/java/security/Makefile - src/share/lib/security/java.security + src/share/lib/security/java.security-linux Changeset: b54a5b7d2e65 Author: alanb Date: 2012-12-05 12:20 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b54a5b7d2e65 8004491: Build breakage on Linux due to 8004188 Reviewed-by: chegar, erikj ! makefiles/CopyFiles.gmk Changeset: a971516029ab Author: jgish Date: 2012-12-05 21:08 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a971516029ab 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks ! test/java/rmi/testlibrary/TestLibrary.java Changeset: 41a1b110f34d Author: lancea Date: 2012-12-06 15:51 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/41a1b110f34d 8004374: CachedRowSetSwriter.writeData reports wrong number of conflicts in SyncProviderException Reviewed-by: naoto ! src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java Changeset: 896d4af2ebfd Author: rfield Date: 2012-12-06 21:55 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/896d4af2ebfd 8003881: Prevent lambda implementing inner classes from allowing the creation of new instances Summary: Lambda implementing inner classes now has private constructor (thanks Kumar) Reviewed-by: ksrini ! src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java + test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java + test/java/lang/invoke/lambda/LambdaAccessControlTest.java Changeset: da387f0cecb7 Author: ksrini Date: 2012-12-09 07:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/da387f0cecb7 8004042: Arrrghs.java test failed on windows with access error. Reviewed-by: smarks, jjh, ksrini Contributed-by: david.dehaven at oracle.com ! test/tools/launcher/Arrrghs.java ! test/tools/launcher/TestHelper.java Changeset: 343615aa0539 Author: dxu Date: 2012-12-09 19:13 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/343615aa0539 7194370: (fs) WatchService fails if volume S/N is 0 [win] Reviewed-by: alanb, forax ! src/windows/classes/sun/nio/fs/WindowsFileAttributes.java Changeset: fda257689786 Author: okutsu Date: 2012-12-10 10:52 +0900 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/fda257689786 8000983: Support narrow display names for calendar fields 8003267: Support generic time zone names in TimeZoneNameProvider (SPI) Reviewed-by: naoto ! make/tools/src/build/tools/cldrconverter/Bundle.java ! make/tools/src/build/tools/cldrconverter/BundleGenerator.java ! make/tools/src/build/tools/cldrconverter/CLDRConverter.java ! make/tools/src/build/tools/cldrconverter/LDMLParseHandler.java ! make/tools/src/build/tools/cldrconverter/MetaZonesParseHandler.java ! make/tools/src/build/tools/cldrconverter/ResourceBundleGenerator.java ! src/share/classes/java/text/DateFormatSymbols.java ! src/share/classes/java/text/SimpleDateFormat.java ! src/share/classes/java/util/Calendar.java ! src/share/classes/java/util/JapaneseImperialCalendar.java ! src/share/classes/java/util/TimeZone.java ! src/share/classes/java/util/spi/CalendarNameProvider.java ! src/share/classes/java/util/spi/TimeZoneNameProvider.java ! src/share/classes/sun/text/resources/FormatData.java ! src/share/classes/sun/text/resources/ar/FormatData_ar.java ! src/share/classes/sun/text/resources/be/FormatData_be.java ! src/share/classes/sun/text/resources/bg/FormatData_bg.java ! src/share/classes/sun/text/resources/ca/FormatData_ca.java ! src/share/classes/sun/text/resources/cs/FormatData_cs.java ! src/share/classes/sun/text/resources/da/FormatData_da.java ! src/share/classes/sun/text/resources/de/FormatData_de.java ! src/share/classes/sun/text/resources/el/FormatData_el.java ! src/share/classes/sun/text/resources/es/FormatData_es.java ! src/share/classes/sun/text/resources/et/FormatData_et.java ! src/share/classes/sun/text/resources/fi/FormatData_fi.java ! src/share/classes/sun/text/resources/fr/FormatData_fr.java ! src/share/classes/sun/text/resources/hi/FormatData_hi_IN.java ! src/share/classes/sun/text/resources/hr/FormatData_hr.java ! src/share/classes/sun/text/resources/hu/FormatData_hu.java ! src/share/classes/sun/text/resources/is/FormatData_is.java ! src/share/classes/sun/text/resources/it/FormatData_it.java ! src/share/classes/sun/text/resources/iw/FormatData_iw.java ! src/share/classes/sun/text/resources/ja/FormatData_ja.java ! src/share/classes/sun/text/resources/ko/FormatData_ko.java ! src/share/classes/sun/text/resources/lt/FormatData_lt.java ! src/share/classes/sun/text/resources/lv/FormatData_lv.java ! src/share/classes/sun/text/resources/mk/FormatData_mk.java ! src/share/classes/sun/text/resources/ms/FormatData_ms.java ! src/share/classes/sun/text/resources/mt/FormatData_mt.java ! src/share/classes/sun/text/resources/nl/FormatData_nl.java ! src/share/classes/sun/text/resources/pl/FormatData_pl.java ! src/share/classes/sun/text/resources/pt/FormatData_pt.java ! src/share/classes/sun/text/resources/ro/FormatData_ro.java ! src/share/classes/sun/text/resources/ru/FormatData_ru.java ! src/share/classes/sun/text/resources/sk/FormatData_sk.java ! src/share/classes/sun/text/resources/sl/FormatData_sl.java ! src/share/classes/sun/text/resources/sq/FormatData_sq.java ! src/share/classes/sun/text/resources/sr/FormatData_sr.java ! src/share/classes/sun/text/resources/sv/FormatData_sv.java ! src/share/classes/sun/text/resources/th/FormatData_th.java ! src/share/classes/sun/text/resources/tr/FormatData_tr.java ! src/share/classes/sun/text/resources/uk/FormatData_uk.java ! src/share/classes/sun/text/resources/vi/FormatData_vi.java ! src/share/classes/sun/text/resources/zh/FormatData_zh.java ! src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java ! src/share/classes/sun/util/locale/provider/CalendarDataUtility.java ! src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java ! src/share/classes/sun/util/locale/provider/LocaleResources.java ! src/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java ! src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java ! src/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java ! src/share/classes/sun/util/resources/LocaleData.java ! src/share/classes/sun/util/resources/OpenListResourceBundle.java ! src/share/classes/sun/util/resources/TimeZoneNames.java ! src/share/classes/sun/util/resources/TimeZoneNamesBundle.java + test/java/util/Calendar/GenericTimeZoneNamesTest.java + test/java/util/Calendar/GenericTimeZoneNamesTest.sh + test/java/util/Calendar/NarrowNamesTest.java + test/java/util/Calendar/NarrowNamesTest.sh ! test/java/util/PluggableLocale/GenericTest.java ! test/java/util/PluggableLocale/TimeZoneNameProviderTest.java ! test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh ! test/java/util/PluggableLocale/barprovider.jar + test/java/util/PluggableLocale/providersrc/GenericTimeZoneNameProviderImpl.java ! test/java/util/PluggableLocale/providersrc/Makefile ! test/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider ! test/sun/text/resources/LocaleData ! test/sun/text/resources/LocaleDataTest.java Changeset: fda2b2b5b98b Author: michaelm Date: 2012-12-10 14:56 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/fda2b2b5b98b 8003948: NTLM/Negotiate authentication problem Reviewed-by: chegar, weijun ! src/share/classes/sun/net/www/MessageHeader.java ! src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java + test/sun/net/www/MessageHeaderTest.java Changeset: cac1bfaceaaa Author: mchung Date: 2012-12-10 15:15 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cac1bfaceaaa 4819681: Typo in http://java.sun.com/j2se/1.4.1/docs/api/java/util/logging/LogManager.html Summary: Simple capitalization typo in LogManager() description Reviewed-by: darcy, mchung ! src/share/classes/java/util/logging/LogManager.java Changeset: c3c364e358f5 Author: wmdietl Date: 2012-12-10 16:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c3c364e358f5 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk Changeset: b0f008ab45d7 Author: twisti Date: 2012-11-30 11:42 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b0f008ab45d7 8001885: JSR 292 classes should use jdk.internal.org.objectweb.asm Reviewed-by: kvn, jrose, twisti Contributed-by: David Chase ! src/share/classes/java/lang/invoke/BoundMethodHandle.java ! src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Changeset: 0fda013e4638 Author: erikj Date: 2012-12-05 10:12 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0fda013e4638 8004281: build-infra: Move all jar creation to images target and put jars in images/lib Reviewed-by: ohair, tbell, dholmes ! makefiles/CompileDemos.gmk ! makefiles/CompileJavaClasses.gmk ! makefiles/CreateJars.gmk ! makefiles/Images.gmk ! makefiles/Import.gmk Changeset: ce9b02a3a17e Author: katleman Date: 2012-12-05 12:53 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ce9b02a3a17e Merge Changeset: ea0d3a9d0d01 Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ea0d3a9d0d01 Added tag jdk8-b67 for changeset ce9b02a3a17e ! .hgtags Changeset: dea35877ac1c Author: wmdietl Date: 2012-12-10 16:32 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/dea35877ac1c Automated merge with http://hg.openjdk.java.net/jdk8/jdk8/jdk ! .hgtags ! makefiles/CompileJavaClasses.gmk - src/share/lib/security/java.security From wdietl at gmail.com Mon Dec 10 16:38:03 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:38:03 +0000 Subject: hg: type-annotations/type-annotations/jaxws: 2 new changesets Message-ID: <20121211003810.A40FB47030@hg.openjdk.java.net> Changeset: d3fe408f3a9a Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/d3fe408f3a9a Added tag jdk8-b67 for changeset eb06aa51dfc2 ! .hgtags Changeset: 7fde3f0e783d Author: wmdietl Date: 2012-12-10 16:37 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/7fde3f0e783d Automated merge with http://hg.openjdk.java.net/jdk8/jdk8/jaxws ! .hgtags From wdietl at gmail.com Mon Dec 10 16:38:42 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 00:38:42 +0000 Subject: hg: type-annotations/type-annotations/jaxp: 2 new changesets Message-ID: <20121211003854.11E3247031@hg.openjdk.java.net> Changeset: b854e7008421 Author: katleman Date: 2012-12-06 12:04 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/b854e7008421 Added tag jdk8-b67 for changeset 83df3493ca3c ! .hgtags Changeset: 3ee2df0f622b Author: wmdietl Date: 2012-12-10 16:38 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/3ee2df0f622b Automated merge with http://hg.openjdk.java.net/jdk8/jdk8/jaxp ! .hgtags From wdietl at gmail.com Mon Dec 10 20:01:06 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Tue, 11 Dec 2012 04:01:06 +0000 Subject: hg: type-annotations/type-annotations/langtools: Small refactorings to make the code more reusable. Message-ID: <20121211040112.5F7FB4703B@hg.openjdk.java.net> Changeset: 2b168bbf1ce1 Author: wmdietl Date: 2012-12-10 20:00 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2b168bbf1ce1 Small refactorings to make the code more reusable. ! src/share/classes/com/sun/tools/classfile/ClassWriter.java ! src/share/classes/com/sun/tools/classfile/TypeAnnotation.java ! src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java From steve.sides at oracle.com Tue Dec 11 12:01:15 2012 From: steve.sides at oracle.com (Steve Sides) Date: Tue, 11 Dec 2012 12:01:15 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C67395.7050503@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> Message-ID: <50C7910B.2030800@oracle.com> On 12/10/2012 3:43 PM, Alex Buckley wrote: > On 12/10/2012 3:36 PM, Werner Dietl wrote: >> I pushed a changed bytecode representation yesterday, but there are >> still some open issues with counting inner types. >> Do you have a cut-off date for what will get into this next binary >> build? > > As I understand it: (Steve, please fill in) > > 1. We build internally on any day when there is a change in the > type-annotations forest. > > 2. Publishing on java.net is triggered manually, but is not difficult. > > At the worst, we can publish binaries built earlier today with your > changed bytecode representation, and then publish new binaries later > this week after you push the inner types work. > > Alex 1. Correct. Builds will happen once daily if there are changes. It will not happen if there are no changes. However, even if changes come in after the scheduled check, we can trigger a build manually if requested. --- all builds then undergo testing upon build completion of each platform. 2. Correct. After verifying test results, we can promote. The build happening now, to be promoted this afternoon, contains any changes up through ~7:30 this morning. We can promote (publish the binaries) any time. Just let us know. Is there yet a regularly scheduled promotion we want to set up, or continue to do this upon request? -steve From alex.buckley at oracle.com Tue Dec 11 12:12:58 2012 From: alex.buckley at oracle.com (Alex Buckley) Date: Tue, 11 Dec 2012 12:12:58 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C7910B.2030800@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> Message-ID: <50C793CA.2030501@oracle.com> On 12/11/2012 12:01 PM, Steve Sides wrote: > Is there yet a regularly scheduled promotion we want to set up, or > continue to do this upon request? Steve, you may want to explain precisely what a "promotion" is on this public list. I'm happy to continue to promote on request. Werner can make the request too. Alex From steve.sides at oracle.com Tue Dec 11 15:57:31 2012 From: steve.sides at oracle.com (Steve Sides) Date: Tue, 11 Dec 2012 15:57:31 -0800 Subject: Type Annotations binary build (b68) available In-Reply-To: <50C7910B.2030800@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> Message-ID: <50C7C86B.3090409@oracle.com> I am pleased to announce the latest binary builds of the JSR 308 Reference Implementation are available at http://jdk8.java.net/type-annotations Please see the Type Annotations project page for a link to the JSR 308 Specification. There is also a changelog, which is important to review as there have been significant spec changes in 2012. The builds were generated from the type-annotations/type-annotations forest on 12/11. This forest is regularly updated from jdk8/jdk8 and jdk8/tl. Werner can provide exact details. Steve From steve.sides at oracle.com Tue Dec 11 16:41:26 2012 From: steve.sides at oracle.com (Steve Sides) Date: Tue, 11 Dec 2012 16:41:26 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C793CA.2030501@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> <50C793CA.2030501@oracle.com> Message-ID: <50C7D2B6.3000700@oracle.com> On 12/11/2012 12:12 PM, Alex Buckley wrote: > On 12/11/2012 12:01 PM, Steve Sides wrote: >> Is there yet a regularly scheduled promotion we want to set up, or >> continue to do this upon request? > > Steve, you may want to explain precisely what a "promotion" is on this > public list. > > I'm happy to continue to promote on request. Werner can make the > request too. > > Alex We create a number of nightly builds and most of them only live a few days to be consumed only by the development and test organization. "promotion"is simply a term referring to the process of moving a build to a more permanent location. Some builds are promoted for more extensive testing and, in this case, some to java.net, where they can live on into the foreseeable future. :) -steve From alex.buckley at oracle.com Tue Dec 11 16:59:01 2012 From: alex.buckley at oracle.com (Alex Buckley) Date: Tue, 11 Dec 2012 16:59:01 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C7D2B6.3000700@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> <50C793CA.2030501@oracle.com> <50C7D2B6.3000700@oracle.com> Message-ID: <50C7D6D5.1070303@oracle.com> Thanks Steve, I hope this is useful for Werner and others. On 12/11/2012 4:41 PM, Steve Sides wrote: > On 12/11/2012 12:12 PM, Alex Buckley wrote: >> On 12/11/2012 12:01 PM, Steve Sides wrote: >>> Is there yet a regularly scheduled promotion we want to set up, or >>> continue to do this upon request? >> >> Steve, you may want to explain precisely what a "promotion" is on this >> public list. >> >> I'm happy to continue to promote on request. Werner can make the >> request too. >> >> Alex > > We create a number of nightly builds and most of them only live a few > days to be consumed only by the development and test organization. > "promotion"is simply a term referring to the process of moving a build > to a more permanent location. Some builds are promoted for more > extensive testing and, in this case, some to java.net, where they can > live on into the foreseeable future. :) > > -steve From wdietl at gmail.com Tue Dec 11 21:25:51 2012 From: wdietl at gmail.com (Werner Dietl) Date: Tue, 11 Dec 2012 21:25:51 -0800 Subject: ElementType.TYPE_USE for a type parameter In-Reply-To: <50C7D6D5.1070303@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> <50C793CA.2030501@oracle.com> <50C7D2B6.3000700@oracle.com> <50C7D6D5.1070303@oracle.com> Message-ID: Thanks for the binary build and background info, Steve! I think we should plan for one more build this month, once the bytecode representation is finalized. cu, WMD. On Tue, Dec 11, 2012 at 4:59 PM, Alex Buckley wrote: > Thanks Steve, I hope this is useful for Werner and others. > > > On 12/11/2012 4:41 PM, Steve Sides wrote: >> >> On 12/11/2012 12:12 PM, Alex Buckley wrote: >>> >>> On 12/11/2012 12:01 PM, Steve Sides wrote: >>>> >>>> Is there yet a regularly scheduled promotion we want to set up, or >>>> continue to do this upon request? >>> >>> >>> Steve, you may want to explain precisely what a "promotion" is on this >>> public list. >>> >>> I'm happy to continue to promote on request. Werner can make the >>> request too. >>> >>> Alex >> >> >> We create a number of nightly builds and most of them only live a few >> days to be consumed only by the development and test organization. >> "promotion"is simply a term referring to the process of moving a build >> to a more permanent location. Some builds are promoted for more >> extensive testing and, in this case, some to java.net, where they can >> live on into the foreseeable future. :) >> >> -steve -- http://www.google.com/profiles/wdietl From pbenedict at apache.org Thu Dec 13 07:52:40 2012 From: pbenedict at apache.org (Paul Benedict) Date: Thu, 13 Dec 2012 09:52:40 -0600 Subject: =?windows-1252?Q?Type_annotation_appears_before_the_type=92s_simple_n?= =?windows-1252?Q?ame?= Message-ID: Regarding examples: 1) Map. at NonNull Entry 2) java.util. @Marker List vs. 1) @NonNull Map.Entry 2) @Marker java.util.List Can someone please explain why the EG prefers putting the type annotations inside the qualified name (right before the simple name) rather than at the beginning? Is there a strong benefit to the developer? It strikes me odd that breaking up a qualified name is the preferred approach. It seems to go against the 99% usage in the rest of the spec. Thank you! Paul From wdietl at gmail.com Thu Dec 13 12:06:50 2012 From: wdietl at gmail.com (Werner Dietl) Date: Thu, 13 Dec 2012 12:06:50 -0800 Subject: =?windows-1252?Q?Re=3A_Type_annotation_appears_before_the_type=92s_simp?= =?windows-1252?Q?le_name?= In-Reply-To: References: Message-ID: Hi Paul, thanks for your interest in type-annotations and your comments. This is the developers mailing list. For questions to the EG you have to message the type-annotations-spec-comments mailing list. This syntax was recently changed, as raised by Srikanth: http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2012-October/000012.html I do prefer this new syntax and was advocating for it when we initially discussed this issue. To me, it is more logical to have the annotation right before the element you want to annotate. Also, it made the implementation in OpenJDK significantly simpler. In your first examples: > 1a) Map. at NonNull Entry > 1b) @NonNull Map.Entry In the old approach (example 1b), it depends on whether class Map.Entry is a static inner class or not to decide where the annotation belongs. For non-static nested classes, all three of the following are possible: Outer. @A Inner @A Outer.Inner @A Outer. @B Inner It makes parsing easier if this semantic knowledge is not needed to decide where to attach the annotation. Similarly for package names: > 2a) java.util. @Marker List > 2b) @Marker java.util.List In 2a we can simply attach the annotation on List. In 2b we need to know whether java or util are the right class to attach to. In the implementation, this changeset: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4e24226764cb removes the ugly "onRightType" hack that was necessary to support the previous syntax. So to me the approach of putting type annotations before the type's simple name seems both more logical and easier to implement. Please do let me know whether this makes sense or whether I should elaborate more on some aspect. I am also not quite sure what you mean with "It seems to go against the 99% usage in the rest of the spec." Could you elaborate on what your concerns are? For an answer from the EG you probably need to re-send your message to the spec-comments list. Thanks, cu, WMD. -- http://www.google.com/profiles/wdietl From alex.buckley at oracle.com Thu Dec 13 13:11:57 2012 From: alex.buckley at oracle.com (Alex Buckley) Date: Thu, 13 Dec 2012 13:11:57 -0800 Subject: Type annotation appears before the =?windows-1252?Q?type=92s?= =?windows-1252?Q?_simple_name?= In-Reply-To: References: Message-ID: <50CA449D.1020000@oracle.com> Werner, thanks for jumping in. As you say, any question about an EG decision should be sent to type-annotations-spec-comments. Paul, see the type-annotations-spec-experts list in October and November for discussion of the issue. The available lists are described at http://openjdk.java.net/projects/type-annotations/. Alex On 12/13/2012 12:06 PM, Werner Dietl wrote: > Hi Paul, > > thanks for your interest in type-annotations and your comments. > > This is the developers mailing list. For questions to the EG you have > to message the type-annotations-spec-comments mailing list. > > This syntax was recently changed, as raised by Srikanth: > > http://mail.openjdk.java.net/pipermail/type-annotations-spec-experts/2012-October/000012.html > > I do prefer this new syntax and was advocating for it when we > initially discussed this issue. > To me, it is more logical to have the annotation right before the > element you want to annotate. > Also, it made the implementation in OpenJDK significantly simpler. > > In your first examples: > >> 1a) Map. at NonNull Entry >> 1b) @NonNull Map.Entry > > In the old approach (example 1b), it depends on whether class > Map.Entry is a static inner class or not to decide where the > annotation belongs. > For non-static nested classes, all three of the following are possible: > > Outer. @A Inner > @A Outer.Inner > @A Outer. @B Inner > > It makes parsing easier if this semantic knowledge is not needed to > decide where to attach the annotation. > Similarly for package names: > >> 2a) java.util. @Marker List >> 2b) @Marker java.util.List > > In 2a we can simply attach the annotation on List. > In 2b we need to know whether java or util are the right class to attach to. > > In the implementation, this changeset: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4e24226764cb > > removes the ugly "onRightType" hack that was necessary to support the > previous syntax. > > So to me the approach of putting type annotations before the type's > simple name seems both more logical and easier to implement. > Please do let me know whether this makes sense or whether I should > elaborate more on some aspect. > > I am also not quite sure what you mean with "It seems to go against > the 99% usage in the rest of the > spec." Could you elaborate on what your concerns are? > > For an answer from the EG you probably need to re-send your message to > the spec-comments list. > > Thanks, > cu, WMD. > From pbenedict at apache.org Thu Dec 13 13:34:07 2012 From: pbenedict at apache.org (Paul Benedict) Date: Thu, 13 Dec 2012 15:34:07 -0600 Subject: =?windows-1252?Q?Re=3A_Type_annotation_appears_before_the_type=92s_simp?= =?windows-1252?Q?le_name?= In-Reply-To: <50CA449D.1020000@oracle.com> References: <50CA449D.1020000@oracle.com> Message-ID: Thank you all! My apologies for choosing the wrong list. If I do have any further concerns, the -comments list will receive them. Thank you. On Thu, Dec 13, 2012 at 3:11 PM, Alex Buckley wrote: > Werner, thanks for jumping in. As you say, any question about an EG decision > should be sent to type-annotations-spec-comments. > > Paul, see the type-annotations-spec-experts list in October and November for > discussion of the issue. > > The available lists are described at > http://openjdk.java.net/projects/type-annotations/. > From steve.sides at oracle.com Fri Dec 14 14:14:50 2012 From: steve.sides at oracle.com (Steve Sides) Date: Fri, 14 Dec 2012 14:14:50 -0800 Subject: review request for type-annotations tests Message-ID: <50CBA4DA.2090206@oracle.com> Hi all, This includes tests for combinations of target types on type usage added to tools/javac/annotations/typeAnnotations/classfile. That is, test of various combinations like @Target({TYPE_USE,_OTHER_}) on various type usages(mainly inside method bodies). It also refactored some common code from tools/javac/annotations/typeAnnotations/classfile tests into a test helper. This makes the tests a bit easier to read and easier to extend or add on to if needed. I added ability to count RuntimeAnnotations as well as RuntimeTypeAnnotations as some annotations result in two for certain declarations and this should be checked. Also, the WildCards test was loading up a test class from another test ("NewTypeArguments$Test.class"). I assumed this should be "WildCards$Test.class". -steve -------------- next part -------------- A non-text attachment was scrubbed... Name: 8005085.tar.gz Type: application/x-gzip Size: 39044 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/type-annotations-dev/attachments/20121214/6fa0fce7/8005085.tar-0001.gz From wdietl at gmail.com Mon Dec 17 00:25:42 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:25:42 +0000 Subject: hg: type-annotations/type-annotations/langtools: 16 new changesets Message-ID: <20121217082628.3286A471C0@hg.openjdk.java.net> Changeset: a43c94235366 Author: wmdietl Date: 2012-12-16 23:29 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a43c94235366 Big refactoring: one entry method, one class, don't modify parameters and return them, correctly count arrays and nested types, add some documentation, and smaller cleanups. ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Changeset: 8fdf095581b0 Author: wmdietl Date: 2012-12-16 23:33 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8fdf095581b0 Determine all type annotation positions once: at the end of attributing classes. ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Enter.java Changeset: 398d3d28610f Author: wmdietl Date: 2012-12-16 23:41 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/398d3d28610f methodDeclaratorRest no longer needs [Annotations] - those were for the receiver, which is now an extra parameter. Add a note about old-style arrays, which might need a change here. insertAnnotationsToMostInner did not correctly handle nested types - make sure we move the annotation to the right spot in the AST. ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java Changeset: defd8146abbb Author: wmdietl Date: 2012-12-16 23:43 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/defd8146abbb Adapt test classes to changed bytecode format, in particular inner classes. Note that the test classes are nested one level within the surrounding class, requiring the extra {1, 0} in some places. ! test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Changeset: fcf89720ae71 Author: vromero Date: 2012-12-10 16:21 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/fcf89720ae71 8003967: detect and remove all mutable implicit static enum fields in langtools Reviewed-by: jjg ! src/share/classes/com/sun/tools/classfile/Opcode.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java ! src/share/classes/com/sun/tools/javac/Server.java ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/code/Kinds.java ! src/share/classes/com/sun/tools/javac/code/Lint.java ! src/share/classes/com/sun/tools/javac/code/Source.java ! src/share/classes/com/sun/tools/javac/code/TargetType.java ! src/share/classes/com/sun/tools/javac/code/TypeTag.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/ConstFold.java ! src/share/classes/com/sun/tools/javac/comp/Flow.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/jvm/Target.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/main/Option.java ! src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java ! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/util/BaseFileManager.java ! src/share/classes/com/sun/tools/javac/util/List.java ! src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java ! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java ! src/share/classes/com/sun/tools/javah/JavahTask.java ! src/share/classes/com/sun/tools/javap/JavapTask.java ! src/share/classes/javax/lang/model/element/Modifier.java ! src/share/classes/javax/lang/model/util/ElementFilter.java ! src/share/classes/javax/tools/StandardLocation.java + test/tools/javac/T8003967/DetectMutableStaticFields.java Changeset: cfde9737131e Author: jjg Date: 2012-12-11 15:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cfde9737131e 8004828: refactor init of *DocImpl classes Reviewed-by: darcy ! src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java ! src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java ! src/share/classes/com/sun/tools/javadoc/DocEnv.java ! src/share/classes/com/sun/tools/javadoc/DocImpl.java ! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java ! src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java ! src/share/classes/com/sun/tools/javadoc/JavadocEnter.java ! src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java ! src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java ! src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java ! src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java ! src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Changeset: 170e486632d9 Author: jlahoda Date: 2012-12-12 20:26 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/170e486632d9 8004504: ListBuffer could reuse List.nil() as the sentinel element Summary: ListBuffer.last now points to the last elements with client data, or null if none. Reviewed-by: jjg, mcimadamore ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/util/ListBuffer.java + test/tools/javac/util/list/ListBufferTest.java Changeset: 376d6c1b49e5 Author: jfranck Date: 2012-12-03 11:16 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/376d6c1b49e5 8001114: Container annotation is not checked for semantic correctness Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Annotations.java ! src/share/classes/com/sun/tools/javac/comp/Annotate.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/resources/compiler.properties ! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java ! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out ! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java ! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out ! test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out + test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java + test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out ! test/tools/javac/diags/examples/ContainedByNonDefault.java + test/tools/javac/diags/examples/InvalidDuplicateAnnotation.java Changeset: 37a5d7eccb87 Author: vromero Date: 2012-12-14 11:16 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/37a5d7eccb87 8004976: test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java can fail Reviewed-by: jjg, mcimadamore ! test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java Changeset: de1ec6fc93fe Author: vromero Date: 2012-12-15 13:54 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/de1ec6fc93fe 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java Reviewed-by: jjg, mcimadamore ! 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/comp/LambdaToMethod.java ! src/share/classes/com/sun/tools/javac/jvm/ClassFile.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/jvm/Gen.java ! src/share/classes/com/sun/tools/javac/jvm/Pool.java ! src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java + test/tools/javac/8000518/DuplicateConstantPoolEntry.java ! test/tools/javac/lambda/TestInvokeDynamic.java Changeset: 014a6a11dfe5 Author: lana Date: 2012-12-10 20:59 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/014a6a11dfe5 Merge - test/tools/javac/defaultMethodExecution/DefaultMethodRegressionTests.java - test/tools/javac/diags/examples/InvalidGenericDescInFunctionalInterface.java - test/tools/javac/lambda/LambdaConversionTest.java Changeset: 13ccb5269f3d Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/13ccb5269f3d Added tag jdk8-b68 for changeset 014a6a11dfe5 ! .hgtags Changeset: f72dc656a306 Author: lana Date: 2012-12-16 22:10 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f72dc656a306 Merge Changeset: 2aa96a9a1bff Author: wmdietl Date: 2012-12-17 00:11 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2aa96a9a1bff Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! .hgtags ! src/share/classes/com/sun/tools/javac/code/Annotations.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/Source.java ! src/share/classes/com/sun/tools/javac/code/TargetType.java ! 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/comp/Annotate.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/ConstFold.java ! src/share/classes/com/sun/tools/javac/comp/Flow.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/jvm/ClassFile.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/jvm/Gen.java ! src/share/classes/com/sun/tools/javac/jvm/Target.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java ! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.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/RichDiagnosticFormatter.java ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out Changeset: 7ab2b5c3fef9 Author: wmdietl Date: 2012-12-17 00:24 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7ab2b5c3fef9 Fix a simple merge error. ! src/share/classes/com/sun/tools/javac/comp/Annotate.java Changeset: 16415bb3d5bd Author: wmdietl Date: 2012-12-17 00:24 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/16415bb3d5bd Adapt test cases to changed error format. ! test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out ! test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out From wdietl at gmail.com Mon Dec 17 00:27:47 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:27:47 +0000 Subject: hg: type-annotations/type-annotations/hotspot: 23 new changesets Message-ID: <20121217082840.51811471C1@hg.openjdk.java.net> Changeset: 816b7e5bf2ed Author: amurillo Date: 2012-11-30 17:00 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/816b7e5bf2ed 8004248: new hotspot build - hs25-b12 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 7cc69864a29b Author: kvn Date: 2012-11-16 15:49 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/7cc69864a29b 7146636: compiler/6865265/StackOverflowBug.java fails due to changed stack minimum Summary: Increase the stack size in the run parameters. Reviewed-by: kvn Contributed-by: david.r.chase at oracle.com ! test/compiler/6865265/StackOverflowBug.java Changeset: ee32440febeb Author: vlivanov Date: 2012-11-21 05:57 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/ee32440febeb 8001538: hs_err file does not list anymore compiled methods in compilation events Summary: Fixed message buffer size calculation. Reviewed-by: kvn, twisti ! src/share/vm/runtime/deoptimization.cpp ! src/share/vm/utilities/events.hpp Changeset: beebba0acc11 Author: twisti Date: 2012-11-26 17:25 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/beebba0acc11 7172640: C2: instrinsic implementations in LibraryCallKit should use argument() instead of pop() Reviewed-by: kvn, jrose ! src/share/vm/ci/ciMethod.cpp ! src/share/vm/ci/ciMethod.hpp ! src/share/vm/ci/ciSignature.hpp ! src/share/vm/interpreter/bytecodes.hpp ! src/share/vm/opto/callGenerator.cpp ! src/share/vm/opto/callnode.hpp ! src/share/vm/opto/doCall.cpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/locknode.cpp ! src/share/vm/opto/parse1.cpp ! src/share/vm/opto/parse2.cpp ! src/share/vm/opto/parse3.cpp ! src/share/vm/opto/parseHelper.cpp ! src/share/vm/opto/type.hpp Changeset: 2cd5e15048e6 Author: twisti Date: 2012-11-27 12:48 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2cd5e15048e6 8003868: fix shark for latest HotSpot and LLVM Reviewed-by: twisti Contributed-by: Roman Kennke ! src/cpu/zero/vm/assembler_zero.cpp ! src/cpu/zero/vm/assembler_zero.hpp ! src/cpu/zero/vm/cppInterpreter_zero.cpp ! src/cpu/zero/vm/globals_zero.hpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/shark/llvmHeaders.hpp ! src/share/vm/shark/llvmValue.hpp ! src/share/vm/shark/sharkBlock.cpp ! src/share/vm/shark/sharkBuilder.cpp ! src/share/vm/shark/sharkBuilder.hpp ! src/share/vm/shark/sharkCacheDecache.cpp ! src/share/vm/shark/sharkCacheDecache.hpp ! src/share/vm/shark/sharkCodeBuffer.hpp ! src/share/vm/shark/sharkCompiler.cpp ! src/share/vm/shark/sharkConstant.cpp ! src/share/vm/shark/sharkContext.cpp ! src/share/vm/shark/sharkContext.hpp ! src/share/vm/shark/sharkFunction.hpp ! src/share/vm/shark/sharkIntrinsics.cpp ! src/share/vm/shark/sharkMemoryManager.cpp ! src/share/vm/shark/sharkMemoryManager.hpp ! src/share/vm/shark/sharkNativeWrapper.cpp ! src/share/vm/shark/sharkStack.cpp ! src/share/vm/shark/sharkStack.hpp ! src/share/vm/shark/sharkState.cpp ! src/share/vm/shark/sharkTopLevelBlock.cpp ! src/share/vm/shark/sharkTopLevelBlock.hpp ! src/share/vm/shark/sharkType.hpp ! src/share/vm/shark/sharkValue.cpp ! src/share/vm/shark/shark_globals.hpp Changeset: 2aff40cb4703 Author: bharadwaj Date: 2012-11-27 17:24 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/2aff40cb4703 7092905: C2: Keep track of the number of dead nodes Summary: keep an (almost) accurate running count of the reachable (live) flow graph nodes. Reviewed-by: kvn, twisti, jrose, vlivanov ! src/share/tools/LogCompilation/README ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java ! src/share/vm/opto/block.hpp ! src/share/vm/opto/c2_globals.hpp ! src/share/vm/opto/chaitin.cpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/compile.hpp ! src/share/vm/opto/escape.cpp ! src/share/vm/opto/gcm.cpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/ifg.cpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/loopTransform.cpp ! src/share/vm/opto/loopUnswitch.cpp ! src/share/vm/opto/loopopts.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/opto/matcher.cpp ! src/share/vm/opto/node.cpp ! src/share/vm/opto/node.hpp ! src/share/vm/opto/output.cpp ! src/share/vm/opto/parse1.cpp ! src/share/vm/opto/phaseX.cpp ! src/share/vm/opto/postaloc.cpp ! src/share/vm/opto/reg_split.cpp ! src/share/vm/opto/stringopts.cpp Changeset: 1acccb7c0b01 Author: kvn Date: 2012-11-27 17:41 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/1acccb7c0b01 8003850: add support for constants in stub code Summary: remember the code section and switch back to the proper one when adding constants. Reviewed-by: twisti, kvn Contributed-by: goetz.lindenmaier at sap.com ! src/share/vm/asm/assembler.cpp ! src/share/vm/asm/assembler.hpp ! src/share/vm/asm/codeBuffer.cpp Changeset: 6ab62ad83507 Author: twisti Date: 2012-11-30 11:44 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/6ab62ad83507 8003195: AbstractAssembler should not store code pointers but use the CodeSection directly Reviewed-by: twisti, kvn Contributed-by: Bharadwaj Yadavalli ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/assembler_x86.inline.hpp ! src/share/vm/asm/assembler.cpp ! src/share/vm/asm/assembler.hpp ! src/share/vm/asm/assembler.inline.hpp ! src/share/vm/asm/codeBuffer.hpp Changeset: cd3d6a6b95d9 Author: twisti Date: 2012-11-30 15:23 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cd3d6a6b95d9 8003240: x86: move MacroAssembler into separate file Reviewed-by: kvn ! src/cpu/sparc/vm/assembler_sparc.cpp ! src/cpu/sparc/vm/codeBuffer_sparc.hpp ! src/cpu/sparc/vm/frame_sparc.hpp ! src/cpu/sparc/vm/frame_sparc.inline.hpp ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/assembler_x86.inline.hpp ! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ! src/cpu/x86/vm/cppInterpreter_x86.cpp ! src/cpu/x86/vm/frame_x86.inline.hpp ! src/cpu/x86/vm/icBuffer_x86.cpp ! src/cpu/x86/vm/icache_x86.cpp ! src/cpu/x86/vm/interp_masm_x86_32.hpp ! src/cpu/x86/vm/interp_masm_x86_64.hpp ! src/cpu/x86/vm/interpreter_x86_32.cpp ! src/cpu/x86/vm/interpreter_x86_64.cpp ! src/cpu/x86/vm/jniFastGetField_x86_32.cpp ! src/cpu/x86/vm/jniFastGetField_x86_64.cpp + src/cpu/x86/vm/macroAssembler_x86.cpp + src/cpu/x86/vm/macroAssembler_x86.hpp ! src/cpu/x86/vm/metaspaceShared_x86_32.cpp ! src/cpu/x86/vm/metaspaceShared_x86_64.cpp ! src/cpu/x86/vm/methodHandles_x86.cpp ! src/cpu/x86/vm/nativeInst_x86.cpp ! src/cpu/x86/vm/relocInfo_x86.cpp ! src/cpu/x86/vm/runtime_x86_32.cpp ! src/cpu/x86/vm/runtime_x86_64.cpp ! src/cpu/x86/vm/sharedRuntime_x86_32.cpp ! src/cpu/x86/vm/sharedRuntime_x86_64.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/templateInterpreter_x86_32.cpp ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_32.cpp ! src/cpu/x86/vm/templateTable_x86_64.cpp ! src/cpu/x86/vm/vm_version_x86.cpp ! src/cpu/x86/vm/vtableStubs_x86_32.cpp ! src/cpu/x86/vm/vtableStubs_x86_64.cpp ! src/os/bsd/vm/osThread_bsd.cpp ! src/os/bsd/vm/os_bsd.cpp ! src/os/bsd/vm/os_bsd.inline.hpp ! src/os/linux/vm/osThread_linux.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/linux/vm/os_linux.inline.hpp ! src/os/solaris/vm/osThread_solaris.cpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/solaris/vm/os_solaris.inline.hpp ! src/os/windows/vm/osThread_windows.cpp ! src/os/windows/vm/os_windows.cpp ! src/os/windows/vm/os_windows.inline.hpp ! src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp ! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ! src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp ! src/os_cpu/linux_x86/vm/os_linux_x86.cpp ! src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp ! src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp ! src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp ! src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp ! src/os_cpu/windows_x86/vm/os_windows_x86.cpp ! src/share/vm/asm/assembler.cpp ! src/share/vm/asm/assembler.hpp ! src/share/vm/asm/assembler.inline.hpp ! src/share/vm/asm/codeBuffer.cpp ! src/share/vm/asm/codeBuffer.hpp + src/share/vm/asm/macroAssembler.hpp + src/share/vm/asm/macroAssembler.inline.hpp ! src/share/vm/c1/c1_MacroAssembler.hpp ! src/share/vm/code/icBuffer.cpp ! src/share/vm/code/relocInfo.cpp ! src/share/vm/interpreter/interpreter.cpp ! src/share/vm/interpreter/interpreterRuntime.cpp ! src/share/vm/opto/compile.cpp ! src/share/vm/runtime/atomic.cpp ! src/share/vm/runtime/atomic.hpp + src/share/vm/runtime/atomic.inline.hpp ! src/share/vm/runtime/frame.cpp ! src/share/vm/runtime/frame.hpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/stubCodeGenerator.cpp Changeset: dd38cfd12c3a Author: twisti Date: 2012-12-03 15:48 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/dd38cfd12c3a 8004319: test/gc/7168848/HumongousAlloc.java fails after 7172640 Reviewed-by: kvn, johnc ! src/share/vm/opto/library_call.cpp Changeset: c5d414e98fd4 Author: neliasso Date: 2012-11-26 15:11 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/c5d414e98fd4 8003983: LogCompilation tool is broken since c1 support Summary: Fixed emitting and parsing Reviewed-by: jrose, kvn ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java ! src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java ! src/share/vm/c1/c1_Compilation.cpp Changeset: b7ff5879152e Author: neliasso Date: 2012-12-06 09:50 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/b7ff5879152e 8003934: Fix generation of malformed options to Projectcreator Summary: Makefile produces unmatched quotes due to nmake bug Reviewed-by: jwilhelm, brutisso ! make/windows/projectfiles/common/Makefile Changeset: 228a94f37a67 Author: neliasso Date: 2012-12-06 14:33 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/228a94f37a67 Merge Changeset: f0c2369fda5a Author: twisti Date: 2012-12-06 09:57 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/f0c2369fda5a 8003250: SPARC: move MacroAssembler into separate file Reviewed-by: jrose, kvn ! src/cpu/sparc/vm/assembler_sparc.cpp ! src/cpu/sparc/vm/assembler_sparc.hpp ! src/cpu/sparc/vm/assembler_sparc.inline.hpp ! src/cpu/sparc/vm/frame_sparc.inline.hpp ! src/cpu/sparc/vm/icBuffer_sparc.cpp ! src/cpu/sparc/vm/icache_sparc.cpp ! src/cpu/sparc/vm/interp_masm_sparc.hpp ! src/cpu/sparc/vm/interpreter_sparc.cpp ! src/cpu/sparc/vm/jniFastGetField_sparc.cpp + src/cpu/sparc/vm/macroAssembler_sparc.cpp + src/cpu/sparc/vm/macroAssembler_sparc.hpp + src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp ! src/cpu/sparc/vm/metaspaceShared_sparc.cpp ! src/cpu/sparc/vm/methodHandles_sparc.cpp ! src/cpu/sparc/vm/nativeInst_sparc.cpp ! src/cpu/sparc/vm/nativeInst_sparc.hpp ! src/cpu/sparc/vm/relocInfo_sparc.cpp ! src/cpu/sparc/vm/runtime_sparc.cpp ! src/cpu/sparc/vm/sharedRuntime_sparc.cpp ! src/cpu/sparc/vm/stubGenerator_sparc.cpp ! src/cpu/sparc/vm/templateInterpreter_sparc.cpp ! src/cpu/sparc/vm/vm_version_sparc.cpp ! src/cpu/sparc/vm/vmreg_sparc.cpp ! src/cpu/sparc/vm/vtableStubs_sparc.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/macroAssembler_x86.cpp ! src/cpu/zero/vm/assembler_zero.cpp ! src/cpu/zero/vm/assembler_zero.hpp ! src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp ! src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp ! src/os_cpu/solaris_sparc/vm/assembler_solaris_sparc.cpp ! src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp ! src/share/vm/adlc/main.cpp ! src/share/vm/asm/assembler.hpp ! src/share/vm/asm/macroAssembler.hpp ! src/share/vm/asm/macroAssembler.inline.hpp ! src/share/vm/asm/register.hpp ! src/share/vm/code/vmreg.hpp Changeset: 522662fa9c16 Author: twisti Date: 2012-12-06 11:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/522662fa9c16 Merge Changeset: d2f8c38e543d Author: roland Date: 2012-12-07 01:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/d2f8c38e543d Merge ! src/cpu/sparc/vm/stubGenerator_sparc.cpp ! src/cpu/sparc/vm/templateInterpreter_sparc.cpp ! src/cpu/x86/vm/cppInterpreter_x86.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/os/bsd/vm/os_bsd.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ! src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp ! src/os_cpu/linux_x86/vm/os_linux_x86.cpp ! src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp ! src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp ! src/os_cpu/windows_x86/vm/os_windows_x86.cpp ! src/share/vm/asm/codeBuffer.cpp ! src/share/vm/runtime/deoptimization.cpp ! src/share/vm/runtime/frame.cpp ! src/share/vm/runtime/frame.hpp ! src/share/vm/runtime/thread.cpp Changeset: 0f80645e9c26 Author: johnc Date: 2012-11-30 11:46 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/0f80645e9c26 8004170: G1: Verbose GC output is not getting flushed to log file using JDK 8 Summary: Add flushes to G1CollectedHeap::log_gc_footer() and TraceCPUTime destructor. Reviewed-by: jwilhelm, azeemj, brutisso ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/runtime/timer.cpp Changeset: eade6b2e4782 Author: jmasa Date: 2012-11-29 10:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/eade6b2e4782 8003554: NPG: move Metablock and Metachunk code out of metaspace.cpp Reviewed-by: coleenp + src/share/vm/memory/metablock.cpp + src/share/vm/memory/metachunk.cpp ! src/share/vm/memory/metaspace.cpp Changeset: cbe736bc70fa Author: jwilhelm Date: 2012-12-07 07:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/cbe736bc70fa Merge Changeset: a35a72dd2e12 Author: amurillo Date: 2012-12-07 10:46 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/a35a72dd2e12 Merge Changeset: 121aa71316af Author: amurillo Date: 2012-12-07 10:46 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/121aa71316af Added tag hs25-b12 for changeset a35a72dd2e12 ! .hgtags Changeset: 8af7d22f1f8f Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/8af7d22f1f8f Added tag jdk8-b68 for changeset 121aa71316af ! .hgtags Changeset: 81f7004f2e1a Author: wmdietl Date: 2012-12-17 00:27 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/hotspot/rev/81f7004f2e1a Automated merge with http://hg.openjdk.java.net/jdk8/tl/hotspot ! .hgtags From wdietl at gmail.com Mon Dec 17 00:31:15 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:31:15 +0000 Subject: hg: type-annotations/type-annotations/corba: 2 new changesets Message-ID: <20121217083119.585E6471C4@hg.openjdk.java.net> Changeset: 22ddcac208a8 Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/22ddcac208a8 Added tag jdk8-b68 for changeset 82000531feaa ! .hgtags Changeset: cf817e791725 Author: wmdietl Date: 2012-12-17 00:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/cf817e791725 Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba ! .hgtags From wdietl at gmail.com Mon Dec 17 00:31:51 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:31:51 +0000 Subject: hg: type-annotations/type-annotations/jaxws: 2 new changesets Message-ID: <20121217083158.DDDFA471C5@hg.openjdk.java.net> Changeset: 756323c99011 Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/756323c99011 Added tag jdk8-b68 for changeset d3fe408f3a9a ! .hgtags Changeset: 7390e601791f Author: wmdietl Date: 2012-12-17 00:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxws/rev/7390e601791f Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxws ! .hgtags From wdietl at gmail.com Mon Dec 17 00:32:18 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:32:18 +0000 Subject: hg: type-annotations/type-annotations: 8 new changesets Message-ID: <20121217083219.3B562471C6@hg.openjdk.java.net> Changeset: 04435608c613 Author: lana Date: 2012-12-10 20:52 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/04435608c613 Merge Changeset: 6b96b7744913 Author: erikj Date: 2012-12-07 17:23 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/6b96b7744913 8004045: build-infra: Error 12 from zip when updating src.zip Summary: Hiding this error from make so that it doesn't fail Reviewed-by: ohrstrom, dholmes ! common/makefiles/JavaCompilation.gmk Changeset: 2795874efd16 Author: erikj Date: 2012-12-11 11:29 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/2795874efd16 8003945: build-infra: problems finding compiler when using --with-dev-kit Summary: Search all compiler names in dev-kit dir first. Reviewed-by: tbell ! common/autoconf/generated-configure.sh ! common/autoconf/toolchain.m4 Changeset: e175ecff1391 Author: erikj Date: 2012-12-11 11:33 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/e175ecff1391 8001753: build-infra: mismatch with full debug symbol control for hotspot Summary: Enabling hotspot to use the FDS settings established at configure time Reviewed-by: dholmes, ohair ! common/autoconf/generated-configure.sh ! common/autoconf/hotspot-spec.gmk.in ! common/autoconf/jdk-options.m4 ! common/makefiles/NativeCompilation.gmk Changeset: cdb401a60cea Author: katleman Date: 2012-12-12 13:19 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/cdb401a60cea Merge Changeset: e9ec00893bb4 Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/e9ec00893bb4 Added tag jdk8-b68 for changeset cdb401a60cea ! .hgtags Changeset: 2ed5be3dd506 Author: lana Date: 2012-12-16 22:02 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/2ed5be3dd506 Merge Changeset: 790b8012d394 Author: wmdietl Date: 2012-12-17 00:32 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/790b8012d394 Automated merge with http://hg.openjdk.java.net/jdk8/tl/ ! .hgtags From wdietl at gmail.com Mon Dec 17 00:32:38 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:32:38 +0000 Subject: hg: type-annotations/type-annotations/jaxp: 4 new changesets Message-ID: <20121217083254.39E19471C7@hg.openjdk.java.net> Changeset: b1fdb101c82e Author: joehw Date: 2012-12-14 13:24 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/b1fdb101c82e 8003260: [findbug] some fields should be package protected Summary: change public or protected mutable static fields to private or package private. Reviewed-by: lancea ! src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java ! src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Changeset: 789a855de959 Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/789a855de959 Added tag jdk8-b68 for changeset b854e7008421 ! .hgtags Changeset: 8a20e948b806 Author: lana Date: 2012-12-16 22:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/8a20e948b806 Merge Changeset: 75a445c58423 Author: wmdietl Date: 2012-12-17 00:32 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jaxp/rev/75a445c58423 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jaxp ! .hgtags From wdietl at gmail.com Mon Dec 17 00:27:14 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 17 Dec 2012 08:27:14 +0000 Subject: hg: type-annotations/type-annotations/jdk: 51 new changesets Message-ID: <20121217083735.83DD4471C8@hg.openjdk.java.net> Changeset: 883feced1cdd Author: dingxmin Date: 2012-12-11 10:42 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/883feced1cdd 6512101: Incorrect encoding in NetworkInterface.getDisplayName() Reviewed-by: chegar, dsamersoff ! src/windows/native/java/net/NetworkInterface.c Changeset: d206e52bf8a6 Author: weijun Date: 2012-12-11 13:14 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d206e52bf8a6 8004488: wrong permissions checked in krb5 Reviewed-by: xuelei ! src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java ! src/share/classes/sun/security/jgss/krb5/Krb5Util.java + test/sun/security/krb5/auto/KeyPermissions.java ! test/sun/security/krb5/auto/KeyTabCompat.java Changeset: c4bd81de2868 Author: akhil Date: 2012-12-11 15:33 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c4bd81de2868 8003246: Add InitialValue Supplier to ThreadLocal Reviewed-by: mduigou, forax, dl, chegar, briangoetz ! src/share/classes/java/lang/ThreadLocal.java + test/java/lang/ThreadLocal/ThreadLocalSupplierTest.java Changeset: 6c795437f212 Author: mduigou Date: 2012-12-11 20:49 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/6c795437f212 8004905: Correct license of test to remove classpath exception Reviewed-by: akhil ! test/java/lang/ThreadLocal/ThreadLocalSupplierTest.java Changeset: 12fba0974a9d Author: weijun Date: 2012-12-12 18:39 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/12fba0974a9d 8004904: Makefile for ntlm Reviewed-by: erikj, chegar ! make/com/sun/security/Makefile + make/com/sun/security/ntlm/Makefile Changeset: 806cf26e5063 Author: chegar Date: 2012-12-12 11:35 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/806cf26e5063 8004921: Trivial javadoc warnings in Base64 Reviewed-by: darcy ! src/share/classes/java/util/Base64.java Changeset: 81640e75c7a7 Author: alanb Date: 2012-12-12 13:03 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/81640e75c7a7 8004874: Reduce dependency on java.beans to only add/removePropertyChangeListener Reviewed-by: ksrini, mchung, dholmes ! src/share/classes/com/sun/java/util/jar/pack/PropMap.java ! src/share/classes/java/util/logging/LogManager.java Changeset: 346c0af4af41 Author: mullan Date: 2012-12-12 09:25 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/346c0af4af41 8004064: Downgrade normative references to ${java.home}/lib/security/java.security Reviewed-by: alanb, vinnie, xuelei ! src/share/classes/com/sun/net/ssl/KeyManagerFactory.java ! src/share/classes/com/sun/net/ssl/TrustManagerFactory.java ! src/share/classes/com/sun/security/auth/PolicyFile.java ! src/share/classes/com/sun/security/auth/login/ConfigFile.java ! src/share/classes/java/net/doc-files/net-properties.html ! src/share/classes/java/security/KeyStore.java ! src/share/classes/java/security/Policy.java ! src/share/classes/java/security/Security.java ! src/share/classes/java/security/cert/CertPathBuilder.java ! src/share/classes/java/security/cert/CertPathValidator.java ! src/share/classes/java/security/cert/CertStore.java ! src/share/classes/javax/net/ssl/KeyManagerFactory.java ! src/share/classes/javax/net/ssl/TrustManagerFactory.java ! src/share/classes/javax/security/auth/Policy.java ! src/share/classes/javax/security/auth/callback/CallbackHandler.java ! src/share/classes/javax/security/auth/login/Configuration.java ! src/share/classes/javax/security/auth/login/LoginContext.java ! src/share/classes/javax/security/cert/X509Certificate.java Changeset: c7f86908d5fd Author: mullan Date: 2012-12-12 09:27 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c7f86908d5fd Merge - src/share/lib/security/java.security Changeset: 68374c6e65c1 Author: robm Date: 2012-12-12 15:57 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/68374c6e65c1 8004337: java/sql tests aren't run in test/Makefile Reviewed-by: lancea, alanb ! test/Makefile Changeset: bd84d0927a2e Author: smarks Date: 2012-12-12 09:53 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bd84d0927a2e 8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung ! test/java/rmi/MarshalledObject/compare/Compare.java ! test/java/rmi/MarshalledObject/compare/HashCode.java ! test/java/rmi/MarshalledObject/compare/NullReference.java ! test/java/rmi/Naming/DefaultRegistryPort.java ! test/java/rmi/Naming/LookupIPv6.java ! test/java/rmi/Naming/RmiIsNoScheme.java ! test/java/rmi/Naming/UnderscoreHost.java ! test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java ! test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java ! test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java ! test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java ! test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java ! test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java ! test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java ! test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java ! test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java ! test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh ! test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java ! test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java ! test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java ! test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java ! test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java ! test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java ! test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java ! test/java/rmi/activation/Activatable/restartService/RestartService.java ! test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java ! test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java ! test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java ! test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java ! test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java ! test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java ! test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java ! test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java ! test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java ! test/java/rmi/activation/CommandEnvironment/NullOptions.java ! test/java/rmi/activation/CommandEnvironment/SetChildEnv.java ! test/java/rmi/activation/checkusage/CheckUsage.java ! test/java/rmi/activation/log/LogTest.java ! test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java ! test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java ! test/java/rmi/dgc/VMID/CheckVMID.java ! test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java ! test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java ! test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java ! test/java/rmi/invalidName/InvalidName.java ! test/java/rmi/registry/altSecurityManager/AltSecurityManager.java ! test/java/rmi/registry/checkusage/CheckUsage.java ! test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java ! test/java/rmi/registry/interfaceHash/InterfaceHash.java ! test/java/rmi/registry/multipleRegistries/MultipleRegistries.java ! test/java/rmi/registry/readTest/readTest.sh ! test/java/rmi/registry/reexport/Reexport.java ! test/java/rmi/reliability/benchmark/runRmiBench.sh ! test/java/rmi/reliability/benchmark/runSerialBench.sh ! test/java/rmi/reliability/juicer/AppleUserImpl.java ! test/java/rmi/server/ObjID/randomIDs/RandomIDs.java ! test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java ! test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java ! test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java ! test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java ! test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java ! test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java ! test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java ! test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java ! test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java ! test/java/rmi/server/RMIClassLoader/spi/Installed.java ! test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java ! test/java/rmi/server/RMIClassLoader/spi/Property.java ! test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java ! test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java ! test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java ! test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java ! test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java ! test/java/rmi/server/RemoteObject/notExtending/NotExtending.java ! test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java ! test/java/rmi/server/RemoteServer/AddrInUse.java ! test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java ! test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java ! test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java ! test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java ! test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java ! test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java ! test/java/rmi/server/Unmarshal/PrimitiveClasses.java + test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java ! test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java - test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java ! test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java ! test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java ! test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java ! test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java ! test/java/rmi/server/clientStackTrace/ClientStackTrace.java ! test/java/rmi/server/getRemoteClass/GetRemoteClass.java ! test/java/rmi/server/serverStackTrace/ServerStackTrace.java ! test/java/rmi/server/serverStackTrace/SuppressStackTraces.java ! test/java/rmi/server/useCustomRef/UseCustomRef.java ! test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java ! test/java/rmi/transport/checkFQDN/CheckFQDN.java ! test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java ! test/java/rmi/transport/closeServerSocket/CloseServerSocket.java ! test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java ! test/java/rmi/transport/handshakeFailure/HandshakeFailure.java ! test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java ! test/java/rmi/transport/httpSocket/HttpSocketTest.java ! test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java ! test/java/rmi/transport/readTimeout/ReadTimeoutTest.java ! test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java ! test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java ! test/javax/rmi/ssl/SocketFactoryTest.java ! test/sun/rmi/log/ReliableLog/LogAlignmentTest.java ! test/sun/rmi/log/ReliableLog/SnapshotSize.java ! test/sun/rmi/rmic/RMIGenerator/RmicDefault.java ! test/sun/rmi/rmic/newrmic/equivalence/run.sh ! test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java ! test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java ! test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java ! test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java ! test/sun/rmi/transport/proxy/EagerHttpFallback.java ! test/sun/rmi/transport/tcp/DeadCachedConnection.java ! test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java ! test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java Changeset: 56fd5479a98f Author: jgish Date: 2012-12-12 15:37 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/56fd5479a98f 8004651: TEST: java/util/logging/CheckLockLocationTest.java failed to delete file (win) Summary: Failure to delete test log file should be a warning instead of test failure Reviewed-by: mduigou, smarks ! test/java/util/logging/CheckLockLocationTest.java Changeset: 5a2ab2c3f106 Author: weijun Date: 2012-12-13 08:11 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5a2ab2c3f106 8004235: Disable native JGSS provider on Mac Reviewed-by: erikj, valeriep ! make/sun/security/Makefile ! makefiles/CompileNativeLibraries.gmk ! src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Changeset: 7a8978a5bb6e Author: lancea Date: 2012-12-12 20:57 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7a8978a5bb6e 8004357: Implement various methods in SerialBlob/Clob/Array and specify Thread Safety Reviewed-by: naoto ! src/share/classes/javax/sql/rowset/serial/SerialArray.java ! src/share/classes/javax/sql/rowset/serial/SerialBlob.java ! src/share/classes/javax/sql/rowset/serial/SerialClob.java ! src/share/classes/javax/sql/rowset/serial/SerialDatalink.java ! src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java ! src/share/classes/javax/sql/rowset/serial/SerialRef.java ! src/share/classes/javax/sql/rowset/serial/SerialStruct.java Changeset: 775b0050144a Author: chegar Date: 2012-12-13 09:55 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/775b0050144a 8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff ! test/java/net/Socks/SocksV4Test.java Changeset: 682d2d3ccff5 Author: chegar Date: 2012-12-13 14:33 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/682d2d3ccff5 8004675: Inet6Address.getHostAddress should use string scope identifier where available Summary: ...and some minor stylistic cleanup Reviewed-by: khazra, dsamersoff, michaelm ! src/share/classes/java/net/Inet6Address.java ! src/share/native/java/net/Inet6Address.c + test/java/net/Inet6Address/StringScope.java Changeset: c97618a3c8c2 Author: juh Date: 2012-12-13 09:35 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c97618a3c8c2 7193792: sun/security/pkcs11/ec/TestECDSA.java failing intermittently Reviewed-by: vinnie, wetmore ! test/ProblemList.txt ! test/sun/security/pkcs11/ec/TestECDSA.java Changeset: 7b697da6626a Author: mullan Date: 2012-12-13 09:37 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7b697da6626a Merge Changeset: ae5d04dbacd6 Author: chegar Date: 2012-12-13 14:47 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ae5d04dbacd6 8003890: corelibs test scripts should pass TESTVMOPTS Reviewed-by: chegar, alanb Contributed-by: Mark Sheppard ! test/com/oracle/net/sanity.sh ! test/com/sun/corba/cachedSocket/7056731.sh ! test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh ! test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh ! test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh ! test/com/sun/tools/attach/ApplicationSetup.sh ! test/com/sun/tools/attach/BasicTests.sh ! test/com/sun/tools/attach/PermissionTests.sh ! test/com/sun/tools/attach/ProviderTests.sh ! test/com/sun/tools/extcheck/TestExtcheckArgs.sh ! test/demo/zipfs/basic.sh ! test/java/io/File/GetXSpace.sh ! test/java/io/File/MacPathTest.sh ! test/java/io/File/basic.sh ! test/java/io/FileOutputStream/FileOpen.sh ! test/java/io/Serializable/class/run.sh ! test/java/io/Serializable/evolution/AddedExternField/run.sh ! test/java/io/Serializable/evolution/RenamePackage/run.sh ! test/java/io/Serializable/maskSyntheticModifier/run.sh ! test/java/io/Serializable/packageAccess/run.sh ! test/java/io/Serializable/resolveClass/consTest/run.sh ! test/java/io/Serializable/resolveClass/deserializeButton/run.sh ! test/java/io/Serializable/subclass/run.sh ! test/java/io/Serializable/superclassDataLoss/run.sh ! test/java/io/Serializable/unnamedPackageSwitch/run.sh ! test/java/lang/Class/forName/NonJavaNames.sh ! test/java/lang/ClassLoader/Assert.sh ! test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh ! test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh ! test/java/lang/ClassLoader/getdotresource.sh ! test/java/lang/Runtime/exec/setcwd.sh ! test/java/lang/StringCoding/CheckEncodings.sh ! test/java/lang/System/finalization/FinExit.sh ! test/java/lang/annotation/loaderLeak/LoaderLeak.sh ! test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh ! test/java/net/Authenticator/B4933582.sh ! test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh ! test/java/net/InetAddress/ptr/lookup.sh ! test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh ! test/java/net/Socket/OldSocketImpl.sh ! test/java/net/URL/B5086147.sh ! test/java/net/URL/runconstructor.sh ! test/java/net/URLClassLoader/B5077773.sh ! test/java/net/URLClassLoader/getresourceasstream/test.sh ! test/java/net/URLClassLoader/sealing/checksealed.sh ! test/java/net/URLConnection/6212146/test.sh ! test/java/net/URLConnection/UNCTest.sh ! test/java/nio/Buffer/LimitDirectMemory.sh ! test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh ! test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh ! test/java/nio/charset/Charset/default.sh ! test/java/nio/charset/coders/CheckSJISMappingProp.sh ! test/java/nio/charset/spi/basic.sh ! test/java/nio/file/Files/delete_on_close.sh ! test/java/nio/file/Files/walkFileTree/walk_file_tree.sh ! test/java/nio/file/Path/MacPathTest.sh ! test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh ! test/java/rmi/registry/readTest/readTest.sh ! test/java/rmi/reliability/benchmark/runSerialBench.sh ! test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh ! test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh ! test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh ! test/java/security/Security/signedfirst/Dyn.sh ! test/java/security/Security/signedfirst/Static.sh ! test/java/security/cert/CertificateFactory/slowstream.sh ! test/java/util/Currency/PropertiesTest.sh ! test/java/util/Locale/LocaleCategory.sh ! test/java/util/Locale/LocaleProviders.sh ! test/java/util/PluggableLocale/ExecTest.sh ! test/java/util/ResourceBundle/Bug6299235Test.sh ! test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh ! test/java/util/ServiceLoader/basic.sh ! test/java/util/TimeZone/OldIDMappingTest.sh ! test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh ! test/java/util/prefs/CheckUserPrefsStorage.sh ! test/java/util/prefs/PrefsSpi.sh ! test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh ! test/java/util/zip/3GBZipFiles.sh ! test/java/util/zip/ZipFile/deletetempjar.sh ! test/javax/crypto/SecretKeyFactory/FailOverTest.sh ! test/javax/print/applet/AppletPrintLookup.sh ! test/javax/script/ProviderTest.sh ! test/javax/security/auth/Subject/doAs/Test.sh ! test/lib/security/java.policy/Ext_AllPolicy.sh ! test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh ! test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh ! test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh ! test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh ! test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh ! test/sun/management/jmxremote/startstop/JMXStartStopTest.sh ! test/sun/misc/Cleaner/exitOnThrow.sh ! test/sun/net/InetAddress/nameservice/dns/cname.sh ! test/sun/net/sdp/sanity.sh ! test/sun/net/www/MarkResetTest.sh ! test/sun/net/www/http/HttpClient/RetryPost.sh ! test/sun/net/www/protocol/file/DirPermissionDenied.sh ! test/sun/net/www/protocol/jar/B5105410.sh ! test/sun/net/www/protocol/jar/getcontenttype.sh ! test/sun/net/www/protocol/jar/jarbug/run.sh ! test/sun/rmi/rmic/manifestClassPath/run.sh ! test/sun/rmi/rmic/minimizeWrapperInstances/run.sh ! test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh ! test/sun/security/krb5/runNameEquals.sh ! test/sun/security/krb5/tools/ktcheck.sh ! test/sun/security/mscapi/AccessKeyStore.sh ! test/sun/security/mscapi/IsSunMSCAPIAvailable.sh ! test/sun/security/mscapi/KeyStoreCompatibilityMode.sh ! test/sun/security/mscapi/PublicKeyInterop.sh ! test/sun/security/mscapi/RSAEncryptDecrypt.sh ! test/sun/security/mscapi/ShortRSAKey1024.sh ! test/sun/security/mscapi/SignUsingNONEwithRSA.sh ! test/sun/security/mscapi/SignUsingSHA2withRSA.sh ! test/sun/security/pkcs11/KeyStore/Basic.sh ! test/sun/security/pkcs11/KeyStore/ClientAuth.sh ! test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh ! test/sun/security/pkcs11/KeyStore/Solaris.sh ! test/sun/security/pkcs11/Provider/ConfigQuotedString.sh ! test/sun/security/pkcs11/Provider/Login.sh ! test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh ! test/sun/security/provider/PolicyFile/getinstance/getinstance.sh ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh ! test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh ! test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh ! test/sun/security/tools/jarsigner/emptymanifest.sh ! test/sun/security/tools/jarsigner/ts.sh ! test/sun/security/tools/keytool/printssl.sh ! test/sun/security/tools/keytool/standard.sh ! test/sun/security/validator/certreplace.sh ! test/sun/security/validator/samedn.sh ! test/tools/launcher/6842838/Test6842838.sh ! test/tools/launcher/MultipleJRE.sh Changeset: 087425441a48 Author: robm Date: 2012-12-13 15:28 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/087425441a48 8000525: Java.net.httpcookie api does not support 2-digit year format Reviewed-by: chegar ! src/share/classes/java/net/HttpCookie.java ! test/java/net/CookieHandler/B6791927.java ! test/java/net/CookieHandler/CookieManagerTest.java + test/java/net/HttpCookie/ExpiredCookieTest.java Changeset: 8d7323a9d8ed Author: dholmes Date: 2012-12-13 21:18 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/8d7323a9d8ed 8003632: HPROF class file version java.lang.RuntimeException errors Reviewed-by: mchung, lancea ! src/share/javavm/export/classfile_constants.h Changeset: 69fd3f3d20c1 Author: alanb Date: 2012-12-15 15:07 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/69fd3f3d20c1 8004963: URLConnection, downgrade normative reference to ${java.home}/lib/content-types.properties Reviewed-by: chegar ! src/share/classes/java/net/URLConnection.java Changeset: eaaec81aa974 Author: weijun Date: 2012-12-17 12:18 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/eaaec81aa974 7197159: accept different kvno if there no match Reviewed-by: xuelei ! src/share/classes/sun/security/krb5/EncryptionKey.java ! test/sun/security/krb5/auto/DynamicKeytab.java + test/sun/security/krb5/auto/KvnoNA.java ! test/sun/security/krb5/auto/MoreKvno.java Changeset: 39f9b2cc5738 Author: bae Date: 2012-11-28 12:28 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/39f9b2cc5738 4649812: GIFImageReader handles transparency incorrectly Reviewed-by: bae, prr Contributed-by: Vadim Pakhnushev ! src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Changeset: 6569819eb2fe Author: bae Date: 2012-11-28 12:38 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/6569819eb2fe 5082749: GIF stream metadata specification of aspect ratio is incorrect Reviewed-by: bae, prr Contributed-by: Vadim Pakhnushev ! src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html Changeset: 934595726263 Author: bae Date: 2012-11-28 14:12 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/934595726263 7064516: ImageIO.read() fails to load an image Reviewed-by: jgodinez, prr ! src/share/classes/java/awt/color/ICC_Profile.java ! src/share/classes/java/awt/image/ColorConvertOp.java + test/sun/java2d/cmm/ColorConvertOp/InvalidRenderIntentTest.java Changeset: d54db1e16b97 Author: bae Date: 2012-11-30 11:32 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d54db1e16b97 7124223: [macosx] Regression test failure with new exception, when glyph is positioned explicitly Reviewed-by: jgodinez ! src/share/classes/sun/print/PathGraphics.java Changeset: bd3b3cda125d Author: lana Date: 2012-11-30 16:02 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bd3b3cda125d Merge Changeset: 3c5bf5ed45a9 Author: bae Date: 2012-12-03 16:26 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3c5bf5ed45a9 7124347: [macosx] java.lang.InternalError: not implemented yet on call Graphics2D.drawRenderedImage Reviewed-by: prr, flar ! src/share/classes/sun/java2d/opengl/OGLBlitLoops.java ! src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java + test/sun/java2d/OpenGL/CustomCompositeTest.java Changeset: 1175410d98ea Author: serb Date: 2012-11-21 15:50 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1175410d98ea 7124552: [macosx] NullPointerException in getBufferStrategy() 7124219: [macosx] Unable to draw images to fullscreen Reviewed-by: bae, anthony ! src/macosx/classes/sun/awt/CGraphicsConfig.java ! src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java ! src/macosx/classes/sun/lwawt/LWCanvasPeer.java ! src/macosx/classes/sun/lwawt/LWComponentPeer.java + src/macosx/classes/sun/lwawt/LWGraphicsConfig.java ! src/macosx/classes/sun/lwawt/LWWindowPeer.java ! src/macosx/classes/sun/lwawt/PlatformWindow.java ! src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java ! src/macosx/classes/sun/lwawt/macosx/CPlatformView.java ! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java - src/share/classes/sun/awt/TextureSizeConstraining.java Changeset: 5b2c31d20a64 Author: serb Date: 2012-11-21 15:54 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5b2c31d20a64 7193214: Consider simplifying CPlatformWindow.setResizable() Reviewed-by: anthony, denis ! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java ! src/macosx/native/sun/awt/AWTWindow.m Changeset: c9dead63607c Author: serb Date: 2012-11-21 15:58 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c9dead63607c 7154516: [macosx] Popup menus have no visible borders Reviewed-by: anthony, denis ! src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Changeset: 9cd48409539e Author: kizune Date: 2012-11-21 20:42 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9cd48409539e 8003273: Missing testcase for 7171812 Reviewed-by: art, serb + test/javax/swing/dnd/7171812/JListWithScroll.java + test/javax/swing/dnd/7171812/bug7171812.java Changeset: 5600005b87fb Author: serb Date: 2012-11-27 17:03 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5600005b87fb 8002308: [macosx] 7198229 should be applied to the user action only Reviewed-by: anthony, skovatch ! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java ! src/macosx/native/sun/awt/AWTWindow.m + test/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java Changeset: 0e91d6f3019c Author: alexsch Date: 2012-11-29 07:42 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0e91d6f3019c 8000423: Diacritic is not applyed to a base letter on Linux Reviewed-by: anthony, serb ! src/solaris/classes/sun/awt/X11/XToolkit.java Changeset: abee1d528df1 Author: kshefov Date: 2012-11-30 12:39 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/abee1d528df1 7124242: [macosx] Test doesn't work because of the frame round corners in the LaF Reviewed-by: anthony, yan, alexsch ! test/javax/swing/text/CSSBorder/6796710/bug6796710.java Changeset: 35d8085aa14a Author: lana Date: 2012-11-30 17:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/35d8085aa14a Merge Changeset: da55ef766e48 Author: alexsch Date: 2012-12-04 15:26 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/da55ef766e48 6671481: NPE at javax.swing.plaf.basic.BasicTreeUI$Handler.handleSelection Reviewed-by: serb ! src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Changeset: bd175c70684c Author: alexsch Date: 2012-12-04 15:56 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bd175c70684c 8003830: NPE at BasicTreeUI$Actions.page:4470 Reviewed-by: serb, alexsch Contributed-by: Jaroslav Tulach ! src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java + test/javax/swing/JTree/8003830/bug8003830.java Changeset: 009fd6e1d9f5 Author: alexsch Date: 2012-12-04 16:42 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/009fd6e1d9f5 8002077: Possible mnemonic issue on JFileChooser Save button on nimbus L&F Reviewed-by: serb ! src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java Changeset: 4aad3e6f68d2 Author: jviswana Date: 2012-12-04 17:17 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4aad3e6f68d2 4631925: JColor Chooser is not fully accessible Reviewed-by: alexsch ! src/share/classes/javax/swing/JColorChooser.java ! src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java ! src/share/classes/javax/swing/colorchooser/ColorPanel.java ! src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java Changeset: ea20c9388d90 Author: aph Date: 2012-12-04 14:02 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ea20c9388d90 8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c Summary: Code does not check for JNU_GetEnv returning NULL. Reviewed-by: anthony ! src/solaris/native/sun/xawt/XlibWrapper.c Changeset: bbbb5c70aa59 Author: lana Date: 2012-12-04 11:41 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bbbb5c70aa59 Merge - src/share/classes/sun/awt/TextureSizeConstraining.java Changeset: 87028eb3f020 Author: lana Date: 2012-12-04 11:46 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/87028eb3f020 Merge Changeset: b68a5404de60 Author: lana Date: 2012-12-10 20:58 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b68a5404de60 Merge ! makefiles/CompileJavaClasses.gmk - src/share/classes/sun/awt/TextureSizeConstraining.java Changeset: 379e3dfa521d Author: erikj Date: 2012-12-06 12:09 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/379e3dfa521d 8004104: build-infra: Minor cleanup Reviewed-by: ohrstrom, tbell ! makefiles/CompileJavaClasses.gmk ! makefiles/CompileNativeLibraries.gmk Changeset: 2689f6cfe835 Author: erikj Date: 2012-12-11 12:27 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/2689f6cfe835 8001753: build-infra: mismatch with full debug symbol control for hotspot Summary: Changing boolean values of ENABLE_DEBUG_SYMBOLS. Reviewed-by: dholmes, ohair ! makefiles/CompileNativeLibraries.gmk Changeset: 53fb43e4d614 Author: katleman Date: 2012-12-12 13:21 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/53fb43e4d614 Merge ! makefiles/CompileJavaClasses.gmk ! makefiles/CompileNativeLibraries.gmk Changeset: 7fd56a5abd94 Author: katleman Date: 2012-12-13 09:05 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/7fd56a5abd94 Added tag jdk8-b68 for changeset 53fb43e4d614 ! .hgtags Changeset: f959e0cc8766 Author: lana Date: 2012-12-16 22:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f959e0cc8766 Merge ! makefiles/CompileNativeLibraries.gmk - src/share/classes/sun/awt/TextureSizeConstraining.java Changeset: 3f2641e69a88 Author: wmdietl Date: 2012-12-17 00:26 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3f2641e69a88 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk ! .hgtags From wdietl at gmail.com Mon Dec 17 00:40:13 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 17 Dec 2012 00:40:13 -0800 Subject: Status update: inner type positions fixed, other cleanup Message-ID: All, I finished implementing the changed numbering for nested types and pushed an update. I rewrote large parts of how type annotation positions are determined, also solving the previous problems with performing some of this in Enter. In particular, see these two changesets: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a43c94235366 http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8fdf095581b0 I also merged with jdk8/tl. Please have a look at the test case in referenceinfos. The last one that fails for me is: tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java I adapted the first few tests in NestedTypes to make sure everything works. The remainder should just be replacing the arrays with the new bytecode. cu, WMD. -- http://www.google.com/profiles/wdietl From wdietl at gmail.com Mon Dec 17 00:48:00 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 17 Dec 2012 00:48:00 -0800 Subject: Problem with when type annotation positions are determined In-Reply-To: <50BFF2C9.3080106@oracle.com> References: <50BFF2C9.3080106@oracle.com> Message-ID: Jon, thanks for your comments! This changeset should fix this issue: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8fdf095581b0 I performed a big refactoring of when type annotations are positioned in: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a43c94235366 which now allows this cleaner solution. I still have to perform more tests, in particular with the Checker Framework. > At least conceptually, the for-loop calling > completeTypeAnnotationsInSignatures should logically be done inside > annotate.enterDone, not after it. Code in enterDone will be analyzing > annotations, including repeated annotations, and will presumably trip up > over type annotations. In enterDone we do not have the AST for the whole class declaration, which is necessary to determine the type annotation position. I now perform a call in attribClassBody, where I have that information. So far this seems to work. > Separately, very minor, it looks like TypeAnnotations should be an instance > obtained from a Context -- that would save you having to pass in a Names. I recently changed away from having an instance, because that object didn't have any behavior. After today's refactoring there is just one method and an inner class and that method is called once. Let me know what you think! Thanks, cu, WMD. > On 12/01/2012 03:23 PM, Werner Dietl wrote: >> >> Joel, Jon, all, >> >> the trunk version of type-annotations passes the jtreg tests and also >> the Checker Framework tests. >> However, some uses of the compiler failed and I finally managed to >> produce a minimal test case. >> This problem is caused by the changes I made to when the type >> annotation positions for different annotations is determined, i.e. >> where we call >> com.sun.tools.javac.code.TypeAnnotations.completeTypeAnnotationsInSignatures >> in Enter/MemberEnter/Attr. >> Previous versions (e.g. the code that is still in jsr308-langtools) >> did not have this problem. >> >> To reproduce: >> >> 1. tar -xvzf annobug.tar.gz >> 2. cd annobug >> 3. type-annotations-build-dir/bin/javac -cp . Main.java >> >> For me, this results in a stack trace that begins with: >> >> java.lang.NullPointerException >> at >> com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.setTypeAnnotationPos(TypeAnnotations.java:789) >> at >> com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.findPosition(TypeAnnotations.java:862) >> at >> com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.visitAnnotatedType(TypeAnnotations.java:839) >> at >> com.sun.tools.javac.tree.JCTree$JCAnnotatedType.accept(JCTree.java:2304) >> at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) >> at >> com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) >> at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:57) >> at >> com.sun.tools.javac.tree.TreeScanner.visitClassDef(TreeScanner.java:80) >> at >> com.sun.tools.javac.tree.JCTree$JCClassDecl.accept(JCTree.java:648) >> at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) >> at >> com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) >> at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:57) >> at >> com.sun.tools.javac.tree.TreeScanner.visitTopLevel(TreeScanner.java:68) >> at >> com.sun.tools.javac.tree.JCTree$JCCompilationUnit.accept(JCTree.java:517) >> at com.sun.tools.javac.tree.TreeScanner.scan(TreeScanner.java:49) >> at >> com.sun.tools.javac.code.TypeAnnotations$TypeAnnotationPositions.scan(TypeAnnotations.java:450) >> at >> com.sun.tools.javac.code.TypeAnnotations.completeTypeAnnotationsInSignatures(TypeAnnotations.java:87) >> at com.sun.tools.javac.comp.Enter.complete(Enter.java:514) >> at >> com.sun.tools.javac.main.JavaCompiler.complete(JavaCompiler.java:791) >> at >> com.sun.tools.javac.jvm.ClassReader.fillIn(ClassReader.java:2425) >> at >> com.sun.tools.javac.jvm.ClassReader.complete(ClassReader.java:2332) >> at com.sun.tools.javac.code.Symbol.complete(Symbol.java:426) >> at >> com.sun.tools.javac.code.Symbol$ClassSymbol.complete(Symbol.java:834) >> at >> com.sun.tools.javac.jvm.ClassReader.loadClass(ClassReader.java:2513) >> >> >> Note that if the classes are compiled together, no problem arises, i.e. >> >> javac *.java >> >> works as expected. Also, compiling the classes in the right sequence >> works: >> >> javac -cp . Anno.java >> javac -cp . Dep.java >> javac -cp . Main.java >> >> In the invocation that gives an exception we're trying to determine >> the position for an annotation that doesn't have its TypeCompound set >> yet. >> I failed at tracking down why the TypeCompound is set when invoked >> with all classes, but not when invoked with just one. >> >> Ideas? >> >> Thanks, >> cu, WMD. >> > -- http://www.google.com/profiles/wdietl From joel.franck at oracle.com Tue Dec 18 08:02:37 2012 From: joel.franck at oracle.com (=?ISO-8859-1?Q?Joel_Borggr=E9n-Franck?=) Date: Tue, 18 Dec 2012 17:02:37 +0100 Subject: Initial set of interfaces for reflection of type annotations Message-ID: <50D0939D.7050008@oracle.com> Hi Werner, Here http://cr.openjdk.java.net/~jfranck/type-annotations/webrev.v0/ is a webrev for the interfaces we plan to use for reflection. With a very rough draft of some javadocs (thanks to Alex) errors are mine, expect changes. Can you push this for me to the jdk subforest? cheers /Joel From wdietl at gmail.com Tue Dec 18 13:18:56 2012 From: wdietl at gmail.com (Werner Dietl) Date: Tue, 18 Dec 2012 13:18:56 -0800 Subject: Initial set of interfaces for reflection of type annotations In-Reply-To: <50D0939D.7050008@oracle.com> References: <50D0939D.7050008@oracle.com> Message-ID: Hi Joel, thanks for this patch! > Here http://cr.openjdk.java.net/~jfranck/type-annotations/webrev.v0/ is a > webrev for the interfaces we plan to use for reflection. With a very rough > draft of some javadocs (thanks to Alex) errors are mine, expect changes. Usually the changes are started with: // AnnotatedType since 1.8 This is not the case in: src/share/classes/java/lang/reflect/TypeVariable.java The new classes and methods should contain "@since 1.8", I assume. > Can you push this for me to the jdk subforest? I assume this means taking the patch, applying it locally, and then committing it with some message. Or is there some bundle with a change message somewhere? cu, WMD. -- http://www.google.com/profiles/wdietl From joel.franck at oracle.com Wed Dec 19 02:12:50 2012 From: joel.franck at oracle.com (=?iso-8859-1?Q?Joel_Borggr=E9n-Franck?=) Date: Wed, 19 Dec 2012 11:12:50 +0100 Subject: Initial set of interfaces for reflection of type annotations In-Reply-To: References: <50D0939D.7050008@oracle.com> Message-ID: <2C9F9BD5-49C7-4987-BA2D-D9499C556263@oracle.com> On Dec 18, 2012, at 10:18 PM, Werner Dietl wrote: > >> Can you push this for me to the jdk subforest? > > I assume this means taking the patch, applying it locally, and then > committing it with some message. > Or is there some bundle with a change message somewhere? > The former. thanks! cheers /Joel From wdietl at gmail.com Wed Dec 19 21:56:58 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 20 Dec 2012 05:56:58 +0000 Subject: hg: type-annotations/type-annotations/langtools: 15 new changesets Message-ID: <20121220055739.D0F6E472BE@hg.openjdk.java.net> Changeset: 02a18f209ab3 Author: vromero Date: 2012-12-17 14:54 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/02a18f209ab3 8004814: javadoc should be able to detect default methods Reviewed-by: jjg Contributed-by: maurizio.cimadamore at oracle.com ! src/share/classes/com/sun/javadoc/ClassDoc.java ! src/share/classes/com/sun/javadoc/MethodDoc.java ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Changeset: 75ab654b5cd5 Author: jjg Date: 2012-12-17 07:47 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/75ab654b5cd5 8004832: Add new doclint package Reviewed-by: mcimadamore ! make/build.properties ! src/share/classes/com/sun/source/util/DocTrees.java ! src/share/classes/com/sun/source/util/JavacTask.java ! src/share/classes/com/sun/source/util/TreePath.java + src/share/classes/com/sun/tools/doclint/Checker.java + src/share/classes/com/sun/tools/doclint/DocLint.java + src/share/classes/com/sun/tools/doclint/Entity.java + src/share/classes/com/sun/tools/doclint/Env.java + src/share/classes/com/sun/tools/doclint/HtmlTag.java + src/share/classes/com/sun/tools/doclint/Messages.java + src/share/classes/com/sun/tools/doclint/resources/doclint.properties ! src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/api/JavacTrees.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/model/JavacTypes.java ! src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties ! src/share/classes/com/sun/tools/javac/tree/DCTree.java ! src/share/classes/com/sun/tools/javac/tree/DocPretty.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java + test/tools/doclint/AccessTest.java + test/tools/doclint/AccessTest.package.out + test/tools/doclint/AccessTest.private.out + test/tools/doclint/AccessTest.protected.out + test/tools/doclint/AccessTest.public.out + test/tools/doclint/AccessibilityTest.java + test/tools/doclint/AccessibilityTest.out + test/tools/doclint/DocLintTester.java + test/tools/doclint/EmptyAuthorTest.java + test/tools/doclint/EmptyAuthorTest.out + test/tools/doclint/EmptyExceptionTest.java + test/tools/doclint/EmptyExceptionTest.out + test/tools/doclint/EmptyParamTest.java + test/tools/doclint/EmptyParamTest.out + test/tools/doclint/EmptyReturnTest.java + test/tools/doclint/EmptyReturnTest.out + test/tools/doclint/EmptySerialDataTest.java + test/tools/doclint/EmptySerialDataTest.out + test/tools/doclint/EmptySerialFieldTest.java + test/tools/doclint/EmptySerialFieldTest.out + test/tools/doclint/EmptySinceTest.java + test/tools/doclint/EmptySinceTest.out + test/tools/doclint/EmptyVersionTest.java + test/tools/doclint/EmptyVersionTest.out + test/tools/doclint/HtmlAttrsTest.java + test/tools/doclint/HtmlAttrsTest.out + test/tools/doclint/HtmlTagsTest.java + test/tools/doclint/HtmlTagsTest.out + test/tools/doclint/MissingCommentTest.java + test/tools/doclint/MissingCommentTest.out + test/tools/doclint/MissingParamsTest.java + test/tools/doclint/MissingParamsTest.out + test/tools/doclint/MissingReturnTest.java + test/tools/doclint/MissingReturnTest.out + test/tools/doclint/MissingThrowsTest.java + test/tools/doclint/MissingThrowsTest.out + test/tools/doclint/OptionTest.java + test/tools/doclint/OverridesTest.java + test/tools/doclint/ReferenceTest.java + test/tools/doclint/ReferenceTest.out + test/tools/doclint/RunTest.java + test/tools/doclint/SyntaxTest.java + test/tools/doclint/SyntaxTest.out + test/tools/doclint/SyntheticTest.java + test/tools/doclint/ValidTest.java + test/tools/doclint/tidy/AnchorAlreadyDefined.java + test/tools/doclint/tidy/AnchorAlreadyDefined.out + test/tools/doclint/tidy/BadEnd.java + test/tools/doclint/tidy/BadEnd.out + test/tools/doclint/tidy/InsertImplicit.java + test/tools/doclint/tidy/InsertImplicit.out + test/tools/doclint/tidy/InvalidEntity.java + test/tools/doclint/tidy/InvalidEntity.out + test/tools/doclint/tidy/InvalidName.java + test/tools/doclint/tidy/InvalidName.out + test/tools/doclint/tidy/InvalidTag.java + test/tools/doclint/tidy/InvalidTag.out + test/tools/doclint/tidy/InvalidURI.java + test/tools/doclint/tidy/InvalidURI.out + test/tools/doclint/tidy/MissingGT.java + test/tools/doclint/tidy/MissingGT.out + test/tools/doclint/tidy/MissingTag.java + test/tools/doclint/tidy/MissingTag.out + test/tools/doclint/tidy/NestedTag.java + test/tools/doclint/tidy/NestedTag.out + test/tools/doclint/tidy/ParaInPre.java + test/tools/doclint/tidy/ParaInPre.out + test/tools/doclint/tidy/README.txt + test/tools/doclint/tidy/RepeatedAttr.java + test/tools/doclint/tidy/RepeatedAttr.out + test/tools/doclint/tidy/TextNotAllowed.java + test/tools/doclint/tidy/TextNotAllowed.out + test/tools/doclint/tidy/TrimmingEmptyTag.java + test/tools/doclint/tidy/TrimmingEmptyTag.out + test/tools/doclint/tidy/UnescapedOrUnknownEntity.java + test/tools/doclint/tidy/UnescapedOrUnknownEntity.out + test/tools/doclint/tidy/util/Main.java + test/tools/doclint/tidy/util/tidy.sh + test/tools/javac/diags/examples/NoContent.java Changeset: f20568328a57 Author: mcimadamore Date: 2012-12-17 16:13 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f20568328a57 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method Summary: Some code paths in resolve do not use methodArguments to correctly format actuals Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java + test/tools/javac/lambda/BadMethodCall2.java + test/tools/javac/lambda/BadMethodCall2.out Changeset: 064e372f273d Author: jjg Date: 2012-12-17 10:55 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/064e372f273d 8004961: rename Plugin.call to Plugin.init Reviewed-by: mcimadamore ! src/share/classes/com/sun/source/util/Plugin.java ! src/share/classes/com/sun/tools/javac/main/Main.java ! test/tools/javac/plugin/showtype/ShowTypePlugin.java ! test/tools/javac/plugin/showtype/Test.java Changeset: ef537bcc825a Author: mchung Date: 2012-12-17 15:19 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/ef537bcc825a 8005137: Rename DocLint.call to DocLint.init which overrides Plugin.init Reviewed-by: darcy, jjh ! src/share/classes/com/sun/tools/doclint/DocLint.java Changeset: bc74006c2d8d Author: darcy Date: 2012-12-18 00:24 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bc74006c2d8d 8005046: Provide checking for a default method in javax.lang.model Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/javax/lang/model/element/ExecutableElement.java + test/tools/javac/processing/model/element/TestExecutableElement.java Changeset: 92fcf299cd09 Author: ohrstrom Date: 2012-12-18 10:23 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/92fcf299cd09 8004657: Add hooks to javac to enable reporting dependency information. Reviewed-by: jjg, mcimadamore ! src/share/classes/com/sun/tools/javac/api/JavacTool.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Changeset: 250f0acf880c Author: mcimadamore Date: 2012-12-18 22:16 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/250f0acf880c 8005193: New regression test test/tools/javac/lambda/BadMethodCall2.java fails Summary: Bad golden file in negative test Reviewed-by: jjh ! test/tools/javac/lambda/BadMethodCall2.out Changeset: d7360bf35ee1 Author: lana Date: 2012-12-14 13:15 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d7360bf35ee1 Merge Changeset: 573b38691a74 Author: lana Date: 2012-12-18 18:15 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/573b38691a74 Merge Changeset: 67b01d295cd2 Author: jjg Date: 2012-12-19 11:29 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/67b01d295cd2 8004833: Integrate doclint support into javac Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/main/Main.java ! src/share/classes/com/sun/tools/javac/main/Option.java ! src/share/classes/com/sun/tools/javac/resources/javac.properties + test/tools/javac/doclint/DocLintTest.java Changeset: f72c9c5aeaef Author: jfranck Date: 2012-12-16 11:09 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f72c9c5aeaef 8005098: Provide isSynthesized() information on Attribute.Compound Reviewed-by: jjg ! make/build.properties ! src/share/classes/com/sun/tools/javac/code/Attribute.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/comp/Annotate.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java ! src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ParameterImpl.java ! src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java Changeset: cf889b5faa1e Author: wmdietl Date: 2012-12-19 20:46 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cf889b5faa1e Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! make/build.properties ! src/share/classes/com/sun/source/util/TreePath.java ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/api/JavacTrees.java ! src/share/classes/com/sun/tools/javac/code/Attribute.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/comp/Annotate.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/model/JavacTypes.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties ! src/share/classes/com/sun/tools/javac/resources/javac.properties ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out Changeset: 4dcbe701180c Author: wmdietl Date: 2012-12-19 20:56 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4dcbe701180c Fix merge problem: call getRawTypeAttributes; will we add a getTypeAnnotationMirrors method? ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.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/model/JavacTypes.java Changeset: e8b469961865 Author: wmdietl Date: 2012-12-19 21:56 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e8b469961865 Adapt the generic location to the new bytecode format. ! test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java From wdietl at gmail.com Wed Dec 19 21:57:39 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 20 Dec 2012 05:57:39 +0000 Subject: hg: type-annotations/type-annotations: 4 new changesets Message-ID: <20121220055739.D407B472BF@hg.openjdk.java.net> Changeset: a0779b1e9a4d Author: jjg Date: 2012-12-17 08:34 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/a0779b1e9a4d 8005090: Include com.sun.source.doctree in Tree API docs Reviewed-by: erikj ! common/makefiles/javadoc/NON_CORE_PKGS.gmk Changeset: e08b0096058f Author: lana Date: 2012-12-14 11:22 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/e08b0096058f Merge Changeset: 68a81db3ceb1 Author: lana Date: 2012-12-18 17:42 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/68a81db3ceb1 Merge Changeset: e26a4a81c967 Author: wmdietl Date: 2012-12-19 21:02 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/e26a4a81c967 Automated merge with http://hg.openjdk.java.net/jdk8/tl/ From wdietl at gmail.com Wed Dec 19 22:01:48 2012 From: wdietl at gmail.com (Werner Dietl) Date: Wed, 19 Dec 2012 22:01:48 -0800 Subject: Initial set of interfaces for reflection of type annotations In-Reply-To: <2C9F9BD5-49C7-4987-BA2D-D9499C556263@oracle.com> References: <50D0939D.7050008@oracle.com> <2C9F9BD5-49C7-4987-BA2D-D9499C556263@oracle.com> Message-ID: Pushed: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cf56e816713b cu, WMD. On Wed, Dec 19, 2012 at 2:12 AM, Joel Borggr?n-Franck wrote: > > On Dec 18, 2012, at 10:18 PM, Werner Dietl wrote: > >> >>> Can you push this for me to the jdk subforest? >> >> I assume this means taking the patch, applying it locally, and then >> committing it with some message. >> Or is there some bundle with a change message somewhere? >> > > The former. > > thanks! > > cheers > /Joel -- http://www.google.com/profiles/wdietl From wdietl at gmail.com Wed Dec 19 21:58:19 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 20 Dec 2012 05:58:19 +0000 Subject: hg: type-annotations/type-annotations/jdk: 23 new changesets Message-ID: <20121220060320.8B63D472C0@hg.openjdk.java.net> Changeset: a02212de8db6 Author: uta Date: 2012-12-17 14:34 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/a02212de8db6 8004928: TEST_BUG: Reduce dependence of CoreLib tests from the AWT subsystem Summary: the tests were refactored to drop AWT dependence where it was possible. Reviewed-by: alanb, mchung ! test/java/io/Serializable/resolveProxyClass/NonPublicInterface.java ! test/java/lang/Throwable/LegacyChainedExceptionSerialization.java ! test/java/lang/management/CompilationMXBean/Basic.java ! test/java/lang/reflect/Generics/Probe.java ! test/java/lang/reflect/Proxy/ClassRestrictions.java ! test/java/util/Collections/EmptyIterator.java ! test/java/util/logging/LoggingDeadlock4.java ! test/sun/tools/jrunscript/common.sh Changeset: e4d88a7352c6 Author: mullan Date: 2012-12-17 08:28 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e4d88a7352c6 8004234: Downgrade normative references to ${java.home}/lib/security/krb5.conf Reviewed-by: alanb, weijun ! src/share/classes/javax/security/auth/kerberos/package.html Changeset: 4a21f818ebb1 Author: mullan Date: 2012-12-17 08:30 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4a21f818ebb1 Merge - src/share/classes/sun/awt/TextureSizeConstraining.java - test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java Changeset: bcf79e6f52a0 Author: chegar Date: 2012-12-17 16:27 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bcf79e6f52a0 8005081: java/util/prefs/PrefsSpi.sh fails on macos-x Reviewed-by: alanb ! test/java/util/prefs/PrefsSpi.sh Changeset: 9f1b516cd9cb Author: jjg Date: 2012-12-17 08:34 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9f1b516cd9cb 8005090: Include com.sun.source.doctree in Tree API docs Reviewed-by: erikj ! make/docs/NON_CORE_PKGS.gmk Changeset: bac477d67867 Author: jjg Date: 2012-12-17 10:31 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/bac477d67867 8004832: Add new doclint package Reviewed-by: erikj, ohair ! make/common/Release.gmk ! make/common/internal/Defs-langtools.gmk ! makefiles/CreateJars.gmk Changeset: 0fabdf676395 Author: martin Date: 2012-12-17 18:39 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0fabdf676395 8004863: Infinite Loop in KeepAliveStream Reviewed-by: chegar ! src/share/classes/sun/net/www/http/KeepAliveStream.java + test/sun/net/www/http/KeepAliveStream/InfiniteLoop.java Changeset: 0a1398021c7c Author: darcy Date: 2012-12-18 14:44 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0a1398021c7c 8005042: Add Method.isDefault to core reflection Reviewed-by: alanb, forax, mduigou, jgish, mchung ! src/share/classes/java/lang/reflect/Method.java + test/java/lang/reflect/Method/IsDefaultTest.java Changeset: 6d977f61af5e Author: darcy Date: 2012-12-18 14:49 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/6d977f61af5e 8004699: Add type annotation storage to Constructor, Field and Method Reviewed-by: darcy, dholmes Contributed-by: joel.franck at oracle.com ! src/share/classes/java/lang/reflect/Constructor.java ! src/share/classes/java/lang/reflect/Field.java ! src/share/classes/java/lang/reflect/Method.java Changeset: e8b54ae97344 Author: jviswana Date: 2012-12-12 13:28 +0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e8b54ae97344 8004316: Printer - tempfile having incorrect extension Reviewed-by: bae, jgodinez ! src/solaris/classes/sun/print/UnixPrintJob.java Changeset: fd9e6b4c8488 Author: lana Date: 2012-12-14 11:21 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/fd9e6b4c8488 Merge Changeset: c69424f78060 Author: serb Date: 2012-12-11 19:45 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c69424f78060 7154778: [macosx] NSView-based implementation of sun.awt.EmbeddedFrame Summary: The new implementation of EmbeddedFrame to support SWT_AWT Bridge Reviewed-by: anthony, serb, leonidr Contributed-by: Petr Pchelko ! src/macosx/classes/sun/lwawt/LWToolkit.java ! src/macosx/classes/sun/lwawt/LWWindowPeer.java ! src/macosx/classes/sun/lwawt/PlatformWindow.java ! src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java ! src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java ! src/macosx/classes/sun/lwawt/macosx/CPlatformView.java ! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java ! src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java + src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java + src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java ! src/macosx/classes/sun/lwawt/macosx/CWrapper.java ! src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java ! src/macosx/native/sun/awt/AWTSurfaceLayers.m ! src/macosx/native/sun/awt/AWTView.m ! src/macosx/native/sun/awt/AWTWindow.m ! src/macosx/native/sun/awt/CCursorManager.m ! src/macosx/native/sun/awt/CWrapper.m ! src/macosx/native/sun/awt/awt.m ! src/macosx/native/sun/java2d/opengl/CGLLayer.m ! src/macosx/native/sun/osxapp/ThreadUtilities.h ! src/macosx/native/sun/osxapp/ThreadUtilities.m Changeset: e016ad35a764 Author: kshefov Date: 2012-12-13 15:14 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e016ad35a764 7132385: [macosx] IconifyTest of RepaintManager could use some delay Reviewed-by: serb, alexsch + test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java Changeset: 71e03e17c183 Author: kshefov Date: 2012-12-14 13:32 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/71e03e17c183 6757986: javax/swing/JInternalFrame/5066752/bug5066752.java needs correction Reviewed-by: serb, alexsch + test/javax/swing/JInternalFrame/5066752/bug5066752.java Changeset: 9fc7460ca3ac Author: lana Date: 2012-12-14 11:22 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9fc7460ca3ac Merge Changeset: de6b54a60d60 Author: lana Date: 2012-12-14 13:14 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/de6b54a60d60 Merge ! makefiles/CompileNativeLibraries.gmk - src/share/lib/security/java.security - test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java Changeset: e515956879cd Author: lana Date: 2012-12-18 18:14 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e515956879cd Merge Changeset: c79b26b8efe0 Author: sjiang Date: 2012-12-19 11:06 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c79b26b8efe0 7158614: JMXStartStopTest.sh failing intermittently Summary: fixed 3 problems here: 1) checked the lock file too eary 2) never got the process id of a java test 3) some shell commands were not supported in some Solaris machines. Reviewed-by: dsamersoff, alanb ! test/ProblemList.txt ! test/sun/management/jmxremote/startstop/JMXStartStopDoSomething.java ! test/sun/management/jmxremote/startstop/JMXStartStopTest.sh Changeset: 3fd3bcc8bd42 Author: joehw Date: 2012-12-19 12:09 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3fd3bcc8bd42 8004371: (props) Properties.loadFromXML needs small footprint XML parser as fallback when JAXP is not present Reviewed-by: alanb, mchung, psandoz + src/share/classes/jdk/internal/org/xml/sax/Attributes.java + src/share/classes/jdk/internal/org/xml/sax/ContentHandler.java + src/share/classes/jdk/internal/org/xml/sax/DTDHandler.java + src/share/classes/jdk/internal/org/xml/sax/EntityResolver.java + src/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java + src/share/classes/jdk/internal/org/xml/sax/InputSource.java + src/share/classes/jdk/internal/org/xml/sax/Locator.java + src/share/classes/jdk/internal/org/xml/sax/SAXException.java + src/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java + src/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java + src/share/classes/jdk/internal/org/xml/sax/SAXParseException.java + src/share/classes/jdk/internal/org/xml/sax/XMLReader.java + src/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java + src/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java + src/share/classes/jdk/internal/util/xml/SAXParser.java + src/share/classes/jdk/internal/util/xml/XMLStreamException.java + src/share/classes/jdk/internal/util/xml/XMLStreamWriter.java + src/share/classes/jdk/internal/util/xml/impl/Attrs.java + src/share/classes/jdk/internal/util/xml/impl/Input.java + src/share/classes/jdk/internal/util/xml/impl/Pair.java + src/share/classes/jdk/internal/util/xml/impl/Parser.java + src/share/classes/jdk/internal/util/xml/impl/ParserSAX.java + src/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java + src/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java + src/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java + src/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java + src/share/classes/jdk/internal/util/xml/impl/XMLWriter.java Changeset: cf15abdcdf88 Author: alanb Date: 2012-12-19 14:53 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cf15abdcdf88 8005248: (props) Integrate small footprint parser into Properties Reviewed-by: joehw, mchung, psandoz, erikj ! make/jdk/Makefile - make/jdk/asm/Makefile ! src/share/classes/java/util/Properties.java + src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java ! test/java/util/Properties/LoadAndStoreXML.java + test/java/util/Properties/invalidxml/BadCase.xml + test/java/util/Properties/invalidxml/BadDocType.xml.excluded + test/java/util/Properties/invalidxml/NoClosingTag.xml + test/java/util/Properties/invalidxml/NoDocType.xml.excluded + test/java/util/Properties/invalidxml/NoRoot.xml + test/java/util/Properties/invalidxml/NotQuoted.xml + test/java/util/Properties/invalidxml/README.txt Changeset: 1f9c19741285 Author: darcy Date: 2012-12-19 11:53 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1f9c19741285 8005097: Tie isSynthetic javadoc to the JLS Reviewed-by: mduigou ! src/share/classes/java/lang/Class.java ! src/share/classes/java/lang/reflect/Constructor.java ! src/share/classes/java/lang/reflect/Executable.java ! src/share/classes/java/lang/reflect/Member.java ! src/share/classes/java/lang/reflect/Method.java Changeset: 5675bb48b801 Author: wmdietl Date: 2012-12-19 20:57 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/5675bb48b801 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk Changeset: cf56e816713b Author: wmdietl Date: 2012-12-19 21:00 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/cf56e816713b Reflection support for type annotations. Patch from jfranck from Tue Dec 18 16:54:01 CET 2012. ! src/share/classes/java/lang/Class.java + src/share/classes/java/lang/reflect/AnnotatedArrayType.java + src/share/classes/java/lang/reflect/AnnotatedParameterizedType.java + src/share/classes/java/lang/reflect/AnnotatedType.java + src/share/classes/java/lang/reflect/AnnotatedTypeVariable.java + src/share/classes/java/lang/reflect/AnnotatedWildcardType.java ! src/share/classes/java/lang/reflect/Executable.java ! src/share/classes/java/lang/reflect/Field.java ! src/share/classes/java/lang/reflect/TypeVariable.java ! src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java From wdietl at gmail.com Wed Dec 19 22:06:58 2012 From: wdietl at gmail.com (Werner Dietl) Date: Wed, 19 Dec 2012 22:06:58 -0800 Subject: type-annotations build status Message-ID: I just pushed an update that makes NestedTypes pass, which was the last type-annotations related test that failed for me: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e8b469961865 Let me know whether those generic-location numbers sound right. I also pushed Joel's patch to add reflection support and pulled in all TL changes. Steve, how does the build look for you? If everything looks OK, this would be a good build to promote - it should be a usable snapshot. cu, WMD. -- http://www.google.com/profiles/wdietl From steve.sides at oracle.com Wed Dec 19 22:46:20 2012 From: steve.sides at oracle.com (Steve Sides) Date: Wed, 19 Dec 2012 22:46:20 -0800 Subject: type-annotations build status In-Reply-To: References: Message-ID: <50D2B43C.7000405@oracle.com> Hi Werner, type-annotations builds kick off at 6am. By the time I get in, testing should be far enough along to have an idea. If it looks okay, we can promote the build to java.net tomorrow. I'll let you know. -steve On 12/19/2012 10:06 PM, Werner Dietl wrote: > I just pushed an update that makes NestedTypes pass, which was the > last type-annotations related test that failed for me: > > http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e8b469961865 > > Let me know whether those generic-location numbers sound right. > > I also pushed Joel's patch to add reflection support and pulled in all > TL changes. > > Steve, how does the build look for you? > > If everything looks OK, this would be a good build to promote - it > should be a usable snapshot. > cu, WMD. > From steve.sides at oracle.com Thu Dec 20 11:18:57 2012 From: steve.sides at oracle.com (Steve Sides) Date: Thu, 20 Dec 2012 11:18:57 -0800 Subject: type-annotations build status In-Reply-To: <50D2B43C.7000405@oracle.com> References: <50D2B43C.7000405@oracle.com> Message-ID: <50D364A1.7010407@oracle.com> Hi Werner, Builds and testing looks good. I'm just waiting for the last build to finish before we can push it to java.net. Other than some @ignore tests, there are 2 that are failing. tools/javac/incompleteStatements/T8000484.java - has been noted before on this list This is code with incompete try-catch (or catch-notry as the case may be) and produces extra diagnostics with type-annotation builds and passes with jdk8 and lambda builds. tools/javac/T8003967/DetectMutableStaticFields.java - The bug has been fixed in jdk8. Bug: http://bugs.sun.com/view_bug.do?bug_id=8000484 It has failed the last 2 builds (12/17 and 12/20). Looks like 'targets' was changed to final in com/sun/tools/javac/code/TargetType.java after the code was duplicated into com/sun/tools/classfile/TypeAnnotation.java. When the last build is finished, I believe we can promote with these as is. -steve On 12/19/2012 10:46 PM, Steve Sides wrote: > Hi Werner, > type-annotations builds kick off at 6am. By the time I get in, > testing should be far enough along to have an idea. > If it looks okay, we can promote the build to java.net tomorrow. I'll > let you know. > > -steve > > On 12/19/2012 10:06 PM, Werner Dietl wrote: >> I just pushed an update that makes NestedTypes pass, which was the >> last type-annotations related test that failed for me: >> >> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e8b469961865 >> >> >> Let me know whether those generic-location numbers sound right. >> >> I also pushed Joel's patch to add reflection support and pulled in all >> TL changes. >> >> Steve, how does the build look for you? >> >> If everything looks OK, this would be a good build to promote - it >> should be a usable snapshot. >> cu, WMD. >> > From wdietl at gmail.com Thu Dec 20 13:08:40 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 20 Dec 2012 21:08:40 +0000 Subject: hg: type-annotations/type-annotations/langtools: 5 new changesets Message-ID: <20121220210855.BA06747303@hg.openjdk.java.net> Changeset: 9c500e46b6d9 Author: wmdietl Date: 2012-12-20 12:53 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9c500e46b6d9 Add a getTypeAnnotationMirrors method. ! src/share/classes/com/sun/tools/javac/code/Symbol.java Changeset: 13c8636239dd Author: wmdietl Date: 2012-12-20 12:55 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/13c8636239dd Ensure that duplicate code in TypeAnnotation and TargetType is in sync. Change TargetType tag to be a byte everywhere. ! src/share/classes/com/sun/tools/classfile/TypeAnnotation.java ! src/share/classes/com/sun/tools/javac/code/TargetType.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Changeset: d919420c2182 Author: wmdietl Date: 2012-12-20 13:07 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d919420c2182 Error recovery code was lost in a merge. ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java Changeset: a22f23fb7abf Author: jjg Date: 2012-12-20 17:59 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a22f23fb7abf 8005307: fix missing @bug tags Reviewed-by: jjh ! test/tools/doclint/AccessTest.java ! test/tools/doclint/AccessTest.package.out ! test/tools/doclint/AccessTest.private.out ! test/tools/doclint/AccessTest.protected.out ! test/tools/doclint/AccessTest.public.out ! test/tools/doclint/AccessibilityTest.java ! test/tools/doclint/AccessibilityTest.out ! test/tools/doclint/EmptyAuthorTest.java ! test/tools/doclint/EmptyAuthorTest.out ! test/tools/doclint/EmptyExceptionTest.java ! test/tools/doclint/EmptyExceptionTest.out ! test/tools/doclint/EmptyParamTest.java ! test/tools/doclint/EmptyParamTest.out ! test/tools/doclint/EmptyReturnTest.java ! test/tools/doclint/EmptyReturnTest.out ! test/tools/doclint/EmptySerialDataTest.java ! test/tools/doclint/EmptySerialDataTest.out ! test/tools/doclint/EmptySerialFieldTest.java ! test/tools/doclint/EmptySerialFieldTest.out ! test/tools/doclint/EmptySinceTest.java ! test/tools/doclint/EmptySinceTest.out ! test/tools/doclint/EmptyVersionTest.java ! test/tools/doclint/EmptyVersionTest.out ! test/tools/doclint/HtmlAttrsTest.java ! test/tools/doclint/HtmlAttrsTest.out ! test/tools/doclint/HtmlTagsTest.java ! test/tools/doclint/HtmlTagsTest.out ! test/tools/doclint/MissingParamsTest.java ! test/tools/doclint/MissingParamsTest.out ! test/tools/doclint/MissingReturnTest.java ! test/tools/doclint/MissingReturnTest.out ! test/tools/doclint/MissingThrowsTest.java ! test/tools/doclint/MissingThrowsTest.out ! test/tools/doclint/OptionTest.java ! test/tools/doclint/OverridesTest.java ! test/tools/doclint/ReferenceTest.java ! test/tools/doclint/ReferenceTest.out ! test/tools/doclint/RunTest.java ! test/tools/doclint/SyntaxTest.java ! test/tools/doclint/SyntaxTest.out ! test/tools/doclint/SyntheticTest.java ! test/tools/doclint/ValidTest.java ! test/tools/doclint/tidy/AnchorAlreadyDefined.java ! test/tools/doclint/tidy/AnchorAlreadyDefined.out ! test/tools/doclint/tidy/BadEnd.java ! test/tools/doclint/tidy/BadEnd.out ! test/tools/doclint/tidy/InsertImplicit.java ! test/tools/doclint/tidy/InsertImplicit.out ! test/tools/doclint/tidy/InvalidEntity.java ! test/tools/doclint/tidy/InvalidEntity.out ! test/tools/doclint/tidy/InvalidName.java ! test/tools/doclint/tidy/InvalidName.out ! test/tools/doclint/tidy/InvalidTag.java ! test/tools/doclint/tidy/InvalidTag.out ! test/tools/doclint/tidy/InvalidURI.java ! test/tools/doclint/tidy/InvalidURI.out ! test/tools/doclint/tidy/MissingGT.java ! test/tools/doclint/tidy/MissingGT.out ! test/tools/doclint/tidy/MissingTag.java ! test/tools/doclint/tidy/MissingTag.out ! test/tools/doclint/tidy/NestedTag.java ! test/tools/doclint/tidy/NestedTag.out ! test/tools/doclint/tidy/ParaInPre.java ! test/tools/doclint/tidy/ParaInPre.out ! test/tools/doclint/tidy/RepeatedAttr.java ! test/tools/doclint/tidy/RepeatedAttr.out ! test/tools/doclint/tidy/TextNotAllowed.java ! test/tools/doclint/tidy/TextNotAllowed.out ! test/tools/doclint/tidy/TrimmingEmptyTag.java ! test/tools/doclint/tidy/TrimmingEmptyTag.out ! test/tools/doclint/tidy/UnescapedOrUnknownEntity.java ! test/tools/doclint/tidy/UnescapedOrUnknownEntity.out Changeset: ad2045d6c1c1 Author: wmdietl Date: 2012-12-20 13:08 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/ad2045d6c1c1 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out From wdietl at gmail.com Thu Dec 20 13:11:23 2012 From: wdietl at gmail.com (Werner Dietl) Date: Thu, 20 Dec 2012 13:11:23 -0800 Subject: type-annotations build status In-Reply-To: <50D364A1.7010407@oracle.com> References: <50D2B43C.7000405@oracle.com> <50D364A1.7010407@oracle.com> Message-ID: Hi Steve, thanks for the update! > tools/javac/incompleteStatements/T8000484.java - has been noted before on > this list > This is code with incompete try-catch (or catch-notry as the case may be) > and produces extra diagnostics with type-annotation builds and passes with > jdk8 and lambda builds. Fixed. I apparently made a merge mistake at some point. > tools/javac/T8003967/DetectMutableStaticFields.java - The bug has been fixed > in jdk8. > Bug: http://bugs.sun.com/view_bug.do?bug_id=8000484 > It has failed the last 2 builds (12/17 and 12/20). > Looks like 'targets' was changed to final in > com/sun/tools/javac/code/TargetType.java after the code was duplicated into > com/sun/tools/classfile/TypeAnnotation.java. I also fixed this. In addition, the TargetType tag should now correctly be a byte; it previously was still a short. Please let me know how this looks to you. cu, WMD. > On 12/19/2012 10:46 PM, Steve Sides wrote: >> >> Hi Werner, >> type-annotations builds kick off at 6am. By the time I get in, testing >> should be far enough along to have an idea. >> If it looks okay, we can promote the build to java.net tomorrow. I'll let >> you know. >> >> -steve >> >> On 12/19/2012 10:06 PM, Werner Dietl wrote: >>> >>> I just pushed an update that makes NestedTypes pass, which was the >>> last type-annotations related test that failed for me: >>> >>> >>> http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e8b469961865 >>> >>> Let me know whether those generic-location numbers sound right. >>> >>> I also pushed Joel's patch to add reflection support and pulled in all >>> TL changes. >>> >>> Steve, how does the build look for you? >>> >>> If everything looks OK, this would be a good build to promote - it >>> should be a usable snapshot. >>> cu, WMD. >>> >> > -- http://www.google.com/profiles/wdietl From wdietl at gmail.com Thu Dec 20 13:09:26 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Thu, 20 Dec 2012 21:09:26 +0000 Subject: hg: type-annotations/type-annotations/jdk: 9 new changesets Message-ID: <20121220211140.6697447304@hg.openjdk.java.net> Changeset: b600d490dc57 Author: dsamersoff Date: 2012-12-20 16:02 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/b600d490dc57 6783290: MBeanInfo/MBeanFeatureInfo has inconsistent readObject/writeObject Summary: call readObject in all cases Reviewed-by: emcmanus Contributed-by: jaroslav.bachorik at oracle.com ! src/share/classes/javax/management/MBeanFeatureInfo.java ! src/share/classes/javax/management/MBeanInfo.java Changeset: e43f90d5af11 Author: dsamersoff Date: 2012-12-20 16:56 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/e43f90d5af11 6937053: RMI unmarshalling errors in ClientNotifForwarder cause silent failure Summary: the catch block in the fetchNotifs() method is extended to expect UnmarshalException Reviewed-by: emcmanus Contributed-by: jaroslav.bachorik at oracle.com ! src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java Changeset: 3f014bc09297 Author: dsamersoff Date: 2012-12-20 17:24 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3f014bc09297 7009998: JMX synchronization during connection restart is faulty Summary: add a return statement after the re-connecting has finished and the state is CONNECTED Reviewed-by: sjiang Contributed-by: jaroslav.bachorik at oracle.com ! make/netbeans/jmx/build.properties ! src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java Changeset: d01a810798e0 Author: dl Date: 2012-12-20 13:44 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d01a810798e0 8002356: Add ForkJoin common pool and CountedCompleter Reviewed-by: chegar, mduigou ! make/java/java/FILES_java.gmk + src/share/classes/java/util/concurrent/CountedCompleter.java ! src/share/classes/java/util/concurrent/ForkJoinPool.java ! src/share/classes/java/util/concurrent/ForkJoinTask.java ! src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java Changeset: 31d2f9995d6c Author: chegar Date: 2012-12-20 15:04 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/31d2f9995d6c 8005306: Redundant cast warning in KeepAliveStream.java Reviewed-by: alanb ! src/share/classes/sun/net/www/http/KeepAliveStream.java Changeset: c1a55ee9618e Author: dsamersoff Date: 2012-12-20 20:12 +0400 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c1a55ee9618e 8005309: Missed tests for 6783290,6937053,7009998 Summary: Missed tests for 6783290,6937053,7009998 Reviewed-by: sjiang, emcmanus Contributed-by: jaroslav.bachorik at oracle.com + test/com/sun/jmx/remote/CCAdminReconnectTest.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Client/ConfigKey.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Client/TestNotification.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Server/ConfigKey.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Server/Server.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Server/Ste.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Server/SteMBean.java + test/com/sun/jmx/remote/NotificationMarshalVersions/Server/TestNotification.java + test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.sh + test/javax/management/MBeanInfo/SerializationTest1.java Changeset: edb71a37fcb7 Author: alanb Date: 2012-12-20 20:29 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/edb71a37fcb7 8001048: JSR-160: Allow IIOP transport to be optional Reviewed-by: dsamersoff, dfuchs, mchung ! src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java ! src/share/classes/javax/management/remote/JMXConnectorFactory.java ! src/share/classes/javax/management/remote/JMXConnectorServerFactory.java ! src/share/classes/javax/management/remote/rmi/RMIConnector.java ! src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java ! src/share/classes/javax/management/remote/rmi/package.html ! test/javax/management/remote/mandatory/connection/AddressableTest.java ! test/javax/management/remote/mandatory/connection/CloseableTest.java ! test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java ! test/javax/management/remote/mandatory/connection/IIOPURLTest.java ! test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java ! test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java ! test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java ! test/javax/management/remote/mandatory/loading/MissingClassTest.java ! test/javax/management/remote/mandatory/provider/ProviderTest.java ! test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java Changeset: eeda18683ddc Author: alanb Date: 2012-12-20 20:40 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/eeda18683ddc 8005281: (props) loadFromXML/storeToXML with small parser is not thread safe Reviewed-by: mchung ! src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java + test/java/util/Properties/ConcurrentLoadAndStoreXML.java Changeset: 8e035b8da035 Author: wmdietl Date: 2012-12-20 13:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/8e035b8da035 Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From steve.sides at oracle.com Fri Dec 21 14:33:40 2012 From: steve.sides at oracle.com (Steve Sides) Date: Fri, 21 Dec 2012 14:33:40 -0800 Subject: Type Annotations binary build (b69) available In-Reply-To: <50C7910B.2030800@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> Message-ID: <50D4E3C4.3060001@oracle.com> I am again pleased to announce the latest binary builds of the JSR 308 Reference Implementation are available at http://jdk8.java.net/type-annotations The builds were generated from the type-annotations/type-annotations forest on 12/21/2012. Please see the Type Annotations project page for a link to the JSR 308 Specification. This forest is regularly updated from jdk8/jdk8 and jdk8/tl. Werner can provide exact details. Steve From wdietl at gmail.com Fri Dec 21 14:40:32 2012 From: wdietl at gmail.com (Werner Dietl) Date: Fri, 21 Dec 2012 14:40:32 -0800 Subject: Type Annotations binary build (b69) available In-Reply-To: <50D4E3C4.3060001@oracle.com> References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> <50D4E3C4.3060001@oracle.com> Message-ID: Great, thanks! Does this mean all test cases passed? cu, WMD. On Fri, Dec 21, 2012 at 2:33 PM, Steve Sides wrote: > I am again pleased to announce the latest binary builds of the JSR 308 > Reference Implementation are available at > http://jdk8.java.net/type-annotations > > The builds were generated from the type-annotations/type-annotations forest > on 12/21/2012. > > Please see the Type Annotations project page for a link to the JSR 308 > Specification. > > This forest is regularly updated from jdk8/jdk8 and jdk8/tl. Werner can > provide exact details. > > Steve -- http://www.google.com/profiles/wdietl From wdietl at gmail.com Fri Dec 21 14:53:32 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Fri, 21 Dec 2012 22:53:32 +0000 Subject: hg: type-annotations/type-annotations/langtools: 4 new changesets Message-ID: <20121221225345.E8FEB4735C@hg.openjdk.java.net> Changeset: 1d096fedb763 Author: wmdietl Date: 2012-12-21 14:53 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/1d096fedb763 Adapt test case naming to slightly changed specification example. ! test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java ! test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java Changeset: b52a38d4536c Author: darcy Date: 2012-12-21 08:45 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/b52a38d4536c 8005282: Use @library tag with non-relative path for javac tests Reviewed-by: jjg ! test/tools/javac/7129225/TestImportStar.java ! test/tools/javac/cast/intersection/model/Model01.java ! test/tools/javac/classreader/T7031108.java ! test/tools/javac/enum/6350057/T6350057.java ! test/tools/javac/enum/6424358/T6424358.java ! test/tools/javac/file/T7018098.java ! test/tools/javac/multicatch/model/ModelChecker.java ! test/tools/javac/options/T7022337.java ! test/tools/javac/processing/6348499/T6348499.java ! test/tools/javac/processing/6359313/T6359313.java ! test/tools/javac/processing/6365040/T6365040.java ! test/tools/javac/processing/6413690/T6413690.java ! test/tools/javac/processing/6414633/T6414633.java ! test/tools/javac/processing/6430209/T6430209.java ! test/tools/javac/processing/6499119/ClassProcessor.java ! test/tools/javac/processing/6511613/clss41701.java ! test/tools/javac/processing/6512707/T6512707.java ! test/tools/javac/processing/6634138/T6634138.java ! test/tools/javac/processing/6994946/SemanticErrorTest.java ! test/tools/javac/processing/6994946/SyntaxErrorTest.java ! test/tools/javac/processing/T6920317.java ! test/tools/javac/processing/T7196462.java ! test/tools/javac/processing/TestWarnErrorCount.java ! test/tools/javac/processing/environment/TestSourceVersion.java ! test/tools/javac/processing/environment/round/TestContext.java ! test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java ! test/tools/javac/processing/errors/TestErrorCount.java ! test/tools/javac/processing/errors/TestFatalityOfParseErrors.java ! test/tools/javac/processing/errors/TestOptionSyntaxErrors.java ! test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java ! test/tools/javac/processing/errors/TestReturnCode.java ! test/tools/javac/processing/filer/TestFilerConstraints.java ! test/tools/javac/processing/filer/TestGetResource.java ! test/tools/javac/processing/filer/TestGetResource2.java ! test/tools/javac/processing/filer/TestInvalidRelativeNames.java ! test/tools/javac/processing/filer/TestLastRound.java ! test/tools/javac/processing/filer/TestPackageInfo.java ! test/tools/javac/processing/filer/TestValidRelativeNames.java ! test/tools/javac/processing/messager/6362067/T6362067.java ! test/tools/javac/processing/messager/MessagerBasics.java ! test/tools/javac/processing/model/6194785/T6194785.java ! test/tools/javac/processing/model/6341534/T6341534.java ! test/tools/javac/processing/model/element/TestAnonClassNames.java ! test/tools/javac/processing/model/element/TestElement.java ! test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java ! test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java ! test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java ! test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java ! test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java ! test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java ! test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java ! test/tools/javac/processing/model/element/TestNames.java ! test/tools/javac/processing/model/element/TestPackageElement.java ! test/tools/javac/processing/model/element/TestResourceElement.java ! test/tools/javac/processing/model/element/TestResourceVariable.java ! test/tools/javac/processing/model/element/TestTypeParameter.java ! test/tools/javac/processing/model/element/TypeParamBounds.java ! test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java ! test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java ! test/tools/javac/processing/model/type/NoTypes.java ! test/tools/javac/processing/model/type/TestUnionType.java ! test/tools/javac/processing/model/util/BinaryName.java ! test/tools/javac/processing/model/util/GetTypeElemBadArg.java ! test/tools/javac/processing/model/util/NoSupers.java ! test/tools/javac/processing/model/util/OverridesSpecEx.java ! test/tools/javac/processing/model/util/TypesBadArg.java ! test/tools/javac/processing/model/util/deprecation/TestDeprecation.java ! test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java ! test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java ! test/tools/javac/processing/model/util/elements/TestGetPackageOf.java ! test/tools/javac/processing/model/util/filter/TestIterables.java ! test/tools/javac/processing/options/testCommandLineClasses/Test.java ! test/tools/javac/processing/options/testPrintProcessorInfo/Test.java ! test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java ! test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java ! test/tools/javac/processing/werror/WError1.java ! test/tools/javac/processing/werror/WErrorGen.java ! test/tools/javac/processing/werror/WErrorLast.java ! test/tools/javac/resolve/ResolveHarness.java ! test/tools/javac/util/T6597678.java ! test/tools/javac/util/context/T7021650.java Changeset: 189b26e3818f Author: vromero Date: 2012-12-21 15:27 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/189b26e3818f 8003512: javac doesn't work with jar files with >64k entries Reviewed-by: jjg, ksrini Contributed-by: martinrb at google.com ! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java + test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java ! test/tools/javac/file/zip/Utils.java Changeset: d6b840be3096 Author: wmdietl Date: 2012-12-21 14:53 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/d6b840be3096 Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! test/tools/javac/7129225/TestImportStar.java ! test/tools/javac/processing/model/element/TestAnonClassNames.java ! test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java ! test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out From wdietl at gmail.com Fri Dec 21 14:54:21 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Fri, 21 Dec 2012 22:54:21 +0000 Subject: hg: type-annotations/type-annotations/jdk: 4 new changesets Message-ID: <20121221225529.92A724735D@hg.openjdk.java.net> Changeset: 60adb69bf043 Author: smarks Date: 2012-12-20 20:11 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/60adb69bf043 8005290: remove -showversion from RMI test library subprocess mechanism Reviewed-by: jgish, chegar, dmocek ! test/java/rmi/testlibrary/JavaVM.java ! test/java/rmi/testlibrary/StreamPipe.java ! test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java Changeset: 42ee6b6ad373 Author: jbachorik Date: 2012-12-21 09:27 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/42ee6b6ad373 7146162: javax/management/remote/mandatory/connection/BrokenConnectionTest.java failing intermittently Summary: ClientCommunicatorAdmin should call gotIOException((IOException)e) instead of restart((IOException)e) when detecting a communication error, because the method gotIOException will send a failure notification if necessary. Reviewed-by: emcmanus, sjiang Contributed-by: jaroslav.bachorik at oracle.com ! src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java Changeset: 86c10d1484e9 Author: sjiang Date: 2012-12-21 10:58 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/86c10d1484e9 8005325: The script should use TESTVMOPTS Summary: Put back TESTVMOPTS which was removed by mistake. Reviewed-by: smarks ! test/sun/management/jmxremote/startstop/JMXStartStopTest.sh Changeset: d090d68214ad Author: wmdietl Date: 2012-12-21 14:54 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d090d68214ad Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From steve.sides at oracle.com Fri Dec 21 15:44:59 2012 From: steve.sides at oracle.com (Steve Sides) Date: Fri, 21 Dec 2012 15:44:59 -0800 Subject: Type Annotations binary build (b69) available In-Reply-To: References: <50BFFCE0.5090806@oracle.com> <50C65012.3000607@oracle.com> <50C65767.8020402@oracle.com> <50C66C6E.10804@oracle.com> <50C67395.7050503@oracle.com> <50C7910B.2030800@oracle.com> <50D4E3C4.3060001@oracle.com> Message-ID: <50D4F47B.8000503@oracle.com> On 12/21/2012 2:40 PM, Werner Dietl wrote: > Great, thanks! > Does this mean all test cases passed? All the ones we've mentioned now pass. There is 1 failling test, a diagnostic test, tools/javac/diags/CheckExamples.java, which has been failing since back in August. Looks good! -steve > cu, WMD. > > On Fri, Dec 21, 2012 at 2:33 PM, Steve Sides wrote: >> I am again pleased to announce the latest binary builds of the JSR 308 >> Reference Implementation are available at >> http://jdk8.java.net/type-annotations >> >> The builds were generated from the type-annotations/type-annotations forest >> on 12/21/2012. >> >> Please see the Type Annotations project page for a link to the JSR 308 >> Specification. >> >> This forest is regularly updated from jdk8/jdk8 and jdk8/tl. Werner can >> provide exact details. >> >> Steve > > From wdietl at gmail.com Fri Dec 28 00:35:38 2012 From: wdietl at gmail.com (Werner Dietl) Date: Fri, 28 Dec 2012 00:35:38 -0800 Subject: Creating a clone of a javac.code.Type Message-ID: Jon, Joel, all, Steve noticed that CheckExamples was misbehaving on a test case. I investigated this and found that this is related to the problem previously raised by Bhavesh: there is unwanted sharing between Type instances and having a type annotation on one Type results in type annotations on others. The CheckExamples test that failed was CantAnnotateStaticClass, which turns out to be the only test case that was using Types for it's logic. Recent refactorings initialize the type annotations later and this test case failed. I moved the corresponding check and added an extra test case that more directly highlights this issue. However, I don't know what the best solution to the sharing issue is. In previous discussions (sorry, before the mailing list existed; thread "JSR 308 patch discussion: cloning of Type" from September 15, 2011) we came to the conclusion that cloning Type instances was bad and removed the feature: http://code.google.com/p/jsr308-langtools/source/detail?r=48559298cf51c1a0143b25509ae04a4cd0b640ac At that point we didn't have the CantAnnotateStaticClass test case and no JavaDoc tests - therefore, all jtreg tests passed. Also, the Checker Framework doesn't rely on Types and therefore also continued to pass. However, removing cloning was not correct: Type.typeAnnotations is set in com.sun.tools.javac.code.TypeAnnotations.TypeAnnotationPositions.typeWithAnnotations(JCTree, Type, List) once the ambiguity between declaration and type annotations has been resolved. At that point, Type instances are being shared and setting field Type.typeAnnotations modifies all instances, showing the effect Bhavesh noticed. The simplest and ugliest solution would be to add cloning again. I tried working on a nicer solution: introduce a class javac.code.Type.AnnotatedType that behaves like its underlying type and also manages a list of type annotations. I also added javax.lang.model.type.AnnotatedType. After fixing a few problems, this mostly works again. However, I still need a way to create a duplicate of an existing Type in typeWithAnnotations, in order to replace a Type with an AnnotatedType. The complication is that the AnnotatedType can be an enclosing type for another type and we therefore need to duplicate the whole Type. Is there a simple way to create a duplicate of an arbitrary javac.code.Type instance? I looked at the existing Type.Mapping and Type.Visitor subclasses, but didn't find something suitable. Which approach would you prefer, re-introducing cloning of Type or spending more time on introducing AnnotatedType and a clean copy mechanism? Joel, did you already start to work on javax.lang.model? Will we expose an AnnotatedType there? All comments welcome, cu, WMD. -- http://www.google.com/profiles/wdietl From jonathan.gibbons at oracle.com Fri Dec 28 02:35:59 2012 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 28 Dec 2012 10:35:59 +0000 Subject: Creating a clone of a javac.code.Type In-Reply-To: References: Message-ID: <50DD760F.20807@oracle.com> On 12/28/2012 08:35 AM, Werner Dietl wrote: > Jon, Joel, all, > > Steve noticed that CheckExamples was misbehaving on a test case. I > investigated this and found that this is related to the problem > previously raised by Bhavesh: there is unwanted sharing between Type > instances and having a type annotation on one Type results in type > annotations on others. > > The CheckExamples test that failed was CantAnnotateStaticClass, which > turns out to be the only test case that was using Types for it's > logic. > Recent refactorings initialize the type annotations later and this > test case failed. > I moved the corresponding check and added an extra test case that more > directly highlights this issue. > > However, I don't know what the best solution to the sharing issue is. > > In previous discussions (sorry, before the mailing list existed; > thread "JSR 308 patch discussion: cloning of Type" from September 15, > 2011) we came to the conclusion that cloning Type instances was bad > and removed the feature: > > http://code.google.com/p/jsr308-langtools/source/detail?r=48559298cf51c1a0143b25509ae04a4cd0b640ac > > At that point we didn't have the CantAnnotateStaticClass test case and > no JavaDoc tests - therefore, all jtreg tests passed. Also, the > Checker Framework doesn't rely on Types and therefore also continued > to pass. > > However, removing cloning was not correct: Type.typeAnnotations is set in > com.sun.tools.javac.code.TypeAnnotations.TypeAnnotationPositions.typeWithAnnotations(JCTree, > Type, List) > once the ambiguity between declaration and type annotations has been resolved. > At that point, Type instances are being shared and setting field > Type.typeAnnotations modifies all instances, showing the effect > Bhavesh noticed. > > The simplest and ugliest solution would be to add cloning again. > > I tried working on a nicer solution: introduce a class > javac.code.Type.AnnotatedType that behaves like its underlying type > and also manages a list of type annotations. > I also added javax.lang.model.type.AnnotatedType. > After fixing a few problems, this mostly works again. However, I still > need a way to create a duplicate of an existing Type in > typeWithAnnotations, in order to replace a Type with an AnnotatedType. > The complication is that the AnnotatedType can be an enclosing type > for another type and we therefore need to duplicate the whole Type. > > Is there a simple way to create a duplicate of an arbitrary > javac.code.Type instance? > I looked at the existing Type.Mapping and Type.Visitor subclasses, but > didn't find something suitable. > > Which approach would you prefer, re-introducing cloning of Type or > spending more time on introducing AnnotatedType and a clean copy > mechanism? > > Joel, did you already start to work on javax.lang.model? Will we > expose an AnnotatedType there? > > All comments welcome, > cu, WMD. > The code previously in javac to do cloning was somewhat suspect and was removed because it threw up "red" FindBugs errors. The use at that time was sufficiently minimal that it was easy to achieve the same effect explicitly. The precedent for this type of situation would appear to be constant values. A type can have a constant value associated with it, accessed through a virtual method. Subtypes are created in the places where a constant value is present and needs to be modeled. Unfortunately, since that solution is used for constant values, we cannot easily reuse the idea for annotations, unless we find a way to use subtypes for constants and/or annotations. I don't want to see cloning come back in, especially if it brings back FindBugs issues. I think that having a limited copy mechanism sounds better. But we should also avoid the need to copy as much as possible by keeping Type objects immutable, such that we can share them when possible. -- Jon From wdietl at gmail.com Mon Dec 31 01:30:04 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 31 Dec 2012 09:30:04 +0000 Subject: hg: type-annotations/type-annotations/langtools: 25 new changesets Message-ID: <20121231093117.7780F4746E@hg.openjdk.java.net> Changeset: 9ab31827865c Author: wmdietl Date: 2012-12-31 01:06 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9ab31827865c Move type annotations out of Type into a separate AnnotatedType subclass. ! src/share/classes/com/sun/tools/javac/code/Type.java Changeset: da00429f0d92 Author: wmdietl Date: 2012-12-31 01:07 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/da00429f0d92 Correct output of annotated varargs and support AnnotatedType. ! src/share/classes/com/sun/tools/javac/code/Printer.java Changeset: dc343861534d Author: wmdietl Date: 2012-12-31 01:08 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/dc343861534d Major changes to support AnnotatedType and create copies of Types instead of directly modifying them. ! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Changeset: 9e0285b1e2ad Author: wmdietl Date: 2012-12-31 01:09 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9e0285b1e2ad Skip over AnnotatedTypes in any computation. ! src/share/classes/com/sun/tools/javac/code/Types.java Changeset: 187848128e70 Author: wmdietl Date: 2012-12-31 01:10 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/187848128e70 Support AnnotatedTypes and move check for enclosing classes to other type annotation validation. ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/Check.java Changeset: 76713bb83999 Author: wmdietl Date: 2012-12-31 01:10 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/76713bb83999 Support annotated varargs. ! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Changeset: 94c1fda51952 Author: wmdietl Date: 2012-12-31 01:11 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/94c1fda51952 Ignore AnnotatedTypes when computing signatures. ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Changeset: 3e5aebc411f0 Author: wmdietl Date: 2012-12-31 01:12 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/3e5aebc411f0 This class and the corresponding interface must be adapted. For now, provide a dummy implementation. ! src/share/classes/com/sun/tools/javac/model/JavacTypes.java Changeset: 957b9f05dc6d Author: wmdietl Date: 2012-12-31 01:14 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/957b9f05dc6d Top-level annotations in an object creation must also be inserted into the most-inner/left-most type. ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java Changeset: ceac49a14e7e Author: wmdietl Date: 2012-12-31 01:15 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/ceac49a14e7e Additional error key (should be reviewed and maybe combined with cant.annotate.static.class). ! src/share/classes/com/sun/tools/javac/resources/compiler.properties Changeset: 2ad9cf69665e Author: wmdietl Date: 2012-12-31 01:15 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2ad9cf69665e Fix output of annotated varargs. ! src/share/classes/com/sun/tools/javac/tree/Pretty.java Changeset: 66128366bcaf Author: wmdietl Date: 2012-12-31 01:16 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/66128366bcaf Whitespace fix only. ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Changeset: f6c424edbd87 Author: wmdietl Date: 2012-12-31 01:18 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f6c424edbd87 Adapt javadoc to introduction of Type.AnnotatedType. ! src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java ! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java ! src/share/classes/com/sun/tools/javadoc/TypeMaker.java ! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Changeset: 424b7015ffcf Author: wmdietl Date: 2012-12-31 01:20 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/424b7015ffcf Introduce new AnnotatedType type model. + src/share/classes/javax/lang/model/type/AnnotatedType.java ! src/share/classes/javax/lang/model/type/TypeKind.java ! src/share/classes/javax/lang/model/type/TypeVisitor.java ! src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Changeset: f88fb06c0514 Author: wmdietl Date: 2012-12-31 01:20 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f88fb06c0514 Remove case that was removed from the underlying example: annotations on .class expressions. ! test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java Changeset: a4c73cefd4d1 Author: wmdietl Date: 2012-12-31 01:22 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a4c73cefd4d1 New test case to check that annotations on certain nested types are not allowed. Currently failing. + test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java Changeset: 80403e2d6e05 Author: wmdietl Date: 2012-12-31 01:24 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/80403e2d6e05 New test case to check that annotations on certain nested types are not allowed. Currently failing. + test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out Changeset: 856a4901e7d4 Author: wmdietl Date: 2012-12-31 01:25 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/856a4901e7d4 Expand test case with Object[] case. Currently fails because of some annotated array side-effects. ! test/tools/javac/annotations/typeAnnotations/failures/LintCast.java ! test/tools/javac/annotations/typeAnnotations/failures/LintCast.out Changeset: 2a6d54ce51ad Author: wmdietl Date: 2012-12-31 01:26 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2a6d54ce51ad Adapt test case to rules regarding annotations on nested types. ! test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java Changeset: e6206ee263ab Author: wmdietl Date: 2012-12-31 01:28 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/e6206ee263ab Example for cant.annotate.nested.type diagnostic. + test/tools/javac/diags/examples/CantAnnotateNestedType.java Changeset: 690c41cdab55 Author: bpatel Date: 2012-12-25 17:23 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/690c41cdab55 8004893: the javadoc/doclet needs to be updated to accommodate lambda changes Reviewed-by: jjg ! src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties ! src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java ! test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java + test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java + test/com/sun/javadoc/testLambdaFeature/pkg/A.java + test/com/sun/javadoc/testLambdaFeature/pkg/B.java ! test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java Changeset: 0c244701188e Author: mchung Date: 2012-12-28 22:25 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/0c244701188e 8003562: Provide a CLI tool to analyze class dependencies Reviewed-by: jjg, alanb, ulfzibis, erikj ! make/build.properties ! makefiles/BuildLangtools.gmk ! src/share/classes/com/sun/tools/classfile/Dependencies.java ! src/share/classes/com/sun/tools/classfile/Dependency.java + src/share/classes/com/sun/tools/jdeps/Archive.java + src/share/classes/com/sun/tools/jdeps/ClassFileReader.java + src/share/classes/com/sun/tools/jdeps/JdepsTask.java + src/share/classes/com/sun/tools/jdeps/Main.java + src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java + src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties + src/share/classes/com/sun/tools/jdeps/resources/jdk.properties + src/share/classes/com/sun/tools/jdeps/resources/version.properties-template ! test/Makefile + test/tools/jdeps/Basic.java + test/tools/jdeps/Test.java + test/tools/jdeps/p/Foo.java Changeset: 31780dd06ec7 Author: jjg Date: 2012-12-29 17:33 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/31780dd06ec7 8004727: Add compiler support for parameter reflection Reviewed-by: jjg Contributed-by: eric.mccorkle at oracle.com ! src/share/classes/com/sun/tools/classfile/Attribute.java ! src/share/classes/com/sun/tools/classfile/ClassWriter.java + src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java ! src/share/classes/com/sun/tools/javac/code/Symbol.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/main/Option.java ! src/share/classes/com/sun/tools/javac/resources/javac.properties ! src/share/classes/com/sun/tools/javac/util/Names.java ! src/share/classes/com/sun/tools/javap/AttributeWriter.java + test/tools/javac/MethodParameters.java + test/tools/javap/MethodParameters.java Changeset: 383bc0fbd759 Author: jjg Date: 2012-12-30 06:17 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/383bc0fbd759 8005195: Doclint regression tests fail on windows Reviewed-by: mcimadamore ! test/tools/doclint/DocLintTester.java Changeset: 87282b83472c Author: wmdietl Date: 2012-12-31 01:28 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/87282b83472c Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools ! make/build.properties ! src/share/classes/com/sun/tools/classfile/Attribute.java ! src/share/classes/com/sun/tools/classfile/ClassWriter.java ! src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml ! src/share/classes/com/sun/tools/javac/code/Symbol.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/resources/javac.properties ! src/share/classes/com/sun/tools/javac/util/Names.java ! src/share/classes/com/sun/tools/javap/AttributeWriter.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.java - test/tools/javac/typeAnnotations/newlocations/BasicTest.out From wdietl at gmail.com Mon Dec 31 01:31:26 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 31 Dec 2012 09:31:26 +0000 Subject: hg: type-annotations/type-annotations: 2 new changesets Message-ID: <20121231093126.F31FE4746F@hg.openjdk.java.net> Changeset: c37401e77c80 Author: mchung Date: 2012-12-28 22:20 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/c37401e77c80 8003562: Provide a CLI tool to analyze class dependencies Reviewed-by: jjg, alanb, ulfzibis, erikj ! common/bin/compare_exceptions.sh.incl Changeset: 3e161232e60b Author: wmdietl Date: 2012-12-31 01:30 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/rev/3e161232e60b Automated merge with http://hg.openjdk.java.net/jdk8/tl/ From wdietl at gmail.com Mon Dec 31 01:33:00 2012 From: wdietl at gmail.com (wdietl at gmail.com) Date: Mon, 31 Dec 2012 09:33:00 +0000 Subject: hg: type-annotations/type-annotations/jdk: 15 new changesets Message-ID: <20121231093634.B20C947470@hg.openjdk.java.net> Changeset: c1227b872a12 Author: joehw Date: 2012-12-21 17:29 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/c1227b872a12 8005280: (props) Improve test coverage for small XML parser Summary: added a few more invalid XML files, international characters to LoadAndStore test, and a behavior compatibility test. Reviewed-by: alanb, lancea + test/java/util/Properties/Compatibility.xml + test/java/util/Properties/CompatibilityTest.java ! test/java/util/Properties/LoadAndStoreXML.java + test/java/util/Properties/invalidxml/BadDocType.xml - test/java/util/Properties/invalidxml/BadDocType.xml.excluded + test/java/util/Properties/invalidxml/DTDRootNotMatch.xml + test/java/util/Properties/invalidxml/IllegalComment.xml + test/java/util/Properties/invalidxml/IllegalEntry.xml + test/java/util/Properties/invalidxml/IllegalEntry1.xml + test/java/util/Properties/invalidxml/IllegalKeyAttribute.xml + test/java/util/Properties/invalidxml/NoDocType.xml - test/java/util/Properties/invalidxml/NoDocType.xml.excluded + test/java/util/Properties/invalidxml/NoNamespaceSupport.xml Changeset: 4d28776d7007 Author: mullan Date: 2012-12-26 10:07 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4d28776d7007 8005117: Eliminate dependency from ConfigSpiFile to com.sun.security.auth.login.ConfigFile Reviewed-by: alanb, mchung, weijun ! src/share/classes/com/sun/security/auth/login/ConfigFile.java ! src/share/classes/sun/security/provider/ConfigSpiFile.java Changeset: d9cab18f326a Author: mullan Date: 2012-12-26 10:08 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/d9cab18f326a Merge - make/jdk/asm/Makefile Changeset: 9d984ccd17fc Author: chegar Date: 2012-12-27 21:55 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/9d984ccd17fc 8003981: Support Parallel Array Sorting - JEP 103 Reviewed-by: chegar, forax, dholmes, dl Contributed-by: david.holmes at oracle.com, dl at cs.oswego.edu, chris.hegarty at oracle.com ! make/java/java/FILES_java.gmk ! src/share/classes/java/util/Arrays.java + src/share/classes/java/util/ArraysParallelSortHelpers.java + test/java/util/Arrays/ParallelSorting.java Changeset: 4ad38db38fff Author: okutsu Date: 2012-12-28 14:13 +0900 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4ad38db38fff 8005471: DateFormat: Time zone info is not localized when adapter is CLDR Reviewed-by: peytoia ! src/share/classes/sun/util/resources/TimeZoneNamesBundle.java + test/java/util/TimeZone/CLDRDisplayNamesTest.java Changeset: 1da019e7999a Author: peytoia Date: 2012-12-28 15:07 +0900 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/1da019e7999a 8005277: Regression in JDK 7 in Bidi implementation Reviewed-by: okutsu ! src/share/classes/sun/text/bidi/BidiBase.java ! test/java/text/Bidi/BidiConformance.java + test/java/text/Bidi/Bug8005277.java Changeset: f3ac419e2bf0 Author: okutsu Date: 2012-12-28 16:39 +0900 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/f3ac419e2bf0 8005561: typo in Calendar Reviewed-by: peytoia ! src/share/classes/java/util/Calendar.java Changeset: 645d774b683a Author: xuelei Date: 2012-12-28 00:48 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/645d774b683a 7109274: Restrict the use of certificates with RSA keys less than 1024 bits Summary: This restriction is applied via the Java Security property, "jdk.certpath.disabledAlgorithms". This will impact providers that adhere to this security property. Reviewed-by: mullan ! src/share/lib/security/java.security-linux ! src/share/lib/security/java.security-macosx ! src/share/lib/security/java.security-solaris ! src/share/lib/security/java.security-windows ! test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java ! test/java/security/cert/pkix/policyChanges/TestPolicy.java ! test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java ! test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java ! test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java ! test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java + test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java ! test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java ! test/sun/security/tools/jarsigner/concise_jarsigner.sh Changeset: 4472a641b4dc Author: xuelei Date: 2012-12-28 03:50 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/4472a641b4dc 8003265: Need to clone array of input/output parameters Reviewed-by: mullan ! src/share/classes/com/sun/jndi/dns/DnsContext.java ! src/share/classes/com/sun/jndi/ldap/BasicControl.java Changeset: 46675076f753 Author: sjiang Date: 2012-12-28 16:44 +0100 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/46675076f753 7120365: DiffHBTest.java fails due to ConcurrentModificationException Summary: The problem is from the server notification forwarder, it should use a copy of listener set to do iterate. Reviewed-by: alanb ! src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java ! test/ProblemList.txt + test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java Changeset: 0cfcba56cfa7 Author: jgish Date: 2012-12-28 18:32 -0500 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/0cfcba56cfa7 8005594: Fix to 8003265 breaks build Summary: backout changeset 4472a641b4dc Reviewed-by: smarks, wetmore ! src/share/classes/com/sun/jndi/dns/DnsContext.java ! src/share/classes/com/sun/jndi/ldap/BasicControl.java Changeset: ac5e29b62288 Author: smarks Date: 2012-12-28 17:36 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/ac5e29b62288 Merge Changeset: 28b47ed08c63 Author: mchung Date: 2012-12-28 22:21 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/28b47ed08c63 8003562: Provide a CLI tool to analyze class dependencies Reviewed-by: jjg, alanb, ulfzibis, erikj ! make/common/Release.gmk ! make/docs/NON_CORE_PKGS.gmk ! make/launchers/Makefile ! make/launchers/Makefile.launcher ! makefiles/CompileLaunchers.gmk ! makefiles/CreateJars.gmk ! makefiles/Images.gmk Changeset: 3cc25d0e3bb0 Author: chegar Date: 2012-12-29 11:00 +0000 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/3cc25d0e3bb0 8005556: java/net/Socks/SocksV4Test.java is missing @run tag Reviewed-by: alanb ! test/java/net/Socks/SocksV4Test.java Changeset: 59a00abc7daa Author: wmdietl Date: 2012-12-31 01:32 -0800 URL: http://hg.openjdk.java.net/type-annotations/type-annotations/jdk/rev/59a00abc7daa Automated merge with http://hg.openjdk.java.net/jdk8/tl/jdk From wdietl at gmail.com Mon Dec 31 01:43:21 2012 From: wdietl at gmail.com (Werner Dietl) Date: Mon, 31 Dec 2012 01:43:21 -0800 Subject: Creating a clone of a javac.code.Type In-Reply-To: <50DD760F.20807@oracle.com> References: <50DD760F.20807@oracle.com> Message-ID: Jon, all, I just pushed a set of major changes, in particular: http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/9ab31827865c http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/dc343861534d http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/424b7015ffcf I introduce a new AnnotatedType and copy Types instead of directly modifying them. This should solve the aliasing problem observed in javadoc and elsewhere. Please confirm. I currently see 5 failing tests that I'm having trouble tracking down. Support appreciated. Please let me know what you think of this significant change and whether this is the direction you wanted things to go. All the best, cu, WMD. On Fri, Dec 28, 2012 at 2:35 AM, Jonathan Gibbons wrote: > On 12/28/2012 08:35 AM, Werner Dietl wrote: >> >> Jon, Joel, all, >> >> Steve noticed that CheckExamples was misbehaving on a test case. I >> investigated this and found that this is related to the problem >> previously raised by Bhavesh: there is unwanted sharing between Type >> instances and having a type annotation on one Type results in type >> annotations on others. >> >> The CheckExamples test that failed was CantAnnotateStaticClass, which >> turns out to be the only test case that was using Types for it's >> logic. >> Recent refactorings initialize the type annotations later and this >> test case failed. >> I moved the corresponding check and added an extra test case that more >> directly highlights this issue. >> >> However, I don't know what the best solution to the sharing issue is. >> >> In previous discussions (sorry, before the mailing list existed; >> thread "JSR 308 patch discussion: cloning of Type" from September 15, >> 2011) we came to the conclusion that cloning Type instances was bad >> and removed the feature: >> >> >> http://code.google.com/p/jsr308-langtools/source/detail?r=48559298cf51c1a0143b25509ae04a4cd0b640ac >> >> At that point we didn't have the CantAnnotateStaticClass test case and >> no JavaDoc tests - therefore, all jtreg tests passed. Also, the >> Checker Framework doesn't rely on Types and therefore also continued >> to pass. >> >> However, removing cloning was not correct: Type.typeAnnotations is set in >> >> com.sun.tools.javac.code.TypeAnnotations.TypeAnnotationPositions.typeWithAnnotations(JCTree, >> Type, List) >> once the ambiguity between declaration and type annotations has been >> resolved. >> At that point, Type instances are being shared and setting field >> Type.typeAnnotations modifies all instances, showing the effect >> Bhavesh noticed. >> >> The simplest and ugliest solution would be to add cloning again. >> >> I tried working on a nicer solution: introduce a class >> javac.code.Type.AnnotatedType that behaves like its underlying type >> and also manages a list of type annotations. >> I also added javax.lang.model.type.AnnotatedType. >> After fixing a few problems, this mostly works again. However, I still >> need a way to create a duplicate of an existing Type in >> typeWithAnnotations, in order to replace a Type with an AnnotatedType. >> The complication is that the AnnotatedType can be an enclosing type >> for another type and we therefore need to duplicate the whole Type. >> >> Is there a simple way to create a duplicate of an arbitrary >> javac.code.Type instance? >> I looked at the existing Type.Mapping and Type.Visitor subclasses, but >> didn't find something suitable. >> >> Which approach would you prefer, re-introducing cloning of Type or >> spending more time on introducing AnnotatedType and a clean copy >> mechanism? >> >> Joel, did you already start to work on javax.lang.model? Will we >> expose an AnnotatedType there? >> >> All comments welcome, >> cu, WMD. >> > The code previously in javac to do cloning was somewhat suspect > and was removed because it threw up "red" FindBugs errors. The > use at that time was sufficiently minimal that it was easy to achieve > the same effect explicitly. > > The precedent for this type of situation would appear to be constant > values. A type can have a constant value associated with it, accessed > through a virtual method. Subtypes are created in the places where > a constant value is present and needs to be modeled. Unfortunately, > since that solution is used for constant values, we cannot easily reuse > the idea for annotations, unless we find a way to use subtypes for > constants and/or annotations. > > I don't want to see cloning come back in, especially if it brings back > FindBugs issues. I think that having a limited copy mechanism sounds > better. But we should also avoid the need to copy as much as possible > by keeping Type objects immutable, such that we can share them when > possible. > > -- Jon -- http://www.google.com/profiles/wdietl