Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/ci/ciMethodData.cpp	Tue Jul 25 15:30:54 2017 +0000
     1.2 +++ b/src/share/vm/ci/ciMethodData.cpp	Thu Mar 09 14:27:21 2017 +0100
     1.3 @@ -391,11 +391,13 @@
     1.4    MethodData* mdo = get_MethodData();
     1.5    if (mdo != NULL) {
     1.6      ProfileData* data = mdo->bci_to_data(bci);
     1.7 -    if (data->is_CallTypeData()) {
     1.8 -      data->as_CallTypeData()->set_argument_type(i, k->get_Klass());
     1.9 -    } else {
    1.10 -      assert(data->is_VirtualCallTypeData(), "no arguments!");
    1.11 -      data->as_VirtualCallTypeData()->set_argument_type(i, k->get_Klass());
    1.12 +    if (data != NULL) {
    1.13 +      if (data->is_CallTypeData()) {
    1.14 +        data->as_CallTypeData()->set_argument_type(i, k->get_Klass());
    1.15 +      } else {
    1.16 +        assert(data->is_VirtualCallTypeData(), "no arguments!");
    1.17 +        data->as_VirtualCallTypeData()->set_argument_type(i, k->get_Klass());
    1.18 +      }
    1.19      }
    1.20    }
    1.21  }
    1.22 @@ -413,11 +415,13 @@
    1.23    MethodData* mdo = get_MethodData();
    1.24    if (mdo != NULL) {
    1.25      ProfileData* data = mdo->bci_to_data(bci);
    1.26 -    if (data->is_CallTypeData()) {
    1.27 -      data->as_CallTypeData()->set_return_type(k->get_Klass());
    1.28 -    } else {
    1.29 -      assert(data->is_VirtualCallTypeData(), "no arguments!");
    1.30 -      data->as_VirtualCallTypeData()->set_return_type(k->get_Klass());
    1.31 +    if (data != NULL) {
    1.32 +      if (data->is_CallTypeData()) {
    1.33 +        data->as_CallTypeData()->set_return_type(k->get_Klass());
    1.34 +      } else {
    1.35 +        assert(data->is_VirtualCallTypeData(), "no arguments!");
    1.36 +        data->as_VirtualCallTypeData()->set_return_type(k->get_Klass());
    1.37 +      }
    1.38      }
    1.39    }
    1.40  }