Attachment #178865 for bug #216016

View | Details | Raw Unified | Return to bug 216016
Collapse All | Expand All

Lines 3-9 Link Here

(-)b/java/openjdk7/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= openjdk	4	PORTNAME= openjdk
5	PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}	5	PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= java devel	8	CATEGORIES= java devel
9	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \	9	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \




--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig
+++ hotspot/src/share/vm/runtime/virtualspace.cpp
@@ -524,7 +524,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);
   }
 
@@ -543,7 +543,7 @@ ReservedHeapSpace::ReservedHeapSpace(con
                 (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
                  Universe::narrow_oop_use_implicit_null_checks()) ?
                   lcm(os::vm_page_size(), prefix_align) : 0) {
-  if (base() > 0) {
+  if (base() != NULL) {
     MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
   }
 

Lines 2-8 Link Here

(-)b/java/openjdk8/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= openjdk	3	PORTNAME= openjdk
4	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}	4	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= java devel	6	CATEGORIES= java devel
7	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \	7	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
8	https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \	8	https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \

Added Link Here

(-)b/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp (+11 lines)
1	--- hotspot/src/share/vm/opto/lcm.cpp.orig
2	+++ hotspot/src/share/vm/opto/lcm.cpp
3	@@ -49,7 +49,7 @@
4	// Check whether val is not-null-decoded compressed oop,
5	// i.e. will grab into the base of the heap if it represents NULL.
6	static bool accesses_heap_base_zone(Node *val) {
7	- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
8	+ if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
9	if (val && val->is_Mach()) {
10	if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
11	// This assumes all Decodes with TypePtr::NotNull are matched to nodes that

Added Link Here

(-)b/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (+11 lines)
1	--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig
2	+++ hotspot/src/share/vm/runtime/virtualspace.cpp
3	@@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz
4	(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
5	Universe::narrow_oop_use_implicit_null_checks()) ?
6	lcm(os::vm_page_size(), alignment) : 0) {
7	- if (base() > 0) {
8	+ if (base() != NULL) {
9	MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
10	}
11

Return to bug 216016

Added Link Here

(-)b/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (+20 lines)
1	--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig
2	+++ hotspot/src/share/vm/runtime/virtualspace.cpp
3	@@ -524,7 +524,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz
4	(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
5	Universe::narrow_oop_use_implicit_null_checks()) ?
6	lcm(os::vm_page_size(), alignment) : 0) {
7	- if (base() > 0) {
8	+ if (base() != NULL) {
9	MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
10	}
11
12	@@ -543,7 +543,7 @@ ReservedHeapSpace::ReservedHeapSpace(con
13	(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
14	Universe::narrow_oop_use_implicit_null_checks()) ?
15	lcm(os::vm_page_size(), prefix_align) : 0) {
16	- if (base() > 0) {
17	+ if (base() != NULL) {
18	MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
19	}
20