Mercurial > hg > truffle

changeset 3907:7b5c767f229c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7086560: 7085404 changes broke VM with -XX:-EnableInvokeDynamic Summary: Add check that ciEnv::_CallSite_klass is initialized. Reviewed-by: jrose
author kvn
date Sat, 03 Sep 2011 14:03:54 -0700
parents 7ffacbb338d4
children 7588156f5cf9
files src/share/vm/ci/ciField.hpp
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/ci/ciField.hpp	Sat Sep 03 09:56:57 2011 -0700
+++ b/src/share/vm/ci/ciField.hpp	Sat Sep 03 14:03:54 2011 -0700
@@ -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