src/share/vm/opto/macro.cpp

rev 9081 : imported patch more.patch

*** 777,790 ****
    GrowableArray <SafePointNode *> safepoints_done;
  
    ciKlass* klass = NULL;
    ciInstanceKlass* iklass = NULL;
    int nfields = 0;
!   int array_base;
!   int element_size;
!   BasicType basic_elem_type;
!   ciType* elem_type;
  
    Node* res = alloc->result_cast();
    assert(res == NULL || res->is_CheckCastPP(), "unexpected AllocateNode result");
    const TypeOopPtr* res_type = NULL;
    if (res != NULL) { // Could be NULL when there are no users
--- 777,790 ----
    GrowableArray <SafePointNode *> safepoints_done;
  
    ciKlass* klass = NULL;
    ciInstanceKlass* iklass = NULL;
    int nfields = 0;
!   int array_base = 0;
!   int element_size = 0;
!   BasicType basic_elem_type = T_ILLEGAL;
!   ciType* elem_type = NULL;
  
    Node* res = alloc->result_cast();
    assert(res == NULL || res->is_CheckCastPP(), "unexpected AllocateNode result");
    const TypeOopPtr* res_type = NULL;
    if (res != NULL) { // Could be NULL when there are no users
*** 1303,1316 ****
  
    assert(ctrl != NULL, "must have control");
    // We need a Region and corresponding Phi's to merge the slow-path and fast-path results.
    // they will not be used if "always_slow" is set
    enum { slow_result_path = 1, fast_result_path = 2 };
!   Node *result_region;
!   Node *result_phi_rawmem;
!   Node *result_phi_rawoop;
!   Node *result_phi_i_o;
  
    // The initial slow comparison is a size check, the comparison
    // we want to do is a BoolTest::gt
    bool always_slow = false;
    int tv = _igvn.find_int_con(initial_slow_test, -1);
--- 1303,1316 ----
  
    assert(ctrl != NULL, "must have control");
    // We need a Region and corresponding Phi's to merge the slow-path and fast-path results.
    // they will not be used if "always_slow" is set
    enum { slow_result_path = 1, fast_result_path = 2 };
!   Node *result_region = NULL;
!   Node *result_phi_rawmem = NULL;
!   Node *result_phi_rawoop = NULL;
!   Node *result_phi_i_o = NULL;
  
    // The initial slow comparison is a size check, the comparison
    // we want to do is a BoolTest::gt
    bool always_slow = false;
    int tv = _igvn.find_int_con(initial_slow_test, -1);