Merge jdk8u11-b04

Mon, 14 Apr 2014 09:10:16 -0700

author
asaha
date
Mon, 14 Apr 2014 09:10:16 -0700
changeset 6772
4c40343ecdb3
parent 6770
47f10bcd16b2
parent 6771
b5ae226b7516
child 6773
a4d44dfb7d30

Merge

     1.1 --- a/src/share/vm/classfile/verifier.cpp	Mon Apr 14 09:08:01 2014 -0700
     1.2 +++ b/src/share/vm/classfile/verifier.cpp	Mon Apr 14 09:10:16 2014 -0700
     1.3 @@ -2307,6 +2307,11 @@
     1.4        Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
     1.5          vmSymbols::object_initializer_name(),
     1.6          cp->signature_ref_at(bcs->get_index_u2()));
     1.7 +      if (m == NULL) {
     1.8 +        verify_error(ErrorContext::bad_code(bci),
     1.9 +            "Call to missing <init> method");
    1.10 +        return;
    1.11 +      }
    1.12        instanceKlassHandle mh(THREAD, m->method_holder());
    1.13        if (m->is_protected() && !mh->is_same_class_package(_klass())) {
    1.14          bool assignable = current_type().is_assignable_from(

mercurial