8162384: Performance regression: bimorphic inlining may be bypassed by type speculation

Summary: when speculation fails at a call fallback to profile data at the call site
Reviewed-by: kvn

src/share/vm/opto/doCall.cpp

@@ -205,6 +205,7 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
 
       int morphism = profile.morphism();
       if (speculative_receiver_type != NULL) {
+        if (!too_many_traps(caller, bci, Deoptimization::Reason_speculate_class_check)) {
           // We have a speculative type, we should be able to resolve
           // the call. We do that before looking at the profiling at
           // this invoke because it may lead to bimorphic inlining which
@@ -216,6 +217,11 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
           } else {
             morphism = 1;
           }
+        } else {
+          // speculation failed before. Use profiling at the call
+          // (could allow bimorphic inlining for instance).
+          speculative_receiver_type = NULL;
+        }
       }
       if (receiver_method == NULL &&
           (have_major_receiver || morphism == 1 ||
@@ -252,7 +258,7 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
                                     Deoptimization::Reason_bimorphic :
                                     (speculative_receiver_type == NULL ? Deoptimization::Reason_class_check : Deoptimization::Reason_speculate_class_check);
           if ((morphism == 1 || (morphism == 2 && next_hit_cg != NULL)) &&
-              !too_many_traps(jvms->method(), jvms->bci(), reason)
+              !too_many_traps(caller, bci, reason)
              ) {
             // Generate uncommon trap for class check failure path
             // in case of monomorphic or bimorphic virtual call site.