Merge

Merge

7075721: javac should have public enum for exit codes Reviewed-by: mcimadamore

7092965: javac should not close processorClassLoader before end of compilation Reviewed-by: darcy

7030473: Remove dead field JCCompilationUnit.flags Reviewed-by: dlsmith

7091528: javadoc attempts to parse .class files Reviewed-by: darcy

7086586: Inference producing null type argument Summary: Inference should fail in 15.12.2.7 when inference variables with 'nulltype' upper bounds are found Reviewed-by: dlsmith

7068437: Regression: Filer.getResource(SOURCE_OUTPUT, ...) no longer works in JDK 7 w/o -s Reviewed-by: darcy

7090700: fix for 7080267 breaks two tests Reviewed-by: ksrini

7090249: IllegalStateException from Trees.getScope when called from JSR 199 Reviewed-by: mcimadamore

7080267: Call to toString() from an ExpressionStatementTree doesn't take in consideration the ";" at the end Reviewed-by: mcimadamore

7090297: Remove com.sun.tools.javac.Launcher from tools.jar Reviewed-by: jjg

7086601: Error message bug: cause for method mismatch is 'null' Summary: Inference error during lub() does not set 'cause' for method resolution diagnostic Reviewed-by: jjg

7003595: IncompatibleClassChangeError with unreferenced local class with subclass Summary: Compiler omits unreferenced local inner classes from the InnerClasses attribute Reviewed-by: jjg

7086595: Error message bug: name of initializer is 'null' Summary: Implementation of MethodSymbol.location() should take into account static/instance initializers Reviewed-by: jjg