RFR (XS): [8u20] 8035406: Improve data structure for Code Cache remembered sets

[Bengt Rutisson]

Hi Thomas,

The merge looks fine to me.

Bengt

On 3/24/14 2:20 PM, Thomas Schatzl wrote:
> Hi all,
>
>    could I have reviews for the following minor merge conflict when
> backporting 8035406: Improve data structure for Code Cache remembered
> sets to 8u20?
>
> The issue is that the following hunks in prims/jni.cpp failed:
>
> --- src/share/vm/prims/jni.cpp
> +++ src/share/vm/prims/jni.cpp
> @@ -3882,6 +3882,7 @@
>   void TestOldFreeSpaceCalculation_test();
>   void TestG1BiasedArray_test();
>   void TestBufferingOopClosure_test();
> +void TestCodeCacheRemSet_test();
>   #endif
>   
>   void execute_internal_vm_tests() {
> @@ -3910,6 +3911,7 @@
>       run_unit_test(TestG1BiasedArray_test());
>       run_unit_test(HeapRegionRemSet::test_prt());
>       run_unit_test(TestBufferingOopClosure_test());
> +    run_unit_test(TestCodeCacheRemSet_test());
>   #endif
>       tty->print_cr("All internal VM tests passed");
>     }
>
> The problem is that "8033764: Remove the usage of StarTask from
> BufferingOopClosure" has not been applied to the 8u20 branch, i.e. the
> "TestBufferingOopClosure_test" and "TestBufferingOopClosure_test" lines
> are not in the 8u branch, causing the mentioned conflict.
>
> This backport will remove the conflicts when applying of Per's string
> dedup patch. (Thread starting at
> http://mail.openjdk.java.net/pipermail/hotspot-dev/2014-March/013178.html )
>
> CR:
> https://bugs.openjdk.java.net/browse/JDK-8035406
>
> New webrev:
> http://cr.openjdk.java.net/~tschatzl/8035406/8u20/webrev/
>
> Original webrev:
> http://cr.openjdk.java.net/~tschatzl/8035406/webrev/
>
> Testing:
> jprt
>
> Thanks,
>    Thomas
>
>