Prepared by: | goetz on Tue Apr 1 12:17:27 CEST 2014 |
---|---|
Workspace: | /net/usr.work/d045726/oJ/ref-hs-rt |
Compare against: | http://hg.openjdk.java.net/jdk9/hs-rt/hotspot |
Compare against version: | 6165 |
Summary of changes: | 305 lines changed: 167 ins; 123 del; 15 mod; 9721 unchg |
Changeset: | ref-hs-rt.changeset |
Author comments: | Change 8035330: Remove G1ParScanPartialArrayClosure and G1ParScanHeapEvacClosure broke the dbg build on AIX. That's because do_oop_partial_array() is added in a header, but requires inline function par_write_ref() through several inlined calls. In some cpp files, like arguments.cpp, par_write_ref() is not defined as the corresponding inline header is not included. The aix debug VM does not start. This can be solved by including g1RemSet.inline.hpp in g1CollectedHeap.inline.hpp. Unfortunately this causes a cyclic dependency that breaks the linux build. A inline.hpp file is included ahead of a .hpp file, so that the code in the inline.hpp file can not see the class declaration. This is caused because g1CollectedHeap.inline.hpp is included in sparsePRT.hpp. But .inline.hpp files never should be included in .hpp files. To resolve this, I changed this inlcude to g1CollectedHeap.hpp. As consequence, I had to move a row of functions to existing .inline.hpp files. |
Legend: |
Modified file Deleted file New file |
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
rev 6166 : 8038498: Fix includes and C inlining after 80353301 line changed: 1 ins; 0 del; 0 mod; 300 unchg
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
rev 6166 : 8038498: Fix includes and C inlining after 803533023 lines changed: 23 ins; 0 del; 0 mod; 6904 unchg
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
rev 6166 : 8038498: Fix includes and C inlining after 8035330137 lines changed: 0 ins; 123 del; 14 mod; 1951 unchg
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
rev 6166 : 8038498: Fix includes and C inlining after 8035330143 lines changed: 143 ins; 0 del; 0 mod; 227 unchg
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/gc_implementation/g1/sparsePRT.hpp
rev 6166 : 8038498: Fix includes and C inlining after 80353301 line changed: 0 ins; 0 del; 1 mod; 339 unchg
This code review page was prepared using /sapmnt/home1/d045726/bin/webrev.ksh (vers 24.0-hg+jbs).