*** old/src/share/vm/opto/compile.hpp	Sat Oct 12 23:25:14 2013
--- new/src/share/vm/opto/compile.hpp	Sat Oct 12 23:25:13 2013

*** 423,432 ****
--- 423,435 ----
    // Use for sorting expensive nodes to bring similar nodes together
    static int cmp_expensive_nodes(Node** n1, Node** n2);
    // Expensive nodes list already sorted?
    bool expensive_nodes_sorted() const;
  
+   // Are we within a PreserveJVMState block?
+   int _preserve_jvm_state;
+ 
   public:
  
    outputStream* print_inlining_stream() const {
      return _print_inlining_list->adr_at(_print_inlining_idx)->ss();
    }

*** 818,828 ****
--- 821,833 ----
    void              return_values(JVMState* jvms);
    JVMState*         build_start_state(StartNode* start, const TypeFunc* tf);
  
    // Decide how to build a call.
    // The profile factor is a discount to apply to this site's interp. profile.
-   CallGenerator*    call_generator(ciMethod* call_method, int vtable_index, bool call_does_dispatch, JVMState* jvms, bool allow_inline, float profile_factor, bool allow_intrinsics = true, bool delayed_forbidden = false);
+                                    JVMState* jvms, bool allow_inline, float profile_factor, bool allow_intrinsics = true,
+                                    bool delayed_forbidden = false);
    bool should_delay_inlining(ciMethod* call_method, JVMState* jvms) {
      return should_delay_string_inlining(call_method, jvms) ||
             should_delay_boxing_inlining(call_method, jvms);
    }
    bool should_delay_string_inlining(ciMethod* call_method, JVMState* jvms);

*** 1154,1161 ****
--- 1159,1181 ----
    // Definitions of pd methods
    static void pd_compiler2_init();
  
    // Auxiliary method for randomized fuzzing/stressing
    static bool randomized_select(int count);
+ 
+   // enter a PreserveJVMState block
+   void inc_preserve_jvm_state() {
+     _preserve_jvm_state++;
+   }
+ 
+   // exit a PreserveJVMState block
+   void dec_preserve_jvm_state() {
+     _preserve_jvm_state--;
+     assert(_preserve_jvm_state >= 0, "_preserve_jvm_state shouldn't be negative");
+   }
+ 
+   bool has_preserve_jvm_state() const {
+     return _preserve_jvm_state > 0;
+   }
  };
  
  #endif // SHARE_VM_OPTO_COMPILE_HPP