Merge

6855563: test broken after merge with latest parser Reviewed-by: jjg Contributed-by: mali@csail.mit.edu

6854796: update JSR308 impl with latest code from type-annotations repo Reviewed-by: jjg, mcimadamore, darcy Contributed-by: mernst@cs.washington.edu, mali@csail.mit.edu, mpapi@csail.mit.edu

6855544: add missing files Reviewed-by: jjg, mcimadamore, darcy Contributed-by: mernst@cs.washington.edu, mali@csail.mit.edu, mpapi@csail.mit.edu

6843077: JSR 308: Annotations on types Reviewed-by: jjg, mcimadamore, darcy Contributed-by: mernst@cs.washington.edu, mali@csail.mit.edu, mpapi@csail.mit.edu

6593082: MirroredTypeException constructor does not throw NPE when type is null Reviewed-by: jjg

Merge

Merge

6852649: The Rich formatter printer should be an explicit class to facilitate overriding Summary: Improve reusabiliy of the rich formatter by removing anonymous inner classes/changing visibility of fields Reviewed-by: jjg

6852595: Accessing scope using JSR199 API on erroneous tree causes Illegal Argument Exception Summary: Fixed problem with empty DiagnosticSource objects causing IAE in the JCDiagnostic constructor Reviewed-by: jjg

6822637: ResolveError hierarchy needs to be refactored Summary: Break ResolveError class into a hierarchy representing different kinds of resolution errors Reviewed-by: jjg

Merge

6852856: javap changes to facilitate subclassing javap for variants Reviewed-by: mcimadamore

6638712: Inference with wildcard types causes selection of inapplicable method Summary: Added global sanity check in order to make sure that return type inference does not violate bounds constraints Reviewed-by: jjg

6835428: regression: return-type inference rejects valid code Summary: Redundant subtyping test during type-inference ends up in rejecting legal code Reviewed-by: jjg

6835430: javac does not generate signature attributes for classes extending parameterized inner classes Summary: ClassWriter does not consider outer params of an inner class when emitting signature attributes Reviewed-by: jjg