--- a/hotspot/src/share/vm/code/compiledIC.cpp Thu Oct 08 10:25:45 2015 +0000
+++ b/hotspot/src/share/vm/code/compiledIC.cpp Thu Oct 08 12:49:30 2015 -1000
@@ -280,11 +280,13 @@
bool is_monomorphic = (cb != NULL && cb->is_nmethod());
// Check that the cached_value is a klass for non-optimized monomorphic calls
// This assertion is invalid for compiler1: a call that does not look optimized (no static stub) can be used
- // for calling directly to vep without using the inline cache (i.e., cached_value == NULL)
+ // for calling directly to vep without using the inline cache (i.e., cached_value == NULL).
+ // For JVMCI this occurs because CHA is only used to improve inlining so call sites which could be optimized
+ // virtuals because there are no currently loaded subclasses of a type are left as virtual call sites.
#ifdef ASSERT
CodeBlob* caller = CodeCache::find_blob_unsafe(instruction_address());
- bool is_c1_method = caller->is_compiled_by_c1();
- assert( is_c1_method ||
+ bool is_c1_or_jvmci_method = caller->is_compiled_by_c1() || caller->is_compiled_by_jvmci();
+ assert( is_c1_or_jvmci_method ||
!is_monomorphic ||
is_optimized() ||
!caller->is_alive() ||