# HG changeset patch
# User shade
# Date 1571844932 -7200
# Node ID 4242e35767b52736016915a553802844b98d1b8d
# Parent  2b13d126a2d8040f5b030c9b8d26a67bb5576a93
8232882: GCC 4.8.5 build failure after JDK-8211073
Reviewed-by: thartmann

diff -r 2b13d126a2d8 -r 4242e35767b5 src/hotspot/share/opto/memnode.cpp
--- a/src/hotspot/share/opto/memnode.cpp	Wed Oct 23 15:54:39 2019 +0100
+++ b/src/hotspot/share/opto/memnode.cpp	Wed Oct 23 17:35:32 2019 +0200
@@ -736,9 +736,7 @@
 // Also, asserts a cross-check of the type against the expected address type.
 const TypePtr* MemNode::calculate_adr_type(const Type* t, const TypePtr* cross_check) {
   if (t == Type::TOP)  return NULL; // does not touch memory any more?
-  #ifdef PRODUCT
-  cross_check = NULL;
-  #else
+  #ifdef ASSERT
   if (!VerifyAliases || VMError::is_error_reported() || Node::in_dump())  cross_check = NULL;
   #endif
   const TypePtr* tp = t->isa_ptr();