# HG changeset patch
# User henryjen
# Date 1384240595 28800
# Node ID 097bc67c00990e17a90517ec0e60d71478a9e6c8
# Parent  6b4d6205366c1170ebefea95b1b9ae1d69add036# Parent  be4bcbd410e90be0e9e17287cb03ce1078475e4e
Merge

diff -r 6b4d6205366c -r 097bc67c0099 .hgtags
--- a/.hgtags	Thu Oct 31 16:46:43 2013 -0700
+++ b/.hgtags	Mon Nov 11 23:16:35 2013 -0800
@@ -156,6 +156,10 @@
 be069d72dde2bfe6f996c46325a320961ca854c2 jdk8-b32
 46831c72b7f6c69fef2cc2935001863643a65f94 jdk8-b33
 6b105afbb77ca9600a99eade31f686d070c70581 jdk8-b34
+42a7a264130d63029c7cd29c24379b32d147cdb3 lambda-b45
+68da3a8292fc7e068f1ca2fd5ad95d90e2872845 lambda-b48
+92ef69a3ba61b4252c2c129bed190f3d2e91d6c9 lambda-b50
+92ef69a3ba61b4252c2c129bed190f3d2e91d6c9 lambda-b56
 defd666a786334465496c8901fa302b779c7e045 jdk8-b35
 94bbaa67686f44a124cd16fd9f1e8a6a3f684d2d jdk8-b36
 5891b38985e8b2502296fc29e726b527d03116d2 jdk8-b37
diff -r 6b4d6205366c -r 097bc67c0099 .jcheck/conf
--- a/.jcheck/conf	Thu Oct 31 16:46:43 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-project=jdk8
diff -r 6b4d6205366c -r 097bc67c0099 make/build.properties
diff -r 6b4d6205366c -r 097bc67c0099 make/build.xml
diff -r 6b4d6205366c -r 097bc67c0099 makefiles/Makefile
diff -r 6b4d6205366c -r 097bc67c0099 src/share/bin/launcher.sh-template
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/javadoc/ClassDoc.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/javadoc/MethodDoc.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/tree/LambdaExpressionTree.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/tree/MemberReferenceTree.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/tree/Tree.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/tree/TreeVisitor.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/util/DocTrees.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/util/JavacTask.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/util/Plugin.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/util/TreePath.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/source/util/TreeScanner.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/AccessFlags.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/Attribute.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/ClassTranslator.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/ClassWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/ConstantPool.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/Dependencies.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/classfile/Opcode.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/api/JavacTool.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/api/JavacTrees.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Attribute.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Flags.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Kinds.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Lint.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Printer.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Scope.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Source.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Symbol.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Symtab.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/TargetType.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Type.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/TypeTag.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/code/Types.java
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Mon Nov 11 23:16:35 2013 -0800
@@ -26,6 +26,7 @@
 package com.sun.tools.javac.code;
 
 import java.lang.ref.SoftReference;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Locale;
@@ -33,6 +34,7 @@
 import java.util.Set;
 import java.util.WeakHashMap;
 
+import javax.lang.model.type.TypeKind;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.code.Attribute.RetentionPolicy;
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Annotate.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Attr.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/AttrContext.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Check.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/ConstFold.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
--- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Mon Nov 11 23:16:35 2013 -0800
@@ -503,6 +503,25 @@
                 }
             }
         }
+
+        /**
+         * Get the list of stuck variables that do not depend on the target
+         * type - this means that inference will lead to same results during
+         * both OVERLOAD and CHECK modes.
+         */
+        List<Type> targetFreevars() {
+            List<Type> freevars = msym.type.getTypeArguments();
+            ListBuffer<Type> targetVars = new ListBuffer<>();
+            outer: for (Type t : inferenceContext.inferencevars) {
+                for (Type t2 : freevars) {
+                    if (msym.type.getReturnType().contains(t2) &&
+                            t.tsym == t2.tsym) {
+                        targetVars.append(t);
+                    }
+                }
+            }
+            return targetVars.toList();
+        }
     }
 
     /**
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Enter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Flow.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Infer.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
--- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Nov 11 23:16:35 2013 -0800
@@ -93,6 +93,9 @@
     /** info about the current class being processed */
     private KlassInfo kInfo;
 
+    /** for testing purposes force all lambdas to take a serializable form */
+    private boolean forceSerializableRepresentation;
+
     /** dump statistics about lambda code generation */
     private boolean dumpLambdaToMethodStats;
 
@@ -127,6 +130,7 @@
         make = TreeMaker.instance(context);
         types = Types.instance(context);
         transTypes = TransTypes.instance(context);
