*** old/src/share/vm/runtime/arguments.cpp	Thu Mar 26 14:18:27 2015
--- new/src/share/vm/runtime/arguments.cpp	Thu Mar 26 14:18:27 2015

*** 90,99 ****
--- 90,101 ----
  // These parameters are reset in method parse_vm_init_args(JavaVMInitArgs*)
  bool   Arguments::_AlwaysCompileLoopMethods     = AlwaysCompileLoopMethods;
  bool   Arguments::_UseOnStackReplacement        = UseOnStackReplacement;
  bool   Arguments::_BackgroundCompilation        = BackgroundCompilation;
  bool   Arguments::_ClipInlining                 = ClipInlining;
+ intx   Arguments::_Tier3InvokeNotifyFreqLog     = Tier3InvokeNotifyFreqLog;
+ intx   Arguments::_Tier4InvocationThreshold     = Tier4InvocationThreshold;
  
  char*  Arguments::SharedArchivePath             = NULL;
  
  AgentLibraryList Arguments::_libraryList;
  AgentLibraryList Arguments::_agentList;

*** 1067,1076 ****
--- 1069,1086 ----
    // use the saved values
    ClipInlining               = Arguments::_ClipInlining;
    AlwaysCompileLoopMethods   = Arguments::_AlwaysCompileLoopMethods;
    UseOnStackReplacement      = Arguments::_UseOnStackReplacement;
    BackgroundCompilation      = Arguments::_BackgroundCompilation;
+   if (TieredCompilation) {
+     if (FLAG_IS_DEFAULT(Tier3InvokeNotifyFreqLog)) {
+       Tier3InvokeNotifyFreqLog = Arguments::_Tier3InvokeNotifyFreqLog;
+     }
+     if (FLAG_IS_DEFAULT(Tier4InvocationThreshold)) {
+       Tier4InvocationThreshold = Arguments::_Tier4InvocationThreshold;
+     }
+   }
  
    // Change from defaults based on mode
    switch (mode) {
    default:
      ShouldNotReachHere();

*** 2587,2596 ****
--- 2597,2610 ----
    // Save default settings for some mode flags
    Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods;
    Arguments::_UseOnStackReplacement    = UseOnStackReplacement;
    Arguments::_ClipInlining             = ClipInlining;
    Arguments::_BackgroundCompilation    = BackgroundCompilation;
+   if (TieredCompilation) {
+     Arguments::_Tier3InvokeNotifyFreqLog = Tier3InvokeNotifyFreqLog;
+     Arguments::_Tier4InvocationThreshold = Tier4InvocationThreshold;
+   }
  
    // Setup flags for mixed which is the default
    set_mode_flags(_mixed);
  
    // Parse JAVA_TOOL_OPTIONS environment variable (if present)