*** old/src/share/vm/compiler/compilerDirectives.cpp	Wed Feb 10 10:49:51 2016
--- new/src/share/vm/compiler/compilerDirectives.cpp	Wed Feb 10 10:49:51 2016

*** 102,111 ****
--- 102,112 ----
    }
  
    // if any flag has been modified - set directive as enabled
    // unless it already has been explicitly set.
    if (!_modified[EnableIndex]) {
+     EnableOption = false;
      if (_inlinematchers != NULL) {
        EnableOption = true;
        return;
      }
      int i;

*** 116,125 ****
--- 117,134 ----
        }
      }
    }
  }
  
+ bool DirectiveSet::is_default_set() {
+   if  (_directive != NULL) {
+     return _directive->is_default_directive();
+   } else {
+     return false;
+   }
+ }
+ 
  CompilerDirectives* CompilerDirectives::next() {
    return _next;
  }
  
  bool CompilerDirectives::match(methodHandle method) {

*** 367,377 ****
--- 376,387 ----
    tmp->set_next(m);
  }
  
  void DirectiveSet::print_inline(outputStream* st) {
    if (_inlinematchers == NULL) {
!     st->print_cr("  inline: -");
!     st->print("  No inline rules in directive.");
+     CompilerOracle::print_inlinecommands(st);
    } else {
      st->print("  inline: ");
      _inlinematchers->print(st);
      InlineMatcher* tmp = _inlinematchers->next();
      while (tmp != NULL) {

*** 439,452 ****
--- 449,462 ----
    CompilerDirectives* _default_directives = new CompilerDirectives();
    char str[] = "*.*";
    const char* error_msg = NULL;
    _default_directives->add_match(str, error_msg);
  #ifdef COMPILER1
!   _default_directives->_c1_store->EnableOption = true;
!   assert(_default_directives->_c1_store->EnableOption, "Default must be active");
  #endif
  #ifdef COMPILER2
!   _default_directives->_c2_store->EnableOption = true;
!   assert(_default_directives->_c2_store->EnableOption, "Default must be active");
  #endif
    assert(error_msg == NULL, "Must succeed.");
    push(_default_directives);
  }
  

*** 490,500 ****
--- 500,510 ----
    DirectivesStack::release(tmp);
  }
  
  bool DirectivesStack::check_capacity(int request_size, outputStream* st) {
    if ((request_size + _depth) > CompilerDirectivesLimit) {
!     st->print_cr("Could not add %i more directives. Currently %i/%i directives.", request_size, _depth, CompilerDirectivesLimit);
!     st->print_cr("Could not add %i more directives. Currently %i of %i directives.", request_size, _depth, CompilerDirectivesLimit);
      return false;
    }
    return true;
  }