+        // forceSerializableRepresentation = true;
         analyzer = new LambdaAnalyzerPreprocessor();
         Options options = Options.instance(context);
         dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
@@ -1677,6 +1681,9 @@
 
             /** does this functional expression require serialization support? */
             boolean isSerializable() {
+                if (forceSerializableRepresentation) {
+                    return true;
+                }
                 for (Type target : tree.targets) {
                     if (types.asSuper(target, syms.serializableType.tsym) != null) {
                         return true;
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Lower.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/Resolve.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/comp/TransTypes.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/CRTable.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/Code.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/Gen.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/Items.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/Pool.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/Target.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/main/Main.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/main/Option.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/model/JavacTypes.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/JavacParser.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/Lexer.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/Scanner.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/parser/Tokens.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/resources/compiler.properties
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/resources/javac.properties
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/DCTree.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/DocPretty.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/JCTree.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/Pretty.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/Bits.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/GraphUtils.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/List.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/ListBuffer.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/Log.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/Names.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/DocEnv.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/DocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javah/JavahTask.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javap/AttributeWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javap/ConstantWriter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/com/sun/tools/javap/JavapTask.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/SourceVersion.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/element/ExecutableElement.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/element/Modifier.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/type/IntersectionType.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/type/TypeKind.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/type/TypeVisitor.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/util/ElementFilter.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/lang/model/util/Types.java
diff -r 6b4d6205366c -r 097bc67c0099 src/share/classes/javax/tools/StandardLocation.java
diff -r 6b4d6205366c -r 097bc67c0099 test/Makefile
--- a/test/Makefile	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/Makefile	Mon Nov 11 23:16:35 2013 -0800
@@ -250,7 +250,7 @@
 
 # Run jtreg tests
 #
-# JTREG_HOME
+# JT_HOME
 #	Installed location of jtreg
 # JT_JAVA
 #	Version of java used to run jtreg.  Should normally be the same as TESTJAVA
@@ -434,4 +434,3 @@
 
 # No use of suffix rules
 .SUFFIXES:
-
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testNavigation/TestNavigation.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testNavigation/pkg/A.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testNavigation/pkg/C.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testNavigation/pkg/E.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testNavigation/pkg/I.java
diff -r 6b4d6205366c -r 097bc67c0099 test/com/sun/javadoc/testProfiles/TestProfiles.java
diff -r 6b4d6205366c -r 097bc67c0099 test/lib/combo/tools/javac/combo/Template.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/6758789/T6758789b.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/6840059/T6840059.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/6889255/T6889255.java
--- a/test/tools/javac/6889255/T6889255.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/6889255/T6889255.java	Mon Nov 11 23:16:35 2013 -0800
@@ -417,6 +417,9 @@
 
     String getExpectedName(VarSymbol v, int i) {
         // special cases:
+        // bridge methods use argN. No LVT for them anymore
+        if ((v.owner.flags() & Flags.BRIDGE) != 0)
+            return "arg" + (i - 1);
         // synthetic method
         if (((v.owner.owner.flags() & Flags.ENUM) != 0)
                 && v.owner.name.toString().equals("valueOf"))
@@ -428,10 +431,7 @@
         // abstract methods don't have saved names
         // -- no Code attribute for the LocalVariableTable attribute
         if ((v.owner.flags() & Flags.ABSTRACT) != 0)
-            return "arg" + (i - 1);
-        // bridge methods use argN. No LVT for them anymore
-        if ((v.owner.flags() & Flags.BRIDGE) != 0)
-            return "arg" + (i - 1);
+            return "arg" + (i - 1);        
 
         // The rest of this method assumes the local conventions in the test program
         Type t = v.type;
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/7129225/TestImportStar.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/7132880/T7132880.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6722234/T6722234a_1.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6722234/T6722234a_2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6722234/T6722234b_1.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6722234/T6722234b_2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6722234/T6722234c.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6799605/T6799605.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6862608/T6862608a.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/6862608/T6862608b.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/8010387/T8010387.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/compressed/T8012003a.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/compressed/T8012003b.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/compressed/T8012003c.java
--- a/test/tools/javac/Diagnostics/compressed/T8012003c.java	Thu Oct 31 16:46:43 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/**
- * @test /nodynamiccopyright/
- * @bug     8012003
- * @summary Method diagnostics resolution need to be simplified in some cases
- *          test simplification of lambda type-checking error leading to resolution failure
- * @compile/fail/ref=T8012003c.out -XDrawDiagnostics -Xdiags:compact T8012003c.java
- */
-
-class T8012003c {
-
-    interface I {
-        void m(P p);
-    }
-
-    void m(I i) { }
-
-    void test() {
-        m(p->p.m());
-    }
-}
-
-class P {
-    private void m() { }
-}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/compressed/T8012003c.out
--- a/test/tools/javac/Diagnostics/compressed/T8012003c.out	Thu Oct 31 16:46:43 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-T8012003c.java:18:15: compiler.err.report.access: m(), private, P
-1 error
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/Diagnostics/compressed/T8020286.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/MethodParameters/CaptureTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/StringsInSwitch/StringSwitches.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/api/T6395981.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/api/TestContainTypes.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/api/TestJavacTaskScanner.java
--- a/test/tools/javac/api/TestJavacTaskScanner.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/api/TestJavacTaskScanner.java	Mon Nov 11 23:16:35 2013 -0800
@@ -40,7 +40,10 @@
 import java.nio.*;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Stack;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/cast/intersection/IntersectionTypeCastTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/cast/intersection/model/Model01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/cast/intersection/model/ModelChecker.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/classfiles/ClassVersionChecker.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/classreader/T7031108.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/conditional/Conditional.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/conditional/T8016702.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/DefaultMethodFlags.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg09.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg11.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg12.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg13.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg14.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg15.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Neg16.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos11.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos12.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos13.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos14.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos15.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/Pos16.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/TestDefaultBody.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java
--- a/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java	Thu Oct 31 16:46:43 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7192246
- * @summary  check that javac does not generate bridge methods for defaults
- */
-
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPool.*;
-import com.sun.tools.classfile.Method;
-
-import java.io.*;
-
-public class TestNoBridgeOnDefaults {
-
-    interface A<X> {
-        default <Y> A<X> m(X x, Y y) { return Impl.<X,Y>m1(this, x, y); }
-    }
-
-    static abstract class B<X> implements A<X> { }
-
-    interface C<X> extends A<X> {
-        default <Y> C<X> m(X x, Y y) { return Impl.<X,Y>m2(this, x, y); }
-    }
-
-    static abstract class D<X> extends B<X> implements C<X> { }
-
-    static class Impl {
-       static <X, Y> A<X> m1(A<X> rec, X x, Y y) { return null; }
-       static <X, Y> C<X> m2(C<X> rec, X x, Y y) { return null; }
-    }
-
-    static final String[] SUBTEST_NAMES = { B.class.getName() + ".class", D.class.getName() + ".class" };
-    static final String TEST_METHOD_NAME = "m";
-
-    public static void main(String... args) throws Exception {
-        new TestNoBridgeOnDefaults().run();
-    }
-
-    public void run() throws Exception {
-        String workDir = System.getProperty("test.classes");
-        for (int i = 0 ; i < SUBTEST_NAMES.length ; i ++) {
-            File compiledTest = new File(workDir, SUBTEST_NAMES[i]);
-            checkNoBridgeOnDefaults(compiledTest);
-        }
-    }
-
-    void checkNoBridgeOnDefaults(File f) {
-        System.err.println("check: " + f);
-        try {
-            ClassFile cf = ClassFile.read(f);
-            for (Method m : cf.methods) {
-                String mname = m.getName(cf.constant_pool);
-                if (mname.equals(TEST_METHOD_NAME)) {
-                    throw new Error("unexpected bridge method found " + m);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new Error("error reading " + f +": " + e);
-        }
-    }
-}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/separate/Separate.java
--- a/test/tools/javac/defaultMethods/separate/Separate.java	Thu Oct 31 16:46:43 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7192246
- * @summary smoke test for separate compilation of default methods
- * @author  Maurizio Cimadamore
- * @compile  pkg1/A.java
- * @compile  Separate.java
- */
-
-import pkg1.A;
-
-class Separate {
-    interface B extends A.I {
-        default void m() { A.m(this); }
-    }
-
-    interface C extends A.I, B { }
-}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/separate/Separate01.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/defaultMethods/separate/Separate01.java	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7192246
+ * @summary smoke test for separate compilation of default methods
+ * @author  Maurizio Cimadamore
+ * @compile  pkg1/A.java
+ * @compile  Separate01.java
+ */
+
+import pkg1.A;
+
+class Separate01 {
+    interface B extends A.I {
+        default void m() { A.m(this); }
+    }
+
+    interface C extends A.I, B { }
+}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/separate/Separate02.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/defaultMethods/separate/Separate02.java	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8013789
+ * @summary  Compiler should emit bridges in interfaces
+ * @compile  pkg2/B.java
+ * @compile  Separate02.java
+ */
+
+import pkg2.B;
+
+class Separate02 implements B { }
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/separate/pkg2/A.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/defaultMethods/separate/pkg2/A.java	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg2;
+
+public interface A {
+   Object m();
+}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/separate/pkg2/B.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/defaultMethods/separate/pkg2/B.java	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg2;
+
+public interface B extends A {
+   default String m() { return ""; }
+}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/static/Static01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
--- a/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Mon Nov 11 23:16:35 2013 -0800
@@ -199,7 +199,7 @@
 
     void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
         JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
-                Arrays.asList("-XDallowStaticInterfaceMethods"), null, Arrays.asList(source));
+                null, null, Arrays.asList(source));
         try {
             ct.analyze();
         } catch (Throwable ex) {
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java
--- a/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Mon Nov 11 23:16:35 2013 -0800
@@ -54,7 +54,7 @@
         }
 
         List<String> getOptions() {
-            return Arrays.asList("-XDallowStaticInterfaceMethods", "-source", versionString);
+            return Arrays.asList("-source", versionString);
         }
     }
 
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples.not-yet.txt
--- a/test/tools/javac/diags/examples.not-yet.txt	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/diags/examples.not-yet.txt	Mon Nov 11 23:16:35 2013 -0800
@@ -110,4 +110,3 @@
 compiler.warn.unknown.enum.constant                     # in bad class file
 compiler.warn.unknown.enum.constant.reason              # in bad class file
 compiler.warn.override.equals.but.not.hashcode          # when a class overrides equals but not hashCode method from Object
-
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/BadArgTypesInLambda.java
--- a/test/tools/javac/diags/examples/BadArgTypesInLambda.java	Thu Oct 31 16:46:43 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.prob.found.req
-// key: compiler.misc.inconvertible.types
-// options: -Xdiags:verbose
-
-class BadArgTypesInLambda {
-    interface SAM {
-        void m(Integer i);
-    }
-
-    void g(SAM s) { }
-
-    void test() {
-        g(x->{ String s = x; });
-    }
-}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/CantApplyDiamond1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/CatchWithoutTry.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/CompressedDiags.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/IllegalChar.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/IncompatibleTypes1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/InferNoConformingAssignment.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/InferredDoNotConformToEq.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/InferredDoNotConformToUpper.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/InvalidGenericLambdaTarget.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/KindnameConstructor.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/LocalVarNeedsFinal.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/MrefInferAndExplicitParams.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/MulticatchCantBeAssigned.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/OverriddenDefault.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/PotentiallyAmbiguousOverload.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/ProbFoundReqFragment.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/RepeatableAnnotationsNotSupported.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/RepeatableNonDefault.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/WhereCaptured.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/WhereCaptured1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/diags/examples/WhereFreshTvar.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/enum/6350057/T6350057.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/enum/6424358/T6424358.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/failover/CheckAttributedTree.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/file/T7018098.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/file/zip/Utils.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/6723444/T6723444_1.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/6723444/T6723444_2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/7015430/T7015430_1.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/7015430/T7015430_2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/7022054/T7022054pos1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/7022054/T7022054pos2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/7022054/T7022054pos2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/bridges/BridgeHarness.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/6939780/T6939780.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/6939780/T6939780_7.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/6939780/T6939780_8.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg01.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg02.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg03.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg04.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg06.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg07.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/diamond/neg/Neg10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6278587/T6278587Neg.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6315770/T6315770.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6611449/T6611449.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6638712/T6638712a.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6638712/T6638712b.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6638712/T6638712c.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6638712/T6638712d.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6638712/T6638712e.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6650759/T6650759m.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/6838943/T6838943.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/7086586/T7086586.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/7086601/T7086601a.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/7154127/T7154127.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/7154127/T7154127.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/7177306/T7177306e.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/inference/8020149/T8020149.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/odersky/BadTest4.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/typevars/5060485/Compatibility.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/generics/typevars/5060485/Compatibility02.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016081/T8016081.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177a.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177a.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177b.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177c.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177c.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177d.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177e.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177f.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8016177/T8016177g.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8019480/T8019480.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8019480/T8019480.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8020147/T8020147.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8020804/T8020804.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8020843/T8020843a.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8020843/T8020843a.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8020843/T8020843b.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8020843/T8020843b.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8021567/T8021567.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8023364/T8023364a.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/8023364/T8023364a.java	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8023364
+ * @summary Exception in thread "main" java.lang.BootstrapMethodError: call site initialization exception
+ * @compile T8023364a.java
+ */
+public class T8023364a { 
+    interface SAM<T> { 
+        T get(); 
+    } 
+    
+    public static void main(String[] args) { 
+        SAM<SAM> sam = new SAM<SAM>() { public SAM get() { return null; } };
+        SAM temp = sam.get()::get; 
+    } 
+}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8023364/T8023364b.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/8023364/T8023364b.java	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8023364
+ * @summary Exception in thread "main" java.lang.BootstrapMethodError: call site initialization exception
+ * @compile T8023364b.java
+ */
+class Test { 
+    
+    interface Supplier<X> {
+        X get();
+    }
+    
+    static class A { 
+        public A(Supplier<B> supplier) { }
+    }
+
+    static class B { }
+
+    static class C { 
+        public B getB() { 
+            return new B(); 
+        } 
+    } 
+
+    public static void main(String[] args) { 
+        new Test().test(Test::getC); 
+    } 
+
+    private static C getC() { 
+        return new C(); 
+    } 
+
+    public void test(Supplier<C> supplier) { 
+        new A(supplier.get()::getB); 
+    } 
+}
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8023389/T8023389.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/8023549/T8023549.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadAccess.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadAccess.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadAccess02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadAccess02.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadAccess03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadAccess03.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadBreakContinue.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadBreakContinue.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadConv01.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/BadConv01.out	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,2 @@
+BadConv01.java:35:13: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.invalid.generic.target.for.lambda.conv: m, kindname.interface, BadConv01.Bar)), #int(T), BadConv01.Bar
+1 error
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadConv02.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/BadConv02.out	Mon Nov 11 23:16:35 2013 -0800
@@ -0,0 +1,3 @@
+BadConv02.java:44:15: compiler.err.cant.apply.symbol: kindname.constructor, FooImpl, int, compiler.misc.no.args, kindname.class, BadConv02.FooImpl, null
+BadConv02.java:45:15: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.target.for.lambda.conv.must.have.default.constr: null, kindname.class, BadConv02.Foo)), #int(), BadConv02.Foo
+2 errors
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadConv03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadConv03.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadConv04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadConv04.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadExpressionLambda.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadExpressionLambda.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadLambdaExpr.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadLambdaPos.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadLambdaPos.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadMethodCall.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadMethodCall.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadMethodCall2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadMethodCall2.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadRecovery.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadRecovery.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadReturn.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadReturn.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadStatementInLambda.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadStatementInLambda.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadStatementInLambda02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadStatementInLambda02.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadTargetType.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/BadTargetType.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/ByteCodeTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Conditional01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Conditional02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Conditional03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Conformance01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Defender01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/DisjunctiveTypeTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/DoubleStaticImport.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/EffectivelyFinal01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/EffectivelyFinal01.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/EffectivelyFinalTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/ErroneousArg.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/ErroneousArg.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/ErroneousLambdaExpr.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/FunctionalInterfaceConversionTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/GenericMethodRefImplClass.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/IdentifierTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Intersection01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/Intersection03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaCapture07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv09.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv09.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv10.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv11.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv12.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv13.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv16.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv17.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv18.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv18.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv19.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv20.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv21.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv21.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv22.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv23.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv24.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv26.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaConv27.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaEffectivelyFinalTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaEffectivelyFinalTest.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr09.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr10.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr11.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr12.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr13.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr14.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr15.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr16.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr17.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr18.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr19.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr19.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExpr20.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExprNotVoid.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaExprNotVoid.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaInnerTypeVarArgs.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaInnerTypeVarArgsSerialize.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaInnerTypeVarReflect.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaInnerTypeVarSerialize.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaParserTest.java
--- a/test/tools/javac/lambda/LambdaParserTest.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/lambda/LambdaParserTest.java	Mon Nov 11 23:16:35 2013 -0800
@@ -29,7 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../lib
  * @build JavacTestingAbstractThreadedTest
