Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/callGenerator.cpp	Wed Feb 19 20:12:43 2014 -0800
     1.2 +++ b/src/share/vm/opto/callGenerator.cpp	Tue Feb 25 15:11:18 2014 -0800
     1.3 @@ -722,7 +722,7 @@
     1.4      Node* m = kit.map()->in(i);
     1.5      Node* n = slow_map->in(i);
     1.6      if (m != n) {
     1.7 -      const Type* t = gvn.type(m)->meet(gvn.type(n));
     1.8 +      const Type* t = gvn.type(m)->meet_speculative(gvn.type(n));
     1.9        Node* phi = PhiNode::make(region, m, t);
    1.10        phi->set_req(2, n);
    1.11        kit.map()->set_req(i, gvn.transform(phi));
    1.12 @@ -975,7 +975,7 @@
    1.13      Node* m = kit.map()->in(i);
    1.14      Node* n = slow_map->in(i);
    1.15      if (m != n) {
    1.16 -      const Type* t = gvn.type(m)->meet(gvn.type(n));
    1.17 +      const Type* t = gvn.type(m)->meet_speculative(gvn.type(n));
    1.18        Node* phi = PhiNode::make(region, m, t);
    1.19        phi->set_req(2, n);
    1.20        kit.map()->set_req(i, gvn.transform(phi));