DELTA 430947 4030 24 SVNCC  B3ENDREP DELTA SVNY`YYx^Rj0+ԑ@z)QJTzjBw~%.E@3)`9IJ4X=-ĭ7CcBh8תjyz m%󆋥d)=`wՉ C$G氜=^>EpBi \B@ctǦ$CS/Hxy6ZoPѝ) V/}4Q l##!xG=izry] lVT'6v(_w"}(!52QQ<<\ySI Y<jqrs?Nr1MV1hENDREP DELTA SVNwyww--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig +++ hotspot/src/share/vm/runtime/virtualspace.cpp @@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && Universe::narrow_oop_use_implicit_null_checks()) ? lcm(os::vm_page_size(), alignment) : 0) { - if (base() > 0) { + if (base() != NULL) { MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); } ENDREP id: 5-349468.0.r431607/968 type: file pred: 5-349468.0.r430947/628538 count: 79 text: 431607 0 27 16579 1ec7081be2fae98a47f390e4ad7da718 ffd457c942a19f0deba87086147babf21ef73590 431606-9913/_4 props: 300914 71 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/java/openjdk8/Makefile copyroot: 0 / id: 5-431607.0.r431607/1268 type: file count: 0 text: 431607 55 367 601 0ece467edfe4f6bddb3f1fee3b53465c b4aa80ab9dea5a479b4dc6721e98b5ed2da731ac 431606-9913/_7 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp copyroot: 0 / id: 8-431607.0.r431607/1574 type: file count: 0 text: 431607 435 520 503 0d85f4c69a7a1a5f1616a6c82d8d1ffc 7d2cf11c716c8f08fdaa6ffb219edeb2757f735e 431606-9913/_9 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp copyroot: 0 / PLAIN K 28 bsd.fontconfig.properties.in V 28 file b-349468.0.r382926/1110 K 7 cacerts V 29 file e-349468.0.r424546/37753 K 13 fpuhack.patch V 35 file 5-398188.0-420940.r420940/1147 K 49 jdk-test-javax-imageio-plugins-jpeg-truncated.jpg V 30 file 7-351721.0.r351721/124680 K 50 nashorn-test-script-jfx-flyingimage-golden-bsd.png V 31 file 5-372338.0.r372338/4000700 K 51 nashorn-test-script-jfx-kaleidoscope-golden-bsd.png V 31 file 8-372338.0.r372338/4001025 K 45 nashorn-test-script-jfx-spread-golden-bsd.png V 31 file a-372338.0.r372338/4001355 K 9 patch-bsd V 30 file g-349468.0.r429875/111267 K 14 patch-bsd-test V 28 file i-349468.0.r424926/8368 K 34 patch-common-autoconf-toolchain.m4 V 31 file 8-352544.0.r372338/4002913 K 15 patch-configure V 28 file k-349468.0.r380064/2446 K 81 patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java V 28 file 5-421302.0.r421302/1040 K 38 patch-hotspot-src-os-bsd-vm-os_bsd.cpp V 28 file 8-421302.0.r421302/1388 K 67 patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp V 28 file 5-398182.0.r398182/2965 K 72 patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp V 28 file 8-398182.0.r398182/3302 K 56 patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp V 28 file a-398182.0.r416839/1894 K 39 patch-hotspot_src_share_vm_opto_lcm.cpp V 28 file 5-431607.0.r431607/1268 K 51 patch-hotspot_src_share_vm_runtime_virtualspace.cpp V 28 file 8-431607.0.r431607/1574 K 37 patch-jdk-make-lib-Awt2dLibraries.gmk V 27 file 8-354182.0.r392605/654 K 36 patch-jdk-make-lib-CoreLibraries.gmk V 27 file o-349468.0.r392605/985 K 46 patch-jdk-make-lib-ServiceabilityLibraries.gmk V 28 file q-349468.0.r392605/1319 K 35 patch-jdk-src-bsd-doc-man-javadoc.1 V 28 file 7-392604.0.r392604/1268 K 69 patch-jdk-src-share-classes-com-sun-java-swing-plaf-gtk-Metacity.java V 30 file u-349468.0.r349468/123986 K 55 patch-jdk-src-share-classes-sun-applet-AppletPanel.java V 28 file a-354182.0.r354182/4970 K 61 patch-jdk-src-share-classes-sun-applet-AppletViewerPanel.java V 28 file c-354182.0.r354182/5295 K 55 patch-jdk-src-share-classes-sun-print-PSPrinterJob.java V 30 file 7-354762.0.r392506/144058 K 52 patch-jdk-src-share-native-sun-font-freetypeScaler.c V 28 file 5-416952.0.r416952/1109 K 67 patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java V 30 file y-349468.0.r349468/124644 K 71 patch-jdk-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java V 31 file 10-349468.0.r349468/124985 K 65 patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c V 28 file 5-403464.0.r403464/2932 END ENDREP id: a-349468.0.r431607/4507 type: dir pred: a-349468.0.r429875/114025 count: 64 text: 431607 1893 2601 0 3355155d4b969a3777fe8348a9b597c7 cpath: /head/java/openjdk8/files copyroot: 0 / PLAIN K 8 Makefile V 27 file 5-349468.0.r431607/968 K 8 distinfo V 28 file 8-349468.0.r424926/7753 K 5 files V 27 dir a-349468.0.r431607/4507 K 9 pkg-descr V 31 file 12-349468.0.r349468/126531 K 11 pkg-message V 31 file 14-349468.0.r349468/126809 END ENDREP id: 4-349468.0.r431607/4951 type: dir pred: 4-349468.0.r430947/629105 count: 97 text: 431607 4693 245 0 aeac0cfb09f85d2c5f91bc34cbece7cc cpath: /head/java/openjdk8 copyroot: 0 / PLAIN K 8 Makefile V 26 file 2-19810.0.r431140/664 K 7 aparapi V 26 dir 4-417519.0.r422757/590 K 4 avis V 27 dir 4-206385.0.r413252/4723 K 11 berkeley-db V 29 dir 4-128054.0.r412347/273219 K 5 bluej V 28 dir 4-46405.0.r415499/452933 K 17 bootstrap-openjdk V 27 dir 4-305745.0.r430419/1582 K 12 bouncycastle V 28 dir 4-52251.0.r412347/274856 K 14 bouncycastle15 V 27 dir 4-419237.0.r429629/2802 K 5 cacao V 29 dir 4-184152.0.r412347/275599 K 6 castor V 26 dir 4-135248.0.r385926/518 K 9 classpath V 29 dir 4-117813.0.r428150/692253 K 3 cos V 28 dir 4-24315.0.r428144/539811 K 11 cryptix-jce V 26 dir 2-25999.0.r372556/8997 K 5 dbvis V 26 dir 4-189906.0.r407453/981 K 7 eclipse V 28 dir 4-83172.0.r431169/535242 K 12 eclipse-EPIC V 29 dir 4-124974.0.r412347/277797 K 11 eclipse-cdt V 28 dir 4-116988.0.r431296/19283 K 14 eclipse-drjava V 29 dir 4-167511.0.r415738/833956 K 11 eclipse-ecj V 29 dir 4-293586.0.r400848/634543 K 16 eclipse-findbugs V 29 dir 4-188996.0.r424411/967344 K 13 eclipse-log4e V 29 dir 4-118091.0.r412347/280692 K 14 eclipse-lomboz V 29 dir 4-114620.0.r412347/281356 K 13 eclipse-pydev V 29 dir 4-206056.0.r412347/282072 K 15 eclipse-shelled V 29 dir 4-201602.0.r424411/968015 K 21 eclipse-windowbuilder V 29 dir 4-299260.0.r412347/283415 K 8 hamcrest V 27 dir 4-385166.0.r385166/2425 K 11 icedtea-web V 29 dir 4-277566.0.r415742/691900 K 7 infobus V 25 dir 2-22833.0.r351217/803 K 8 intellij V 27 dir 4-405745.0.r429630/1744 K 19 intellij-fsnotifier V 29 dir d-409684.0.r426566/800835 K 14 intellij-pty4j V 29 dir l-409684.0.r422175/670060 K 16 intellij-pycharm V 27 dir 4-415367.0.r430304/1587 K 17 intellij-rubymine V 28 dir 4-431139.0.r431139/17806 K 17 intellij-ultimate V 27 dir 4-423993.0.r424310/1665 K 3 jad V 28 dir 4-36667.0.r415499/455769 K 3 jaf V 28 dir 2-22835.0.r415499/456408 K 3 jai V 28 dir 4-97917.0.r428144/540542 K 12 jakarta-bcel V 25 dir 4-58614.0.r396698/583 K 25 jakarta-commons-beanutils V 28 dir 4-70098.0.r412347/286339 K 19 jakarta-commons-cli V 26 dir 4-70091.0.r403360/1003 K 21 jakarta-commons-codec V 26 dir 4-147090.0.r403333/550 K 27 jakarta-commons-collections V 26 dir 4-68280.0.r425137/2481 K 20 jakarta-commons-dbcp V 28 dir 4-90399.0.r412347/287019 K 25 jakarta-commons-discovery V 29 dir 4-107393.0.r415738/835305 K 26 jakarta-commons-httpclient V 29 dir 4-119656.0.r431402/531357 K 20 jakarta-commons-lang V 28 dir 4-68275.0.r415499/458444 K 23 jakarta-commons-logging V 28 dir 4-70103.0.r425127/367334 K 20 jakarta-commons-pool V 28 dir 4-90398.0.r417166/702776 K 26 jakarta-commons-primitives V 28 dir 4-95422.0.r386097/700405 K 11 jakarta-oro V 25 dir 4-52168.0.r355959/960 K 14 jakarta-regexp V 29 dir 4-47749.0.r386312/1419378 K 5 jamvm V 29 dir 4-210499.0.r412347/288503 K 6 jasmin V 29 dir 4-110200.0.r415499/459873 K 15 java-checkstyle V 26 dir 4-67715.0.r419217/1058 K 8 java-cup V 28 dir 2-17766.0.r398832/614964 K 11 java-getopt V 25 dir 4-78508.0.r402336/517 K 15 java-subversion V 36 dir 4-216026.0-335939.r415499/460597 K 13 java-zoneinfo V 27 dir 4-294028.0.r430683/1419 K 6 java3d V 28 dir 4-96928.0.r428144/541273 K 8 javahelp V 29 dir 4-250223.0.r425127/368045 K 8 javamail V 25 dir 2-22832.0.r386052/529 K 13 javavmwrapper V 25 dir 2-29536.0.r420669/585 K 5 jaxen V 28 dir 4-95890.0.r346734/260284 K 6 jboss7 V 26 dir 4-304752.0.r428048/998 K 7 jboss71 V 29 dir 4-308904.0.r430235/725372 K 7 jboss72 V 36 dir 4-308904.0-314186.r430235/726236 K 9 jcalendar V 26 dir 4-106388.0.r355875/748 K 6 jcckit V 26 dir 4-117625.0.r422971/738 K 7 jcommon V 25 dir 4-93769.0.r376191/948 K 6 jd-gui V 29 dir 4-409155.0.r424092/392627 K 8 jdbcpool V 28 dir 4-24253.0.r424411/969422 K 9 jdk16-doc V 26 dir 4-197929.0.r357516/697 K 8 jdk7-doc V 34 dir 4-197929.0-309687.r380722/1081 K 8 jdk8-doc V 27 dir 4-357232.0.r429839/1008 K 4 jdom V 28 dir 4-44404.0.r412347/289141 K 5 jflex V 29 dir 4-101341.0.r412347/289881 K 10 jfreechart V 28 dir 4-93771.0.r412347/290580 K 6 jgraph V 29 dir 4-113248.0.r424411/970074 K 7 jgrapht V 29 dir 4-113246.0.r417166/704064 K 7 jgraphx V 29 dir 4-248132.0.r428144/541916 K 5 jikes V 28 dir 2-15257.0.r398996/421639 K 4 jlex V 28 dir 2-19983.0.r424411/970762 K 5 jlint V 26 dir 4-44409.0.r428273/1273 K 3 jmf V 29 dir 4-100500.0.r428144/542660 K 4 jode V 28 dir 4-83547.0.r412347/291913 K 4 jomp V 26 dir 4-114303.0.r367987/576 K 8 jrosetta V 29 dir 4-250249.0.r425127/369341 K 3 jta V 26 dir 4-264405.0.r355978/879 K 6 jtiger V 29 dir 4-215354.0.r426827/522664 K 4 jump V 25 dir 4-61210.0.r355980/926 K 5 junit V 28 dir 4-34771.0.r431402/532019 K 9 jxgrabkey V 27 dir 4-417813.0.r417955/1394 K 8 langspec V 29 dir 4-119753.0.r424560/114063 K 18 linux-oracle-jdk18 V 27 dir 5-349819.0.r424329/1309 K 18 linux-oracle-jre18 V 27 dir h-349819.0.r424357/1147 K 5 mmake V 28 dir 4-47310.0.r415499/462929 K 4 mx4j V 29 dir 4-129424.0.r415499/463574 K 8 netbeans V 28 dir 4-81986.0.r418767/654138 K 14 netbeans-devel V 26 dir 4-219841.0.r403622/605 K 13 netcomponents V 28 dir 4-69792.0.r428144/543307 K 7 netrexx V 28 dir 2-23409.0.r418767/654874 K 5 netty V 27 dir 4-282795.0.r425923/1021 K 8 openjdk6 V 28 dir 4-228859.0.r424546/34959 K 12 openjdk6-jre V 29 dir 6-305596.0.r394508/699219 K 8 openjdk7 V 27 dir 4-247074.0.r431605/2599 K 12 openjdk7-jre V 29 dir 6-391181.0.r394508/700517 K 8 openjdk8 V 27 dir 4-349468.0.r431607/4951 K 12 openjdk8-jre V 30 dir 6-352833.0.r372338/4007151 K 14 openjfx8-devel V 27 dir 4-411524.0.r430571/2050 K 10 phpeclipse V 25 dir 4-98065.0.r419591/612 K 8 proguard V 26 dir 4-79289.0.r424991/1078 K 7 sablevm V 28 dir 2-62726.0.r428150/692952 K 17 sablevm-classpath V 29 dir 8-203766.0.r428152/889673 K 10 servingxml V 29 dir 4-241724.0.r412347/302432 K 5 sigar V 29 dir 4-372561.0.r426566/802184 K 15 springframework V 26 dir 4-206072.0.r353983/812 K 17 springframework31 V 33 dir 4-206072.0-312420.r353982/874 K 10 sqlitejdbc V 29 dir 4-224297.0.r415499/466345 K 7 trove4j V 28 dir 4-77533.0.r415499/466985 K 7 veditor V 29 dir 4-179290.0.r412347/304535 K 8 visualvm V 27 dir 4-310996.0.r426108/3525 K 9 wildfly10 V 34 dir 4-380836.0-431140.r431140/2374 K 9 wildfly90 V 29 dir 4-380836.0.r424411/975446 K 7 xdoclet V 28 dir 4-76481.0.r412347/305228 END ENDREP id: 1-2798.0.r431607/11323 type: dir pred: 1-2798.0.r431605/8972 count: 4191 text: 431607 5130 6180 0 9c19f1585a3202fcee62fb3bac28876b cpath: /head/java copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 27 file 1-411777.0.r411777/210 K 10 .gitignore V 26 file 1-348322.0.r376072/79 K 7 CHANGES V 27 file 1-99373.0.r428889/3033 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r430107/51 K 4 GIDs V 28 file 1-168311.0.r431474/6174 K 8 Keywords V 27 dir 1-314142.0.r419368/1305 K 5 LEGAL V 24 file 1-748.0.r430182/333 K 5 MOVED V 26 file 1-69878.0.r431603/296 K 8 Makefile V 24 file 1-6.0.r424411/75633 K 2 Mk V 22 dir 1-5.0.r431551/7465 K 6 README V 25 file 1-2408.0.r340854/956 K 9 Templates V 24 dir 1-2932.0.r414724/906 K 5 Tools V 26 dir 3-15302.0.r430495/3344 K 4 UIDs V 28 file 4-168311.0.r431474/6456 K 8 UPDATING V 28 file 1-102685.0.r431022/5159 K 13 accessibility V 26 dir 1-42583.0.r431245/9116 K 6 arabic V 27 dir 1-38973.0.r430266/49752 K 9 archivers V 25 dir 1-242.0.r431574/13968 K 5 astro V 24 dir 1-301.0.r431595/7711 K 5 audio V 25 dir 1-148.0.r431540/56860 K 4 base V 26 dir 1-420954.0.r425903/598 K 10 benchmarks V 23 dir 1-62.0.r431396/4671 K 7 biology V 25 dir 1-9066.0.r431331/6279 K 3 cad V 24 dir 1-276.0.r431499/6478 K 7 chinese V 25 dir 1-3770.0.r431483/9580 K 5 comms V 24 dir 1-76.0.r431398/13452 K 10 converters V 25 dir 1-1561.0.r431259/9625 K 9 databases V 25 dir 1-771.0.r431597/58959 K 9 deskutils V 26 dir 1-2098.0.r431604/15785 K 5 devel V 25 dir 1-73.0.r431590/312417 K 3 dns V 26 dir 1-6145.0.r431592/12857 K 7 editors V 23 dir 4-6.0.r431602/14290 K 9 emulators V 25 dir 1-181.0.r431540/66364 K 7 finance V 26 dir 1-4110.0.r431149/14994 K 6 french V 28 dir 1-25673.0.r430266/144575 K 3 ftp V 26 dir 1-199.0.r431245/486350 K 5 games V 25 dir 1-104.0.r431599/58686 K 6 german V 26 dir 1-7451.0.r431483/12271 K 8 graphics V 24 dir 1-94.0.r431570/57085 K 6 hebrew V 28 dir 3-31142.0.r430266/148293 K 9 hungarian V 29 dir 1p-38973.0.r430266/149814 K 3 irc V 23 dir 1-42.0.r431456/7233 K 8 japanese V 25 dir 1-410.0.r431555/16635 K 4 java V 26 dir 1-2798.0.r431607/11323 K 6 korean V 27 dir 1-5873.0.r431402/541326 K 4 lang V 24 dir 1-15.0.r431591/19017 K 4 mail V 24 dir 1-57.0.r431581/41276 K 4 math V 25 dir 1-162.0.r431562/39015 K 4 misc V 24 dir 7-35.0.r431554/26645 K 10 multimedia V 25 dir d-333.0.r431470/24715 K 3 net V 24 dir 1-22.0.r431559/76312 K 6 net-im V 28 dir 15-11144.0.r431534/11650 K 8 net-mgmt V 26 dir r-1011.0.r431600/21522 K 7 net-p2p V 26 dir g-29106.0.r431425/6905 K 4 news V 24 dir 1-145.0.r431180/5662 K 4 palm V 25 dir 1-6646.0.r429773/2377 K 6 polish V 29 dir tv-38973.0.r430516/159078 K 10 ports-mgmt V 27 dir 1-5132.0.r430947/863150 K 10 portuguese V 28 dir 1-17842.0.r430266/173421 K 5 print V 24 dir 1-79.0.r431589/14749 K 7 russian V 26 dir 1-1559.0.r431483/32174 K 7 science V 26 dir n-5356.0.r431596/10860 K 8 security V 25 dir 1-269.0.r431579/63868 K 6 shells V 24 dir w-6.0.r431043/359277 K 8 sysutils V 25 dir b-339.0.r431601/65739 K 8 textproc V 25 dir 1-322.0.r431603/94870 K 9 ukrainian V 28 dir g-39704.0.r430266/177981 K 10 vietnamese V 27 dir 1-4812.0.r430266/179790 K 3 www V 26 dir 1-114.0.r431588/141356 K 3 x11 V 24 dir 1-16.0.r431563/28203 K 10 x11-clocks V 27 dir 1-931.0.r428152/1730396 K 11 x11-drivers V 27 dir 1-157567.0.r431545/5479 K 6 x11-fm V 25 dir 1-691.0.r431551/93567 K 9 x11-fonts V 25 dir 1-543.0.r431430/11271 K 11 x11-servers V 25 dir 1n-710.0.r431462/1726 K 10 x11-themes V 29 dir 1-14410.0.r431245/1044691 K 12 x11-toolkits V 25 dir 1-120.0.r431606/17055 K 6 x11-wm V 23 dir 1-40.0.r431365/7377 END ENDREP id: 2-1.0.r431607/15011 type: dir pred: 2-1.0.r431606/20750 count: 427638 text: 431607 11491 3507 0 c981b1bc95d2ff1344f5475e261259c5 props: 7322 2587 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r431598/73863 K 4 head V 23 dir 2-1.0.r431607/15011 K 8 projects V 30 dir 0-377393.0.r378744/3577692 K 8 svnadmin V 22 dir 3-1.0.r431188/2864 K 4 tags V 22 dir 8-1.0.r430249/5125 END ENDREP id: 0.0.r431607/15451 type: dir pred: 0.0.r431606/21190 count: 431607 text: 431607 15227 211 0 8da6ecbd419c57c75799bc2bf0a2883b props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 36 5-349468.0.t431606-9913 modify-file true false /head/java/openjdk8/Makefile _5.0.t431606-9913 add-file true true /head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp _8.0.t431606-9913 add-file true true /head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp 15451 15675