--- 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();