/hg/release/icedtea7-forest-2.6/hotspot: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 26 13:47:41 UTC 2017
changeset bd1d424856fd in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=bd1d424856fd
author: adlertz
date: Wed Apr 19 05:28:25 2017 +0100
8022284, PR3209: Hide internal data structure in PhaseCFG
Summary: Hide private node to block mapping using public interface
Reviewed-by: kvn, roland
changeset e5a59e0c9b73 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=e5a59e0c9b73
author: adlertz
date: Mon Apr 24 16:49:33 2017 +0100
8023003, PR3209: Cleanup the public interface to PhaseCFG
Summary: public methods that don't need to be public should be private.
Reviewed-by: kvn, twisti
changeset 9ae5784c5f54 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=9ae5784c5f54
author: neliasso
date: Mon Apr 24 19:28:39 2017 +0100
8011621, PR3209: live_ranges_in_separate_class.patch
Reviewed-by: kvn, roland
Contributed-by: niclas.adlertz at oracle.com
changeset 795834c7b57e in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=795834c7b57e
author: adlertz
date: Tue Apr 25 14:28:17 2017 +0100
8023691, PR3209: Create interface for nodes in class Block
Summary: Create public methods for accessing the nodes in a block
Reviewed-by: kvn, roland
changeset 8c8106345204 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=8c8106345204
author: adlertz
date: Sun Sep 01 19:21:05 2013 +0200
8023988, PR3209: Move local scheduling of nodes to the CFG creation and code motion phase (PhaseCFG)
Summary: Moved local scheduling code from class Block to class PhaseCFG
Reviewed-by: kvn, roland
changeset d16be58026a2 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=d16be58026a2
author: aph
date: Thu Jun 23 17:58:59 2016 +0000
8157306, PR3209: Random infrequent null pointer exceptions in javac
Reviewed-by: kvn
changeset 7778c37392e6 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=7778c37392e6
author: ysuenaga
date: Wed Apr 26 02:45:41 2017 +0100
8173941, PR3330: SA does not work if executable is DSO
Reviewed-by: aph, dsamersoff
changeset 65a402d7b169 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=65a402d7b169
author: adinn
date: Tue Mar 28 06:12:49 2017 -0400
8177661, PR3367: Correct ad rule output register types from iRegX to iRegXNoSp
Backport to jdk8 of JDK9 fix for JDK-8177661
changeset ada095ab78a9 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=ada095ab78a9
author: martin
date: Wed Apr 26 04:56:01 2017 +0100
8043780, PR3369: Use open(O_CLOEXEC) instead of fcntl(FD_CLOEXEC)
Summary: Use open(O_CLOEXEC) where available; fall back to FD_CLOEXEC when necessary
Reviewed-by: rasbold, dholmes
changeset ee8e49397ad7 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=ee8e49397ad7
author: andrew
date: Wed Apr 26 14:56:01 2017 +0100
Added tag icedtea-2.6.10pre01 for changeset ada095ab78a9
diffstat:
.hgtags | 1 +
agent/src/os/linux/elfmacros.h | 2 +
agent/src/os/linux/ps_core.c | 25 +-
agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java | 2 +-
make/bsd/makefiles/vm.make | 2 +-
make/linux/makefiles/vm.make | 2 +-
make/solaris/makefiles/vm.make | 2 +-
make/windows/create_obj_files.sh | 2 +-
src/cpu/aarch64/vm/aarch64.ad | 6 +-
src/os/bsd/vm/chaitin_bsd.cpp | 42 -
src/os/linux/vm/chaitin_linux.cpp | 42 -
src/os/linux/vm/os_linux.cpp | 69 +-
src/os/solaris/vm/chaitin_solaris.cpp | 46 -
src/os/windows/vm/chaitin_windows.cpp | 78 -
src/share/vm/adlc/output_c.cpp | 2 +-
src/share/vm/opto/block.cpp | 506 ++++-----
src/share/vm/opto/block.hpp | 345 +++++--
src/share/vm/opto/buildOopMap.cpp | 80 +-
src/share/vm/opto/chaitin.cpp | 629 ++++++++----
src/share/vm/opto/chaitin.hpp | 174 ++-
src/share/vm/opto/coalesce.cpp | 431 ++-----
src/share/vm/opto/coalesce.hpp | 14 +-
src/share/vm/opto/compile.cpp | 100 +-
src/share/vm/opto/domgraph.cpp | 73 +-
src/share/vm/opto/gcm.cpp | 437 ++++----
src/share/vm/opto/idealGraphPrinter.cpp | 32 +-
src/share/vm/opto/ifg.cpp | 256 ++--
src/share/vm/opto/lcm.cpp | 307 +++---
src/share/vm/opto/live.cpp | 115 +-
src/share/vm/opto/live.hpp | 4 +-
src/share/vm/opto/matcher.cpp | 22 +-
src/share/vm/opto/matcher.hpp | 26 +-
src/share/vm/opto/node.hpp | 1 -
src/share/vm/opto/output.cpp | 361 +++---
src/share/vm/opto/output.hpp | 3 -
src/share/vm/opto/phaseX.cpp | 16 +-
src/share/vm/opto/postaloc.cpp | 160 +-
src/share/vm/opto/reg_split.cpp | 239 ++--
src/share/vm/opto/regalloc.hpp | 11 +-
src/share/vm/runtime/vmStructs.cpp | 7 +-
40 files changed, 2371 insertions(+), 2301 deletions(-)
diffs (truncated from 10194 to 500 lines):
diff -r b52d012bb1d4 -r ee8e49397ad7 .hgtags
--- a/.hgtags Mon Feb 13 17:08:57 2017 +0000
+++ b/.hgtags Wed Apr 26 14:56:01 2017 +0100
@@ -901,3 +901,4 @@
1d30f5a7723eeeb8092eed80d305fe6cdf530b1f icedtea-2.6.9pre01
95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
9fc0d63c2a741ad9567580ead69b9cbf220f968f icedtea-2.6.9
+ada095ab78a923f10b40935d6e3fa1a42dc2358a icedtea-2.6.10pre01
diff -r b52d012bb1d4 -r ee8e49397ad7 agent/src/os/linux/elfmacros.h
--- a/agent/src/os/linux/elfmacros.h Mon Feb 13 17:08:57 2017 +0000
+++ b/agent/src/os/linux/elfmacros.h Wed Apr 26 14:56:01 2017 +0100
@@ -33,6 +33,7 @@
#define ELF_NHDR Elf64_Nhdr
#define ELF_DYN Elf64_Dyn
#define ELF_ADDR Elf64_Addr
+#define ELF_AUXV Elf64_auxv_t
#define ELF_ST_TYPE ELF64_ST_TYPE
@@ -45,6 +46,7 @@
#define ELF_NHDR Elf32_Nhdr
#define ELF_DYN Elf32_Dyn
#define ELF_ADDR Elf32_Addr
+#define ELF_AUXV Elf32_auxv_t
#define ELF_ST_TYPE ELF32_ST_TYPE
diff -r b52d012bb1d4 -r ee8e49397ad7 agent/src/os/linux/ps_core.c
--- a/agent/src/os/linux/ps_core.c Mon Feb 13 17:08:57 2017 +0000
+++ b/agent/src/os/linux/ps_core.c Wed Apr 26 14:56:01 2017 +0100
@@ -629,6 +629,18 @@
if (notep->n_type == NT_PRSTATUS) {
if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true)
return false;
+ } else if (notep->n_type == NT_AUXV) {
+ // Get first segment from entry point
+ ELF_AUXV *auxv = (ELF_AUXV *)descdata;
+ while (auxv->a_type != AT_NULL) {
+ if (auxv->a_type == AT_ENTRY) {
+ // Set entry point address to address of dynamic section.
+ // We will adjust it in read_exec_segments().
+ ph->core->dynamic_addr = auxv->a_un.a_val;
+ break;
+ }
+ auxv++;
+ }
}
p = descdata + ROUNDUP(notep->n_descsz, 4);
}
@@ -811,7 +823,13 @@
// from PT_DYNAMIC we want to read address of first link_map addr
case PT_DYNAMIC: {
- ph->core->dynamic_addr = exec_php->p_vaddr;
+ if (exec_ehdr->e_type == ET_EXEC) {
+ ph->core->dynamic_addr = exec_php->p_vaddr;
+ } else { // ET_DYN
+ // dynamic_addr has entry point of executable.
+ // Thus we should substract it.
+ ph->core->dynamic_addr += exec_php->p_vaddr - exec_ehdr->e_entry;
+ }
print_debug("address of _DYNAMIC is 0x%lx\n", ph->core->dynamic_addr);
break;
}
@@ -1007,8 +1025,9 @@
goto err;
}
- if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || exec_ehdr.e_type != ET_EXEC) {
- print_debug("executable file is not a valid ELF ET_EXEC file\n");
+ if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true ||
+ ((exec_ehdr.e_type != ET_EXEC) && (exec_ehdr.e_type != ET_DYN))) {
+ print_debug("executable file is not a valid ELF file\n");
goto err;
}
diff -r b52d012bb1d4 -r ee8e49397ad7 agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java
--- a/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java Mon Feb 13 17:08:57 2017 +0000
+++ b/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java Wed Apr 26 14:56:01 2017 +0100
@@ -44,7 +44,7 @@
Type type = db.lookupType("PhaseCFG");
numBlocksField = new CIntField(type.getCIntegerField("_num_blocks"), 0);
blocksField = type.getAddressField("_blocks");
- bbsField = type.getAddressField("_bbs");
+ bbsField = type.getAddressField("_node_to_block_mapping");
brootField = type.getAddressField("_broot");
}
diff -r b52d012bb1d4 -r ee8e49397ad7 make/bsd/makefiles/vm.make
--- a/make/bsd/makefiles/vm.make Mon Feb 13 17:08:57 2017 +0000
+++ b/make/bsd/makefiles/vm.make Wed Apr 26 14:56:01 2017 +0100
@@ -187,7 +187,7 @@
Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
Src_Dirs := $(Src_Dirs/$(TYPE))
-COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
COMPILER1_SPECIFIC_FILES := c1_\*
SHARK_SPECIFIC_FILES := shark
ZERO_SPECIFIC_FILES := zero
diff -r b52d012bb1d4 -r ee8e49397ad7 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make Mon Feb 13 17:08:57 2017 +0000
+++ b/make/linux/makefiles/vm.make Wed Apr 26 14:56:01 2017 +0100
@@ -208,7 +208,7 @@
Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
Src_Dirs := $(Src_Dirs/$(TYPE))
-COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
COMPILER1_SPECIFIC_FILES := c1_\*
SHARK_SPECIFIC_FILES := shark
ZERO_SPECIFIC_FILES := zero
diff -r b52d012bb1d4 -r ee8e49397ad7 make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make Mon Feb 13 17:08:57 2017 +0000
+++ b/make/solaris/makefiles/vm.make Wed Apr 26 14:56:01 2017 +0100
@@ -214,7 +214,7 @@
Src_Dirs/SHARK := $(CORE_PATHS)
Src_Dirs := $(Src_Dirs/$(TYPE))
-COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
COMPILER1_SPECIFIC_FILES := c1_\*
SHARK_SPECIFIC_FILES := shark
ZERO_SPECIFIC_FILES := zero
diff -r b52d012bb1d4 -r ee8e49397ad7 make/windows/create_obj_files.sh
--- a/make/windows/create_obj_files.sh Mon Feb 13 17:08:57 2017 +0000
+++ b/make/windows/create_obj_files.sh Wed Apr 26 14:56:01 2017 +0100
@@ -112,7 +112,7 @@
"shark") Src_Dirs="${CORE_PATHS}" ;;
esac
-COMPILER2_SPECIFIC_FILES="opto libadt bcEscapeAnalyzer.cpp chaitin* c2_* runtime_*"
+COMPILER2_SPECIFIC_FILES="opto libadt bcEscapeAnalyzer.cpp c2_* runtime_*"
COMPILER1_SPECIFIC_FILES="c1_*"
SHARK_SPECIFIC_FILES="shark"
ZERO_SPECIFIC_FILES="zero"
diff -r b52d012bb1d4 -r ee8e49397ad7 src/cpu/aarch64/vm/aarch64.ad
--- a/src/cpu/aarch64/vm/aarch64.ad Mon Feb 13 17:08:57 2017 +0000
+++ b/src/cpu/aarch64/vm/aarch64.ad Wed Apr 26 14:56:01 2017 +0100
@@ -11404,7 +11404,7 @@
%}
instruct string_indexof(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2, iRegI_R2 cnt2,
- iRegI_R0 result, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+ iRegI_R0 result, iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
%{
match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
@@ -11422,8 +11422,8 @@
%}
instruct string_indexof_con(iRegP_R1 str1, iRegI_R4 cnt1, iRegP_R3 str2,
- immI_le_4 int_cnt2, iRegI_R0 result, iRegI tmp1, iRegI tmp2,
- iRegI tmp3, iRegI tmp4, rFlagsReg cr)
+ immI_le_4 int_cnt2, iRegI_R0 result, iRegINoSp tmp1, iRegINoSp tmp2,
+ iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
%{
match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1,
diff -r b52d012bb1d4 -r ee8e49397ad7 src/os/bsd/vm/chaitin_bsd.cpp
--- a/src/os/bsd/vm/chaitin_bsd.cpp Mon Feb 13 17:08:57 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-void PhaseRegAlloc::pd_preallocate_hook() {
- // no action
-}
-
-#ifdef ASSERT
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
- // no action
-}
-#endif
-
-
-// Reconciliation History
-// chaitin_solaris.cpp 1.7 99/07/12 23:54:22
-// End
diff -r b52d012bb1d4 -r ee8e49397ad7 src/os/linux/vm/chaitin_linux.cpp
--- a/src/os/linux/vm/chaitin_linux.cpp Mon Feb 13 17:08:57 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-void PhaseRegAlloc::pd_preallocate_hook() {
- // no action
-}
-
-#ifdef ASSERT
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
- // no action
-}
-#endif
-
-
-// Reconciliation History
-// chaitin_solaris.cpp 1.7 99/07/12 23:54:22
-// End
diff -r b52d012bb1d4 -r ee8e49397ad7 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp Mon Feb 13 17:08:57 2017 +0000
+++ b/src/os/linux/vm/os_linux.cpp Wed Apr 26 14:56:01 2017 +0100
@@ -5331,33 +5331,11 @@
errno = ENAMETOOLONG;
return -1;
}
- int fd;
int o_delete = (oflag & O_DELETE);
oflag = oflag & ~O_DELETE;
- fd = ::open64(path, oflag, mode);
- if (fd == -1) return -1;
-
- //If the open succeeded, the file might still be a directory
- {
- struct stat64 buf64;
- int ret = ::fstat64(fd, &buf64);
- int st_mode = buf64.st_mode;
-
- if (ret != -1) {
- if ((st_mode & S_IFMT) == S_IFDIR) {
- errno = EISDIR;
- ::close(fd);
- return -1;
- }
- } else {
- ::close(fd);
- return -1;
- }
- }
-
/*
- * All file descriptors that are opened in the JVM and not
+ * All file descriptors that are opened in the Java process and not
* specifically destined for a subprocess should have the
* close-on-exec flag set. If we don't set it, then careless 3rd
* party native code might fork and exec without closing all
@@ -5378,12 +5356,49 @@
* 4843136: (process) pipe file descriptor from Runtime.exec not being closed
* 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9
*/
+ // Modern Linux kernels (after 2.6.23 2007) support O_CLOEXEC with open().
+ // O_CLOEXEC is preferable to using FD_CLOEXEC on an open file descriptor
+ // because it saves a system call and removes a small window where the flag
+ // is unset. On ancient Linux kernels the O_CLOEXEC flag will be ignored
+ // and we fall back to using FD_CLOEXEC (see below).
+#ifdef O_CLOEXEC
+ oflag |= O_CLOEXEC;
+#endif
+
+ int fd = ::open64(path, oflag, mode);
+ if (fd == -1) return -1;
+
+ //If the open succeeded, the file might still be a directory
+ {
+ struct stat64 buf64;
+ int ret = ::fstat64(fd, &buf64);
+ int st_mode = buf64.st_mode;
+
+ if (ret != -1) {
+ if ((st_mode & S_IFMT) == S_IFDIR) {
+ errno = EISDIR;
+ ::close(fd);
+ return -1;
+ }
+ } else {
+ ::close(fd);
+ return -1;
+ }
+ }
+
#ifdef FD_CLOEXEC
- {
- int flags = ::fcntl(fd, F_GETFD);
- if (flags != -1)
- ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+ // Validate that the use of the O_CLOEXEC flag on open above worked.
+ // With recent kernels, we will perform this check exactly once.
+ static sig_atomic_t O_CLOEXEC_is_known_to_work = 0;
+ if (!O_CLOEXEC_is_known_to_work) {
+ int flags = ::fcntl(fd, F_GETFD);
+ if (flags != -1) {
+ if ((flags & FD_CLOEXEC) != 0)
+ O_CLOEXEC_is_known_to_work = 1;
+ else
+ ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
}
+ }
#endif
if (o_delete != 0) {
diff -r b52d012bb1d4 -r ee8e49397ad7 src/os/solaris/vm/chaitin_solaris.cpp
--- a/src/os/solaris/vm/chaitin_solaris.cpp Mon Feb 13 17:08:57 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-void PhaseRegAlloc::pd_preallocate_hook() {
- // no action
-}
-
-#ifdef ASSERT
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
- // no action
-}
-#endif
-
-
-//Reconciliation History
-// 1.1 99/02/12 15:35:26 chaitin_win32.cpp
-// 1.2 99/02/18 15:38:56 chaitin_win32.cpp
-// 1.4 99/03/09 10:37:48 chaitin_win32.cpp
-// 1.6 99/03/25 11:07:44 chaitin_win32.cpp
-// 1.8 99/06/22 16:38:58 chaitin_win32.cpp
-//End
diff -r b52d012bb1d4 -r ee8e49397ad7 src/os/windows/vm/chaitin_windows.cpp
--- a/src/os/windows/vm/chaitin_windows.cpp Mon Feb 13 17:08:57 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-// Disallow the use of the frame pointer (EBP) for implicit null exceptions
-// on win95/98. If we do not do this, the OS gets confused and gives a stack
-// error.
-void PhaseRegAlloc::pd_preallocate_hook() {
-#ifndef _WIN64
- if (ImplicitNullChecks && !os::win32::is_nt()) {
- for (uint block_num=1; block_num<_cfg._num_blocks; block_num++) {
- Block *block = _cfg._blocks[block_num];
-
- Node *block_end = block->end();
- if (block_end->is_MachNullCheck() &&
- block_end->as_Mach()->ideal_Opcode() != Op_Con) {
- // The last instruction in the block is an implicit null check.
- // Fix its input so that it does not load into the frame pointer.
- _matcher.pd_implicit_null_fixup(block_end->in(1)->as_Mach(),
- block_end->as_MachNullCheck()->_vidx);
- }
- }
- }
-#else
- // WIN64==itanium on XP
-#endif
-}
-
-#ifdef ASSERT
-// Verify that no implicit null check uses the frame pointer (EBP) as
-// its register on win95/98. Use of the frame pointer in an implicit
-// null check confuses the OS, yielding a stack error.
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
-#ifndef _WIN64
- if (ImplicitNullChecks && !os::win32::is_nt()) {
- for (uint block_num=1; block_num<_cfg._num_blocks; block_num++) {
- Block *block = _cfg._blocks[block_num];
-
- Node *block_end = block->_nodes[block->_nodes.size()-1];
- if (block_end->is_MachNullCheck() && block_end->as_Mach()->ideal_Opcode() != Op_Con) {
- // The last instruction in the block is an implicit
- // null check. Verify that this instruction does not
- // use the frame pointer.
- int reg = get_reg_first(block_end->in(1)->in(block_end->as_MachNullCheck()->_vidx));
- assert(reg != EBP_num,
- "implicit null check using frame pointer on win95/98");
- }
- }
- }
-#else
- // WIN64==itanium on XP
-#endif
-}
-#endif
diff -r b52d012bb1d4 -r ee8e49397ad7 src/share/vm/adlc/output_c.cpp
--- a/src/share/vm/adlc/output_c.cpp Mon Feb 13 17:08:57 2017 +0000
+++ b/src/share/vm/adlc/output_c.cpp Wed Apr 26 14:56:01 2017 +0100
@@ -1095,7 +1095,7 @@
fprintf(fp, " // Identify previous instruction if inside this block\n");
fprintf(fp, " if( ");
print_block_index(fp, inst_position);
- fprintf(fp, " > 0 ) {\n Node *n = block->_nodes.at(");
+ fprintf(fp, " > 0 ) {\n Node *n = block->get_node(");
print_block_index(fp, inst_position);
fprintf(fp, ");\n inst%d = (n->is_Mach()) ? ", inst_position);
fprintf(fp, "n->as_Mach() : NULL;\n }\n");
diff -r b52d012bb1d4 -r ee8e49397ad7 src/share/vm/opto/block.cpp
--- a/src/share/vm/opto/block.cpp Mon Feb 13 17:08:57 2017 +0000
+++ b/src/share/vm/opto/block.cpp Wed Apr 26 14:56:01 2017 +0100
@@ -35,10 +35,6 @@
#include "opto/rootnode.hpp"
#include "utilities/copy.hpp"
-// Optimization - Graph Style
-
-
-//-----------------------------------------------------------------------------
void Block_Array::grow( uint i ) {
assert(i >= Max(), "must be an overflow");
More information about the distro-pkg-dev
mailing list