mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
. Fix compilation with Clang 4.0
PR: 216016 Submitted by: jbeich@
This commit is contained in:
parent
7839017c83
commit
1baf25b002
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=431607
3 changed files with 23 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= openjdk
|
||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
|
||||
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
|
||||
|
|
11
java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp
Normal file
11
java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- hotspot/src/share/vm/opto/lcm.cpp.orig
|
||||
+++ hotspot/src/share/vm/opto/lcm.cpp
|
||||
@@ -49,7 +49,7 @@
|
||||
// Check whether val is not-null-decoded compressed oop,
|
||||
// i.e. will grab into the base of the heap if it represents NULL.
|
||||
static bool accesses_heap_base_zone(Node *val) {
|
||||
- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
|
||||
+ if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
|
||||
if (val && val->is_Mach()) {
|
||||
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
|
||||
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that
|
|
@ -0,0 +1,11 @@
|
|||
--- 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);
|
||||
}
|
||||
|
Loading…
Add table
Reference in a new issue