*** old/src/share/vm/opto/graphKit.hpp	Fri Jan 16 19:37:26 2015
--- new/src/share/vm/opto/graphKit.hpp	Fri Jan 16 19:37:26 2015

*** 711,720 ****
--- 711,729 ----
                       bool must_throw = false, bool keep_exact_action = false) {
      uncommon_trap(Deoptimization::make_trap_request(reason, action),
                    klass, reason_string, must_throw, keep_exact_action);
    }
  
+   // Bail out to the interpreter and keep exact action (avoid switching to Action_none).
+   void uncommon_trap_exact(Deoptimization::DeoptReason reason,
+                            Deoptimization::DeoptAction action,
+                            ciKlass* klass = NULL, const char* reason_string = NULL,
+                            bool must_throw = false) {
+     uncommon_trap(Deoptimization::make_trap_request(reason, action),
+                   klass, reason_string, must_throw, /*keep_exact_action=*/true);
+   }
+ 
    // SP when bytecode needs to be reexecuted.
    virtual int reexecute_sp() { return sp(); }
  
    // Report if there were too many traps at the current method and bci.
    // Report if a trap was recorded, and/or PerMethodTrapLimit was exceeded.