- * @run main/othervm LambdaParserTest
+ * @run main/othervm/timeout=800 LambdaParserTest
  */
 
 // use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
@@ -51,10 +51,10 @@
         NILARY_STMT("()->{ return x; }"),
         ONEARY_SHORT_EXPR("#PN->x"),
         ONEARY_SHORT_STMT("#PN->{ return x; }"),
-        ONEARY_EXPR("(#M1 #T1 #PN)->x"),
-        ONEARY_STMT("(#M1 #T1 #PN)->{ return x; }"),
-        TWOARY_EXPR("(#M1 #T1 #PN, #M2 #T2 y)->x"),
-        TWOARY_STMT("(#M1 #T1 #PN, #M2 #T2 y)->{ return x; }");
+        ONEARY_EXPR("(#A1 #M1 #T1 #PN)->x"),
+        ONEARY_STMT("(#A1 #M1 #T1 #PN)->{ return x; }"),
+        TWOARY_EXPR("(#A1 #M1 #T1 #PN, #A2 #M2 #T2 y)->x"),
+        TWOARY_STMT("(#A1 #M1 #T1 #PN, #A2 #M2 #T2 y)->{ return x; }");
 
         String lambdaTemplate;
 
@@ -63,9 +63,12 @@
         }
 
         String getLambdaString(LambdaParameterKind pk1, LambdaParameterKind pk2,
-                ModifierKind mk1, ModifierKind mk2, LambdaParameterName pn) {
+                ModifierKind mk1, AnnotationKind ak1, ModifierKind mk2, AnnotationKind ak2,
+                LambdaParameterName pn) {
             return lambdaTemplate.replaceAll("#M1", mk1.modifier)
+                    .replaceAll("#A1", ak1.anno)
                     .replaceAll("#M2", mk2.modifier)
+                    .replaceAll("#A2", ak2.anno)
                     .replaceAll("#T1", pk1.parameterType)
                     .replaceAll("#T2", pk2.parameterType)
                     .replaceAll("#PN", pn.nameStr);
@@ -129,6 +132,22 @@
                     this == EXPLICIT_GENERIC2_VARARGS;
         }
     }
