Mercurial > hg > icedtea8-forest > hotspot

changeset 10592:127e100fb80e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8233023: assert(Opcode() == mem->Opcode() || phase->C->get_alias_index(adr_type()) == Compile::AliasIdxRaw) failed: no mismatched stores, except on raw memory Summary: Include missing verification code from JDK-8140309 backport Reviewed-by: phh, roland
author sgehwolf
date Tue, 29 Oct 2019 16:02:21 +0100
parents 944634dd98a4
children acd345f4f9e5
files src/share/vm/opto/memnode.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/memnode.cpp	Mon Jan 06 21:22:25 2020 +0900
+++ b/src/share/vm/opto/memnode.cpp	Tue Oct 29 16:02:21 2019 +0100
@@ -2485,7 +2485,8 @@
     assert(mem != mem->in(MemNode::Memory), "dead loop in StoreNode::Ideal");
 
     assert(Opcode() == mem->Opcode() ||
-           phase->C->get_alias_index(adr_type()) == Compile::AliasIdxRaw,
+           phase->C->get_alias_index(adr_type()) == Compile::AliasIdxRaw ||
+           (is_mismatched_access() || mem->as_Store()->is_mismatched_access()),
            "no mismatched stores, except on raw memory");
 
     if (mem->outcnt() == 1 &&           // check for intervening uses