commit dece7fbfecec624346be9d28bfe31dbffba6b0a8
author Vladimir Kozlov <kvn@openjdk.org> Sat Sep 03 14:03:54 2011 -0700
committer Vladimir Kozlov <kvn@openjdk.org> Sat Sep 03 14:03:54 2011 -0700
tree a183fc54fb2978468a5d07373f8c8522940ac99b
parent b13890a1995b1f1d65e181703216c1b3fa6a64d9

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

Add check that ciEnv::_CallSite_klass is initialized.

Reviewed-by: jrose

hotspot/src/share/vm/ci/ciField.hpp

diff --git a/hotspot/src/share/vm/ci/ciField.hpp b/hotspot/src/share/vm/ci/ciField.hpp
index 7114596..bd65abe 100644
--- a/hotspot/src/share/vm/ci/ciField.hpp
+++ b/hotspot/src/share/vm/ci/ciField.hpp
@@ -176,7 +176,10 @@
   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