6992789: assert(phi->_idx >= nodes_size()) failed: only new Phi per instance memory slice Summary: Swap checks: check for regular memory slice first and keep input phi. Reviewed-by: never

7034513: enable fast accessors and empty methods for ZERO and -Xint Reviewed-by: kvn, iveresov

7033779: CodeCache::largest_free_block may need to hold the CodeCache lock Reviewed-by: kvn

Merge

6777083: assert(target != __null,"must not be null") Reviewed-by: iveresov, kvn

Merge

7004547: regular loop unroll should not unroll more than max unrolling Summary: Take into account that after unroll conjoined heads and tails will fold. Reviewed-by: never

Merge

6528013: C1 CTW failure with -XX:+VerifyOops assert(allocates2(pc),"") Reviewed-by: kvn, iveresov

Merge

7033732: C1: When calling c2 arraycopy stubs offsets and length must have clear upper 32bits Summary: With 7033154 we started calling c2 arraycopy stubs from c1. On sparcv9 we must clear the upper 32bits for offset (src_pos, dst_pos) and length parameters when calling them. Reviewed-by: never, kvn

7026957: assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int()) failed Reviewed-by: kvn, jrose

7032458: Zero and Shark fixes Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

7033154: Improve C1 arraycopy performance Summary: better static analysis. Take advantage of array copy stubs. Reviewed-by: never

7004535: Clone loop predicate during loop unswitch Summary: Clone loop predicate for clonned loops Reviewed-by: never

7032314: Allow to generate CallLeafNoFPNode in IdealKit Summary: Added CallLeafNoFPNode generation to IdealKit. Added i_o synchronization. Reviewed-by: never

6909440: C2 fails with assertion (_always_cold->is_cold(),"must always be cold") Reviewed-by: kvn

6385687: UseFastEmptyMethods/UseFastAccessorMethods considered harmful Reviewed-by: kvn, jrose, phh

Added tag hs21-b08 for changeset dff699fcdf23

Added tag jdk7-b138 for changeset dff699fcdf23

Added tag jdk7-b138 for changeset b4b1b3e184ee

Added tag jdk7-b138 for changeset 62b8e328f8c8

Merge

Merge

Merge

Merge

Merge

7034940: message drop 2 translation integration Reviewed-by: yhuang

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Merge

Merge

7029979: (fs) Path.toRealPath(boolean) should be toRealPath(LinkOption...) Reviewed-by: mcimadamore, jjg

7010344: Some of the html files do not have element <a> in right context. Reviewed-by: jjg

7028405: (javac) remove unused JSR-292 code Reviewed-by: jrose, mcimadamore

Merge

Merge

7032633: javac -Xlint:all warns about flush() within try on an auto-closeable resource Summary: missing name check before calling MethodSymbol.overrides causes wrong warnings to be issued Reviewed-by: jjg

7031005: javap prints "extends java.lang.Object" Reviewed-by: mcimadamore

7031108: NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build Reviewed-by: darcy, mcimadamore

7027157: Project Coin: javac warnings for AutoCloseable.close throwing InterruptedException Summary: javac should warn about use/declaration of AutoCloseable subclasses that can throw InterruptedException Reviewed-by: jjg

7030150: Type inference for generic instance creation failed for formal type parameter Summary: Problem when explicit generic constructor type-arguments are used in conjunction with diamond Reviewed-by: jjg

7030606: Project-coin: multi-catch types should be pairwise disjoint Summary: Bring javac in sync with latest Project Coin EDR Reviewed-by: jjg

7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class Summary: Diamond accepts non-parameterized member inner classes with parameterized outer because of a bad check Reviewed-by: jjg

7001086: NLS: un-used resources should be removed from standard.properties and improper concatenation Reviewed-by: jjg

6437138: JSR 199: Compiler doesn't diagnose crash in user code 6482554: uncaught exception from annotation processor not reported through JavaCompiler.CompilationTask.call Reviewed-by: mcimadamore

7009599: javac build puts extraneous files into dist/lib/classes.jar Reviewed-by: ohair

6597678: JavaCompiler.getStandardFileManager always uses default charset not the one that user specifies Reviewed-by: mcimadamore

7010342: End tag for element P is not open for few html files generated using new javadoc Reviewed-by: jjg

7025314: NLS: translatability violation on standard.properties Reviewed-by: jjg

Added tag jdk7-b137 for changeset ec825a21d1f8

Merge

Merge

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset e7ad21289bd4

Merge

Merge

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset 4d1bb30e7cb5

Merge

Merge

Merge

7034940: message drop 2 translation integration Reviewed-by: yhuang

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset 81da7c8abcbd