8224580: Matcher can cause oop field/array element to be reloaded
Reviewed-by: neliasso, rkennke, dlong
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 3218b58..475f74f 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -2066,6 +2066,12 @@
// Node is shared and has no reason to clone. Flag it as shared.
// This causes it to match into a register for the sharing.
set_shared(n); // Flag as shared and
+ if (n->is_DecodeNarrowPtr()) {
+ // Oop field/array element loads must be shared but since
+ // they are shared through a DecodeN they may appear to have
+ // a single use so force sharing here.
+ set_shared(n->in(1));
+ }
mstack.pop(); // remove node from stack
continue;
}
@@ -2098,13 +2104,6 @@
continue; // for(int i = ...)
}
- if( mop == Op_AddP && m->in(AddPNode::Base)->is_DecodeNarrowPtr()) {
- // Bases used in addresses must be shared but since
- // they are shared through a DecodeN they may appear
- // to have a single use so force sharing here.
- set_shared(m->in(AddPNode::Base)->in(1));
- }
-
// if 'n' and 'm' are part of a graph for BMI instruction, clone this node.
#ifdef X86
if (UseBMI1Instructions && is_bmi_pattern(n, m)) {
