OpenJDK / amber / amber
changeset 58529:4242e35767b5
8232882: GCC 4.8.5 build failure after JDK-8211073
Reviewed-by: thartmann
| author | shade |
|---|---|
| date | Wed, 23 Oct 2019 17:35:32 +0200 |
| parents | 2b13d126a2d8 |
| children | 1f7f707c1aa9 |
| files | src/hotspot/share/opto/memnode.cpp |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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();