Merge

6893701: compiler/6877254/Test.java fails because it combines -XX:+UseConcMarkSweepGC with other GC Summary: Remove explicit GC flags in regression tests Reviewed-by: never, ysr

6917931: compiler/6895383/Test.java don't compile due missed imports Summary: Add missing imports. Reviewed-by: never, twisti

6917698: os::is_allocatable Zero fix for 32-bit platforms Summary: Recent changes call os::is_allocatable which was not implemented in Zero. Reviewed-by: twisti Contributed-by: Edward Nevill <ed@camswl.com>

6879943: CTW failure jdk6_18/hotspot/src/share/vm/c1/c1_LIR.hpp:2029 Reviewed-by: kvn, cfang

6849984: Value methods for platform dependent math functions constant fold incorrectly Reviewed-by: kvn, twisti

6912065: final fields in objects need to support inlining optimizations for JSR 292 Reviewed-by: twisti, kvn

6894779: Loop Predication for Loop Optimizer in C2 Summary: Loop predication implementation Reviewed-by: never, kvn

Merge

Merge

6915005: G1: Hang in PtrQueueSet::completed_buffers_list_length with gcl001 Summary: When enqueuing a completed PtrQueue buffer, cache a local pointer to the buffer and clear the field in the PtrQueue prior to unlocking the mutex referenced by the _lock field and pass the cached local value to the enqueuing routine. This will prevent the same completed buffer being enqueued multiple times, which causes the hang. Reviewed-by: ysr

Merge

6916652: G1: remove +UseG1GC from under experimental options Summary: What the title says. Reviewed-by: ysr, jmasa

6896647: card marks can be deferred too long Summary: Deferred card marks are now flushed during the gc prologue. Parallel[Scavege,OldGC] and SerialGC no longer defer card marks generated by COMPILER2 as a result of ReduceInitialCardMarks. For these cases, introduced a diagnostic option to defer the card marks, only for the purposes of testing and diagnostics. CMS and G1 continue to defer card marks. Potential performance concern related to single-threaded flushing of deferred card marks in the gc prologue will be addressed in the future. Reviewed-by: never, johnc

6902115: G1:assert(ignore_max_completed||thread->is_Java_thread()||SafepointSynchronize::is_at_safepoint()) Summary: Remove invalid assert and mangle filler objects in TLABs that are being retired. Reviewed-by: ysr, jmasa

Added tag jdk7-b80 for changeset 8f15a8afca28

Added tag jdk7-b80 for changeset e28f9a870f12

Added tag jdk7-b80 for changeset e6abd38682d2

Merge

Merge

Added tag jdk7-b79 for changeset e7616c247414

Merge

Added tag jdk7-b79 for changeset 4b85cf247673

Merge

Added tag jdk7-b79 for changeset c7d5c3613e3f

Merge

Merge

6917485: Corba doc warnings Summary: Fix warnings generated by javadoc Reviewed-by: darcy

Added tag jdk7-b79 for changeset ae0f40f891d4

Merge