6868553: 6867671 breaks some tests Reviewed-by: mcimadamore

6867671: javap whitespace formatting issues Reviewed-by: mcimadamore

Merge

4880672: javap does not output inner interfaces of an interface Reviewed-by: mcimadamore

6866657: add byteLength method to primary classfile types Reviewed-by: mchung

6861837: JCK compilation failures Summary: Type-annotations processing is accessing type info before they are available in MemberEnter Reviewed-by: jjg Contributed-by: mali@csail.mit.edu

6864382: NPE in the rich formatter when processing an unattributed type-variable Summary: Unattributed type variable should not be accessed by the rich formatter when emitting where clauses Reviewed-by: jjg

6862608: rich diagnostic sometimes contain wrong type variable numbering Summary: The rich formatter generates worng numbers for type-variables in where clauses Reviewed-by: jjg

6827648: Extremely slow compilation time for visitor pattern code + generics Summary: Javac unnecessarily recomputates type-substitutions multiple times Reviewed-by: jjg

4777949: Javap Rewrite : Warn javap usage on package classes with simple name. Reviewed-by: mcimadamore

6734068: Some variable length attributes set their size incorrectly. Reviewed-by: mcimadamore

6855990: javap InstructionDetailWriter should support new 308 annotations attribute Reviewed-by: mcimadamore

Added tag jdk7-b69 for changeset 2556d2c42271

Merge

6873200: patch.out and jaxws.patch do not belong in jaxws repository Reviewed-by: xdono, ohair

Merge