*** old/src/share/vm/ci/ciField.hpp	Fri Sep  2 15:17:51 2011
--- new/src/share/vm/ci/ciField.hpp	Fri Sep  2 15:17:50 2011

*** 174,184 ****
--- 174,187 ----
    bool is_final       () { return flags().is_final(); }
    bool is_volatile    () { return flags().is_volatile(); }
    bool is_transient   () { return flags().is_transient(); }
  
    bool is_call_site_target() {
!     return (holder()->is_subclass_of(CURRENT_ENV->CallSite_klass()) && (name() == ciSymbol::target_name()));
!     ciInstanceKlass* callsite_klass = CURRENT_ENV->CallSite_klass();
+     if (callsite_klass == NULL)
+       return false;
+     return (holder()->is_subclass_of(callsite_klass) && (name() == ciSymbol::target_name()));
    }
  
    // Debugging output
    void print();
    void print_name_on(outputStream* st);