8042052: assert(t != NULL) failed: must set before get

Mon, 05 May 2014 15:10:43 +0200

author
anoll
date
Mon, 05 May 2014 15:10:43 +0200
changeset 6666
a062c3691003
parent 6665
400709e275c1
child 6667
917873d2983d
child 6668
45e59fae8f2b
child 6674
2b8a9740813e

8042052: assert(t != NULL) failed: must set before get
Summary: Fixes a bug introduced by 8029302
Reviewed-by: kvn

src/share/vm/opto/library_call.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/opto/library_call.cpp	Fri Apr 25 12:48:34 2014 +0200
     1.2 +++ b/src/share/vm/opto/library_call.cpp	Mon May 05 15:10:43 2014 +0200
     1.3 @@ -1725,7 +1725,7 @@
     1.4        result_region->init_req(2, control());
     1.5        result_val->init_req(2, value);
     1.6        set_control(_gvn.transform(result_region));
     1.7 -      return result_val;
     1.8 +      return _gvn.transform(result_val);
     1.9      } else {
    1.10        return result;
    1.11      }
    1.12 @@ -1920,7 +1920,7 @@
    1.13    // control from finish_pow_exp is now input to the region node
    1.14    region_node->set_req(2, control());
    1.15    // the result from finish_pow_exp is now input to the phi node
    1.16 -  phi_node->init_req(2, _gvn.transform(result));
    1.17 +  phi_node->init_req(2, result);
    1.18    set_control(_gvn.transform(region_node));
    1.19    record_for_igvn(region_node);
    1.20    set_result(_gvn.transform(phi_node));

mercurial