Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/memnode.cpp	Wed May 01 20:25:31 2019 -0700
     1.2 +++ b/src/share/vm/opto/memnode.cpp	Mon Aug 19 17:36:36 2019 +0200
     1.3 @@ -1359,6 +1359,14 @@
     1.4          Node* in = mem->in(i);
     1.5          Node*  m = optimize_memory_chain(in, t_oop, this, phase);
     1.6          if (m == mem) {
     1.7 +          if (i == 1) {
     1.8 +            // if the first edge was a loop, check second edge too.
     1.9 +            // If both are replaceable - we are in an infinite loop
    1.10 +            Node *n = optimize_memory_chain(mem->in(2), t_oop, this, phase);
    1.11 +            if (n == mem) {
    1.12 +              break;
    1.13 +            }
    1.14 +          }
    1.15            set_req(Memory, mem->in(cnt - i));
    1.16            return this; // made change
    1.17          }