From c900615c1bbf2e3550e72588bab9c8d6542ccf84 Mon Sep 17 00:00:00 2001 From: sgehwolf Date: Tue, 29 Oct 2019 16:02:21 +0100 Subject: [PATCH] 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 --- src/share/vm/opto/memnode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/share/vm/opto/memnode.cpp b/src/share/vm/opto/memnode.cpp index 590111a39..30bcd51e9 100644 --- a/src/share/vm/opto/memnode.cpp +++ b/src/share/vm/opto/memnode.cpp @@ -2485,7 +2485,8 @@ Node *StoreNode::Ideal(PhaseGVN *phase, bool can_reshape) { 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 -- GitLab