6898462: The escape analysis with G1 cause crash assertion src/share/vm/runtime/vframeArray.cpp:94 Summary: OOM during reallocation of scalar replaced objects in deoptimization causes crashes Reviewed-by: kvn, jrose

Merge

Merge

8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed Summary: PhaseIdealLoop::split_if_with_blocks_post() shoulnd't reorder range checks adjusted by range check smearing Reviewed-by: kvn, jrose

Merge

6522873: Java not print "Unrecognized option" when it is invalid option. Summary: Introduced a new version of match_option() that don't allow a tail after the flag name and used it for flags without extra arguments Reviewed-by: dholmes, dcubed

8066782: Move common code from CMSGeneration and TenuredGeneration to CardGeneration Reviewed-by: kbarrett, tschatzl

8066781: Minor cleanups to TenuredGeneration Reviewed-by: kbarrett, tschatzl

8066780: Split CardGeneration out to its own file Reviewed-by: kbarrett, tschatzl

8066102: Clean up HeapRegionRemSet files Summary: Remove dead code, tighten public interfaces and improve documentation in the HeapRegionRemSet implementation. Reviewed-by: mgerdin, kbarrett

Merge

Merge

8065634: Crash in InstanceKlass::clean_method_data when _method is NULL Reviewed-by: coleenp, hseigel, poonam

8059066: CardTableModRefBS might commit the same page twice Reviewed-by: tschatzl, kbarrett, jmasa

Merge

8066441: Add PLAB trace event Reviewed-by: tschatzl, ehelin, egahlin