Mercurial > hg > truffle
diff src/share/vm/opto/callGenerator.cpp @ 14457:45467c53f178
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:28:17 -0800 |
parents | abec000618bf 5ec7dace41a6 |
children | 4ca6dc0799b6 968a17f18337 |
line wrap: on
line diff
--- a/src/share/vm/opto/callGenerator.cpp Tue Jan 28 12:25:34 2014 -0800 +++ b/src/share/vm/opto/callGenerator.cpp Tue Jan 28 12:28:17 2014 -0800 @@ -722,7 +722,7 @@ Node* m = kit.map()->in(i); Node* n = slow_map->in(i); if (m != n) { - const Type* t = gvn.type(m)->meet(gvn.type(n)); + const Type* t = gvn.type(m)->meet_speculative(gvn.type(n)); Node* phi = PhiNode::make(region, m, t); phi->set_req(2, n); kit.map()->set_req(i, gvn.transform(phi)); @@ -975,7 +975,7 @@ Node* m = kit.map()->in(i); Node* n = slow_map->in(i); if (m != n) { - const Type* t = gvn.type(m)->meet(gvn.type(n)); + const Type* t = gvn.type(m)->meet_speculative(gvn.type(n)); Node* phi = PhiNode::make(region, m, t); phi->set_req(2, n); kit.map()->set_req(i, gvn.transform(phi));