src/cpu/ppc/vm/methodHandles_ppc.cpp

rev 8978 : imported patch remove_err_msg
rev 8979 : [mq]: vmerr_static

*** 58,68 ****
    __ ld(klass_reg, java_lang_Class::klass_offset_in_bytes(), klass_reg);
  }
  
  #ifdef ASSERT
  static int check_nonzero(const char* xname, int x) {
!   assert(x != 0, err_msg("%s should be nonzero", xname));
    return x;
  }
  #define NONZERO(x) check_nonzero(#x, x)
  #else //ASSERT
  #define NONZERO(x) (x)
--- 58,68 ----
    __ ld(klass_reg, java_lang_Class::klass_offset_in_bytes(), klass_reg);
  }
  
  #ifdef ASSERT
  static int check_nonzero(const char* xname, int x) {
!   assert(x != 0, "%s should be nonzero", xname);
    return x;
  }
  #define NONZERO(x) check_nonzero(#x, x)
  #else //ASSERT
  #define NONZERO(x) (x)
*** 432,442 ****
                                   L_incompatible_class_change_error);
        break;
      }
  
      default:
!       fatal(err_msg_res("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid)));
        break;
      }
  
      // Live at this point:
      //   R19_method
--- 432,442 ----
                                   L_incompatible_class_change_error);
        break;
      }
  
      default:
!       fatal("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid));
        break;
      }
  
      // Live at this point:
      //   R19_method