--- old/src/share/vm/opto/compile.cpp	2015-01-16 19:37:25.000000000 +0300
+++ new/src/share/vm/opto/compile.cpp	2015-01-16 19:37:24.000000000 +0300
@@ -2651,6 +2651,7 @@
   case Op_Opaque1:              // Remove Opaque Nodes before matching
   case Op_Opaque2:              // Remove Opaque Nodes before matching
   case Op_Opaque3:
+  case Op_Opaque4:
     n->subsume_by(n->in(1), this);
     break;
   case Op_CallStaticJava:
@@ -3317,6 +3318,9 @@
 bool Compile::too_many_traps(ciMethod* method,
                              int bci,
                              Deoptimization::DeoptReason reason) {
+  if (method->ignore_profile()) {
+    return false;
+  }
   ciMethodData* md = method->method_data();
   if (md->is_empty()) {
     // Assume the trap has not occurred, or that it occurred only
@@ -3366,6 +3370,9 @@
 bool Compile::too_many_recompiles(ciMethod* method,
                                   int bci,
                                   Deoptimization::DeoptReason reason) {
+  if (method->ignore_profile()) {
+    return false;
+  }
   ciMethodData* md = method->method_data();
   if (md->is_empty()) {
     // Assume the trap has not occurred, or that it occurred only