Merge

Merge

Merge

6763518: Impossible to suppress raw-type warnings Summary: Check.validate(Type) should be invoked after -Xlint is augmented in Attr.visitVarDef Reviewed-by: darcy

6764226: ListTest fails on javap output with bad characters Reviewed-by: darcy

Merge

6762569: Javac crashes with AssertionError in Types.containedBy Summary: Types.containedBy should be more liberal with UndetVars Reviewed-by: jjg

6758789: Some method resolution diagnostic should be improved Summary: Recent work on diagnostics left out some resolution corner cases Reviewed-by: jjg

6746184: javac fails to compile call to public varargs method Summary: javac's resolution process should go through all steps described in JLS 15.12.2.2 Reviewed-by: jjg

6680106: StackOverFlowError for Cyclic inheritance in TypeParameters with ArrayType Bounds Summary: Javac ends up in an infinite loop while attributing mutually referring array type-parameter bounds Reviewed-by: jjg

6557954: Inner class type parameters doesn't get substituted when checking type well-formedness Summary: Validator.visitTypeApply should substitute all formal typevars with actual parameters Reviewed-by: jjg

6548436: Incorrect inconvertible types error Summary: Types.rewrite quantifiers should cope with captured type-variables properly Reviewed-by: jjg

6487370: javac incorrectly gives ambiguity warning with override-equivalent abstract inherited methods Summary: Javac should not compare erased return types when checking for ambiguity errors during overload resolution Reviewed-by: jjg

6711619: javac doesn't allow access to protected members in intersection types Summary: Accordingly to new accessibility rules all members of intersection types (but private ones) should be accessible Reviewed-by: jjg

6732484: Bound error on wildcard code Summary: Check.checkExtends should cope with captured type-variables Reviewed-by: jjg