+    
+    enum AnnotationKind {
+        NONE(""),
+        ANNO("@Anno");
+
+        String anno;
+
+        AnnotationKind(String anno) {
+            this.anno = anno;
+        }
+        
+        boolean compatibleWith(LambdaParameterKind pk) {
+            return pk != LambdaParameterKind.IMPLICIT ||
+                    this == NONE;
+        }
+    }
 
     enum ModifierKind {
         NONE(""),
@@ -166,8 +185,9 @@
         }
 
         String expressionString(LambdaParameterKind pk1, LambdaParameterKind pk2,
-                ModifierKind mk1, ModifierKind mk2, LambdaKind lk, LambdaParameterName pn, SubExprKind sk) {
-            return expressionTemplate.replaceAll("#L", lk.getLambdaString(pk1, pk2, mk1, mk2, pn))
+                ModifierKind mk1, AnnotationKind ak1, ModifierKind mk2, AnnotationKind ak2,
+                LambdaKind lk, LambdaParameterName pn, SubExprKind sk) {
+            return expressionTemplate.replaceAll("#L", lk.getLambdaString(pk1, pk2, mk1, ak1, mk2, ak2, pn))
                     .replaceAll("#S", sk.subExpression);
         }
     }
@@ -198,17 +218,19 @@
                             continue;
                         for (ModifierKind mk1 : ModifierKind.values()) {
                             if (mk1 != ModifierKind.NONE && lk.isShort())
-                                continue;
-                            if (lk.arity() < 1 && mk1 != ModifierKind.NONE)
-                                continue;
-                            for (ModifierKind mk2 : ModifierKind.values()) {
-                                if (lk.arity() < 2 && mk2 != ModifierKind.NONE)
-                                    continue;
-                                for (SubExprKind sk : SubExprKind.values()) {
-                                    for (ExprKind ek : ExprKind.values()) {
-                                        pool.execute(
-                                            new LambdaParserTest(pk1, pk2, mk1,
-                                                                 mk2, lk, sk, ek, pn));
+								continue;
+                            for (AnnotationKind ak1 : AnnotationKind.values()) {
+                                if (lk.arity() < 1 && mk1 != ModifierKind.NONE)
+									continue;
+                                for (ModifierKind mk2 : ModifierKind.values()) {
+                                    for (AnnotationKind ak2 : AnnotationKind.values()) {
+                                        if (lk.arity() < 2 && mk2 != ModifierKind.NONE)
+											continue;
+                                        for (SubExprKind sk : SubExprKind.values()) {
+                                            for (ExprKind ek : ExprKind.values()) {
+                                                pool.execute(new LambdaParserTest(pk1, pk2, mk1, ak1, mk2, ak2, lk, pn, sk, ek));
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -223,8 +245,8 @@
 
     LambdaParameterKind pk1;
     LambdaParameterKind pk2;
-    ModifierKind mk1;
-    ModifierKind mk2;
+    ModifierKind mk1, mk2;
+    AnnotationKind ak1, ak2;
     LambdaKind lk;
     LambdaParameterName pn;
     SubExprKind sk;
@@ -232,13 +254,15 @@
     JavaSource source;
     DiagnosticChecker diagChecker;
 
-    LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2,
-            ModifierKind mk1, ModifierKind mk2, LambdaKind lk,
-            SubExprKind sk, ExprKind ek, LambdaParameterName pn) {
+    LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2, ModifierKind mk1,
+            AnnotationKind ak1, ModifierKind mk2, AnnotationKind ak2, LambdaKind lk,
+            LambdaParameterName pn, SubExprKind sk, ExprKind ek) {
         this.pk1 = pk1;
         this.pk2 = pk2;
         this.mk1 = mk1;
+        this.ak1 = ak1;
         this.mk2 = mk2;
+        this.ak2 = ak2;
         this.lk = lk;
         this.pn = pn;
         this.sk = sk;
@@ -249,7 +273,8 @@
 
     class JavaSource extends SimpleJavaFileObject {
 
-        String template = "class Test {\n" +
+        String template = "@interface Anno { }\n" +
+                          "class Test {\n" +
                           "   SAM s = #E;\n" +
                           "}";
 
@@ -257,8 +282,7 @@
 
         public JavaSource() {
             super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
-            source = template.replaceAll("#E",
-                    ek.expressionString(pk1, pk2, mk1, mk2, lk, pn, sk));
+            source = template.replaceAll("#E", ek.expressionString(pk1, pk2, mk1, ak1, mk2, ak2, lk, pn, sk));
         }
 
         @Override
@@ -284,16 +308,19 @@
 
         boolean errorExpected = (lk.arity() > 0 && !mk1.compatibleWith(pk1)) ||
                 (lk.arity() > 1 && !mk2.compatibleWith(pk2));
-
+        
+        errorExpected |= !lk.isShort() && ((lk.arity() > 0 && !ak1.compatibleWith(pk1)) ||
+                (lk.arity() > 1 && !ak2.compatibleWith(pk2)));
+        
+        errorExpected |= pn == LambdaParameterName.UNDERSCORE &&
+                lk.arity() > 0;
+        
         if (lk.arity() == 2 &&
                 (pk1.explicit() != pk2.explicit() ||
                 pk1.isVarargs())) {
             errorExpected = true;
         }
 
-        errorExpected |= pn == LambdaParameterName.UNDERSCORE &&
-                lk.arity() > 0;
-
         if (errorExpected != diagChecker.errorFound) {
             throw new Error("invalid diagnostics for source:\n" +
                 source.getCharContent(true) +
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaScope01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaScope02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaScope03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaScope04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LambdaScope04.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/LocalBreakAndContinue.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference04.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference08.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference09.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference09.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference11.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference12.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference13.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference14.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference15.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference16.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference17.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference18.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference19.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference20.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference20.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference21.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference21.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference22.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference22.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference23.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference23.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference24.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference25.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference26.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference27.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference28.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference28.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference29.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference30.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference31.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference32.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference32.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference33.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference34.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference35.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference36.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference37.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference37.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference38.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference38.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference39.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference39.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference40.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference40.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference41.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference42.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference43.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference44.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference45.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference45.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference46.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference47.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference47.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference48.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference49.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference50.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference50.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference51.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference51.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference52.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference52.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference53.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference53.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference54.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference54.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference55.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference55.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference56.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference56.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference57.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference58.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference58.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference59.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference60.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference63.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference64.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference65.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference66.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference70.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference70.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference71.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference71.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference72.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReference72.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MethodReferenceParserTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific01.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific02.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific03.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific06.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific07.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/MostSpecific08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/NakedThis.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/NestedCapture01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/NestedCapture02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/SerializedLambdaInInit.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/SourceLevelTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/SourceLevelTest.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType03.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType04.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType04.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType05.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType06.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType07.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType08.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType10.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType11.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType12.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType13.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType13.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType14.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType14.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType15.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType16.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType16.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType17.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType17.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType18.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType19.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType20.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType21.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType21.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType22.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType22.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType23.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType23.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType24.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType24.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType25.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType26.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType26.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType27.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType27.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType28.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType28.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType29.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType30.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType31.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType32.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType33.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType33.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType34.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType35.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType36.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType37.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType38.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType38.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType39.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType39.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType40.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType40.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType41.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType41.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType42.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType43.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType43.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType44.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType44.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType45.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType46.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType46.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType47.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType48.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType49.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType49.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType50.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType52.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType53.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType54.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType55.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType56.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType57.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType57.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType58.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType59.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType60.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType60.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType61.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType62.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType63.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType64.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType65.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType68.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType69.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType70.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType72.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType73.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType74.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TargetType76.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TestInvokeDynamic.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TestLambdaToMethodStats.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/TestSelfRef.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/VoidCompatibility.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/WarnUnderscoreAsIdent.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/WarnUnderscoreAsIdent.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/abort/Abort.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/abort/CompletionFailure.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/badMemberRefBytecode/Main.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/badMemberRefBytecode/TestBadMemberRefBytecode.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/bridge/TestMetafactoryBridges.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/bytecode/TestLambdaBytecode.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/inaccessibleMref01/InaccessibleMref01.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/inaccessibleMref01/p1/C.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/inaccessibleMref02/InaccessibleMref02.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/inaccessibleMref02/p1/C.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/methodReference/SamConversionComboTest.java
--- a/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Mon Nov 11 23:16:35 2013 -0800
@@ -7,7 +7,7 @@
  * published by the Free Software Foundation.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * ANY WARRANTY; without even the implied warranty of MERzCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInnerImplicitArgs.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
--- a/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Thu Oct 31 16:46:43 2013 -0700
+++ b/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Mon Nov 11 23:16:35 2013 -0800
@@ -165,7 +165,7 @@
 
         checkAfterExec();
     }
-
+    
     LambdaReturnKind lrk;
     RetTypeKind rt1, rt2;
     ArgTypeKind ak1, ak2;
@@ -235,6 +235,12 @@
 
     void check() {
         checkCount.incrementAndGet();
+        
+        if (ak1 != ak2)
+            return;
+
+        if (ak1 != ak2)
+            return;
 
         if (ak1 != ak2)
             return;
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/speculative/DiamondFinder.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/speculative/Main.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambda/speculative/MissingError.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/meth/InvokeMH.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/multicatch/7005371/T7005371.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/multicatch/Neg07.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/multicatch/model/ModelChecker.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/nativeHeaders/NativeHeaderTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/nativeHeaders/javahComparison/CompareTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/options/T7022337.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/plugin/showtype/ShowTypePlugin.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/plugin/showtype/Test.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6348499/T6348499.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6359313/T6359313.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6365040/T6365040.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6413690/T6413690.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6414633/T6414633.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6430209/T6430209.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6499119/ClassProcessor.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6511613/clss41701.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6512707/T6512707.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6634138/T6634138.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6994946/SemanticErrorTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/6994946/SyntaxErrorTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/T6920317.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/T7196462.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/TestWarnErrorCount.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/environment/TestSourceVersion.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/environment/round/TestContext.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/errors/TestErrorCount.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/errors/TestFatalityOfParseErrors.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/errors/TestOptionSyntaxErrors.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/errors/TestReturnCode.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestFilerConstraints.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestGetResource.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestGetResource2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestInvalidRelativeNames.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestLastRound.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestPackageInfo.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/filer/TestValidRelativeNames.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/messager/6362067/T6362067.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/messager/MessagerBasics.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/6194785/T6194785.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/6341534/T6341534.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestAnonClassNames.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestElement.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestNames.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestPackageElement.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestResourceElement.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestResourceVariable.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TestTypeParameter.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/element/TypeParamBounds.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/type/NoTypes.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/type/TestUnionType.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/BinaryName.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/GetTypeElemBadArg.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/NoSupers.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/OverridesSpecEx.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/TypesBadArg.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/deprecation/TestDeprecation.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/elements/TestGetPackageOf.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/model/util/filter/TestIterables.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/options/testCommandLineClasses/Test.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/options/testPrintProcessorInfo/Test.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/warnings/TestSourceVersionWarnings.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/werror/WError1.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/werror/WErrorGen.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/processing/werror/WErrorLast.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/quid/T6999438.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/resolve/ResolveHarness.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/tree/TypeAnnotationsPretty.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/types/TypeHarness.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/util/T6597678.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/util/context/T7021650.java
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/varargs/6313164/T6313164.out
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/javac/versions/check.sh
diff -r 6b4d6205366c -r 097bc67c0099 test/tools/sjavac/SJavac.java