Mercurial > hg > openjdk > bsd-port > hotspot

changeset 5723:022dc2063c86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8042052: assert(t != NULL) failed: must set before get Summary: Added missing call to _gvn.transform to make sure the type of the PhiNode is recorded in the gvn. Reviewed-by: anoll, kvn
author sgabdura
date Thu, 21 Aug 2014 15:49:55 +0200
parents 02f03ffc0337
children aa8698c3b6c1
files src/share/vm/opto/library_call.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/library_call.cpp	Thu Aug 21 11:13:37 2014 +0200
+++ b/src/share/vm/opto/library_call.cpp	Thu Aug 21 15:49:55 2014 +0200
@@ -1627,7 +1627,7 @@
       result_region->init_req(2, control());
       result_val->init_req(2, value);
       set_control(_gvn.transform(result_region));
-      return result_val;
+      return _gvn.transform(result_val);
     } else {
       return result;
     }
@@ -1822,7 +1822,7 @@
   // control from finish_pow_exp is now input to the region node
   region_node->set_req(2, control());
   // the result from finish_pow_exp is now input to the phi node
-  phi_node->init_req(2, _gvn.transform(result));
+  phi_node->init_req(2, result);
   set_control(_gvn.transform(region_node));
   record_for_igvn(region_node);
   set_result(_gvn.transform(phi_node));