Mercurial > hg > icedtea7
changeset 2897:3e24116d0925 icedtea-2.7.0pre08
Backout S8157306, PR3209: Random infrequent null pointer exceptions in javac
2016-10-27 Andrew John Hughes <gnu.andrew@member.fsf.org>
S8157306, PR3209: Random infrequent null pointer
exceptions in javac
* Makefile.am:
(ICEDTEA_PATCHES): Add backout patch for PR3209.
* NEWS: Remove PR3209.
* patches/pr3209-backout.patch:
Backout PR3209 as it won't work without 8023988.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 27 Oct 2016 18:28:42 +0100 |
| parents | 18f2aec9b670 |
| children | 7960746077db |
| files | ChangeLog Makefile.am NEWS patches/pr3209-backout.patch |
| diffstat | 4 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 27 07:01:33 2016 +0100 +++ b/ChangeLog Thu Oct 27 18:28:42 2016 +0100 @@ -1,3 +1,13 @@ +2016-10-27 Andrew John Hughes <gnu.andrew@member.fsf.org> + + S8157306, PR3209: Random infrequent null pointer + exceptions in javac + * Makefile.am: + (ICEDTEA_PATCHES): Add backout patch for PR3209. + * NEWS: Remove PR3209. + * patches/pr3209-backout.patch: + Backout PR3209 as it won't work without 8023988. + 2016-10-26 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3211: AArch64 build fails with pre-compiled
--- a/Makefile.am Thu Oct 27 07:01:33 2016 +0100 +++ b/Makefile.am Thu Oct 27 18:28:42 2016 +0100 @@ -371,7 +371,7 @@ # Patch list -ICEDTEA_PATCHES = patches/pr3211.patch +ICEDTEA_PATCHES = patches/pr3211.patch patches/pr3209-backout.patch # Conditional patches
--- a/NEWS Thu Oct 27 07:01:33 2016 +0100 +++ b/NEWS Thu Oct 27 18:28:42 2016 +0100 @@ -60,7 +60,6 @@ - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466 - PR3166: invalid zip timestamp handling leads to error building bootstrap-javac * AArch64 port - - S8157306, PR3209: Random infrequent null pointer exceptions in javac - S8167200: AArch64: Broken stack pointer adjustment in interpreter - PR3211: AArch64 build fails with pre-compiled headers disabled
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pr3209-backout.patch Thu Oct 27 18:28:42 2016 +0100 @@ -0,0 +1,28 @@ +# HG changeset patch +# User andrew +# Date 1477589125 -3600 +# Thu Oct 27 18:25:25 2016 +0100 +# Node ID fff29c78ee406a290e5b79dc14a1b1a98de1d0f4 +# Parent f23cc792224c21431b71da6a31ab751ac6f5c236 +PR3209: Backed out changeset 3cc3ab869ccf + +diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp +--- openjdk/hotspot/src/share/vm/opto/lcm.cpp ++++ openjdk/hotspot/src/share/vm/opto/lcm.cpp +@@ -1068,14 +1068,11 @@ + Block *sb = _succs[i]; + // Clone the entire area; ignoring the edge fixup for now. + for( uint j = end; j > beg; j-- ) { ++ // It is safe here to clone a node with anti_dependence ++ // since clones dominate on each path. + Node *clone = _nodes[j-1]->clone(); + sb->_nodes.insert( 1, clone ); + bbs.map(clone->_idx,sb); +-#ifdef AARCH64 +- if (clone->needs_anti_dependence_check()) { +- insert_anti_dependences(sb, clone); +- } +-#endif + } + } +