*** old/src/share/vm/classfile/vmSymbols.cpp	Wed Oct  7 12:14:48 2015
--- new/src/share/vm/classfile/vmSymbols.cpp	Wed Oct  7 12:14:48 2015

*** 415,425 ****
--- 415,425 ----
    default:
      return 0;
    }
  }
  
- bool vmIntrinsics::is_disabled_by_flags(methodHandle method, methodHandle compilation_context) {
    vmIntrinsics::ID id = method->intrinsic_id();
    assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
  
    // Check if the intrinsic corresponding to 'method' has been disabled on
    // the command line by using the DisableIntrinsic flag (either globally

*** 436,453 ****
--- 436,445 ----
    // commoning reads from the referent field across safepoint since GC
    // can change the referent field's value. See Compile::Compile()
    // in src/share/vm/opto/compile.cpp or
    // GraphBuilder::GraphBuilder() in src/share/vm/c1/c1_GraphBuilder.cpp
    // for more details.
    ccstr disable_intr = NULL;
    if ((DisableIntrinsic[0] != '\0' && strstr(DisableIntrinsic, vmIntrinsics::name_at(id)) != NULL) ||
        (!compilation_context.is_null() &&
         CompilerOracle::has_option_value(compilation_context, "DisableIntrinsic", disable_intr) &&
         strstr(disable_intr, vmIntrinsics::name_at(id)) != NULL)
    ) {
      return true;
    }
  
    // -XX:-InlineNatives disables nearly all intrinsics except the ones listed in
    // the following switch statement.
    if (!InlineNatives) {
      switch (id) {