6866185: Util.getPackageSourcePath should use lastIndexOf not indexOf and related cleanup Reviewed-by: bpatel

6966736: javac verbose output is inconsistent Reviewed-by: mcimadamore

7024212: TestWarnErrorCount fails Summary: TestWarnErrorCount should be executed with -Xlint:all,-path to avoid spurious failures Reviewed-by: jjg

7022054: Invalid compiler error on covariant overriding methods with the same erasure Summary: Rules for method clash use notion of subsignature, which is sometimes too strict and incompatible with JDK 6 Reviewed-by: jjg

7023703: Valid code doesn't compile Summary: leftovers cause problems when analyzing loops in Flow.java Reviewed-by: jjg

7023233: False positive for -Xlint:try with nested try with resources blocks Summary: Wrong lint warning issued about unused resource when nested try-with-resource blocks are found Reviewed-by: jjg

6639645: Modeling type implementing missing interfaces Reviewed-by: darcy, mcimadamore

6986892: confusing warning given after errors in annotation processing Reviewed-by: darcy

6986895: compiler gives misleading message for no input files Reviewed-by: darcy

6541876: "Enclosing Instance" error new in 1.6 Summary: unqualified 'this' should not be selected in a qualified super() call in a default constructor Reviewed-by: jjg

7021183: 269: assertion failure getting enclosing element of an undefined name Reviewed-by: mcimadamore

7022711: compiler crash in try-with-resources Reviewed-by: mcimadamore

7022741: warning counts are wrong after anno processing Reviewed-by: mcimadamore

7022337: repeated warnings about bootclasspath not set Reviewed-by: mcimadamore

7015715: lub gets stuck on type with complex supertype Summary: lub should not scan supertypes unnecessarily Reviewed-by: jjg, dlsmith

7015430: Incorrect thrown type determined for unchecked invocations Summary: Thrown types do not get updated after 15.12.2.8, and do not get erased as per 15.12.2.6 Reviewed-by: jjg, dlsmith

7022310: test/tools/javac/diags/Example: args added twice Reviewed-by: mcimadamore

7021650: fix Context issues Reviewed-by: mcimadamore

7018753: tools/javac/varargs/warning/Warn5.java times out on slow machines Summary: Use a single file manager for all JavacTasks Reviewed-by: jjg, mcimadamore

Merge

7019631: issues in test headers in b130 Summary: fix to test headers not containing correct bug ID Reviewed-by: jjg

7020657: Javac rejects a fairly common idiom with raw override and interfaces Summary: name clash should not be reported if subinterface/implementing class resolves the clash by defining common overrider Reviewed-by: jjg

Added tag jdk7-b133 for changeset 527e04a21c75

Merge

Merge

7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places Reviewed-by: mchung

Added tag jdk7-b133 for changeset f3c2826383e4

Merge