jdk8-mips64-public/hotspot: changeset 3107:7b5c767f229c

7086560: 7085404 changes broke VM with -XX:-EnableInvokeDynamic
Summary: Add check that ciEnv::_CallSite_klass is initialized.
Reviewed-by: jrose

     1.1 --- a/src/share/vm/ci/ciField.hpp	Sat Sep 03 09:56:57 2011 -0700
     1.2 +++ b/src/share/vm/ci/ciField.hpp	Sat Sep 03 14:03:54 2011 -0700
     1.3 @@ -176,7 +176,10 @@
     1.4    bool is_transient   () { return flags().is_transient(); }
     1.5  
     1.6    bool is_call_site_target() {
     1.7 -    return (holder()->is_subclass_of(CURRENT_ENV->CallSite_klass()) && (name() == ciSymbol::target_name()));
     1.8 +    ciInstanceKlass* callsite_klass = CURRENT_ENV->CallSite_klass();
     1.9 +    if (callsite_klass == NULL)
    1.10 +      return false;
    1.11 +    return (holder()->is_subclass_of(callsite_klass) && (name() == ciSymbol::target_name()));
    1.12    }
    1.13  
    1.14    // Debugging output

Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

7086560: 7085404 changes broke VM with -XX:-EnableInvokeDynamic