| Prepared by: | goetz on Fri Jul 17 15:05:50 CEST 2015 |
|---|---|
| Workspace: | /net/usr.work/d045726/oJ/8131761-fixMerge-hs-rt |
| Compare against: | http://hg.openjdk.java.net/jdk9/hs-rt/hotspot |
| Compare against version: | 8702 |
| Summary of changes: | 6 lines changed: 0 ins; 6 del; 0 mod; 1163 unchg |
| Changeset: | 8131761-fixMerge-hs-rt.changeset |
| Bug id: | JDK-8131761 : Fix merge error adding code that was removed in 8077936. |
| Legend: |
Modified file Deleted file New file |
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/oops/oop.hpp
rev 8703 : 8131761: Fix merge error adding code that was removed in 8077936.1 line changed: 0 ins; 1 del; 0 mod; 391 unchg
Cdiffs
Udiffs
Wdiffs
Sdiffs
Frames
Old
New
-----
Raw
src/share/vm/oops/oop.inline.hpp
rev 8703 : 8131761: Fix merge error adding code that was removed in 8077936.5 lines changed: 0 ins; 5 del; 0 mod; 772 unchg
This code review page was prepared using /sapmnt/home/d045726/bin/webrev.ksh (vers 25.6-hg+openjdk.java.net).