src/share/vm/compiler/compilerDirectives.hpp

*** 45,55 ****
      cflags(PrintNMethods,           bool, PrintNMethods, PrintNMethods) \
      cflags(ReplayInline,            bool, false, ReplayInline) \
      cflags(DumpReplay,              bool, false, DumpReplay) \
      cflags(DumpInline,              bool, false, DumpInline) \
      cflags(CompilerDirectivesIgnoreCompileCommands, bool, CompilerDirectivesIgnoreCompileCommands, X) \
!     cflags(DisableIntrinsic,        ccstr, DisableIntrinsic, DisableIntrinsic)
  
  #ifdef COMPILER1
    #define compilerdirectives_c1_flags(cflags)
  #else
    #define compilerdirectives_c1_flags(cflags)
--- 45,55 ----
      cflags(PrintNMethods,           bool, PrintNMethods, PrintNMethods) \
      cflags(ReplayInline,            bool, false, ReplayInline) \
      cflags(DumpReplay,              bool, false, DumpReplay) \
      cflags(DumpInline,              bool, false, DumpInline) \
      cflags(CompilerDirectivesIgnoreCompileCommands, bool, CompilerDirectivesIgnoreCompileCommands, X) \
!     cflags(DisableIntrinsic,        ccstrlist, DisableIntrinsic, DisableIntrinsic)
  
  #ifdef COMPILER1
    #define compilerdirectives_c1_flags(cflags)
  #else
    #define compilerdirectives_c1_flags(cflags)
*** 98,107 ****
--- 98,109 ----
  class DirectiveSet : public CHeapObj<mtCompiler> {
  private:
    InlineMatcher* _inlinematchers;
    CompilerDirectives* _directive;
  
+   static ccstrlist canonicalize_disableintrinsic(ccstrlist option_value);
+ 
  public:
    DirectiveSet(CompilerDirectives* directive);
    ~DirectiveSet();
    CompilerDirectives* directive();
    bool parse_and_add_inline(char* str, const char*& error_msg);
*** 139,148 ****
--- 141,151 ----
  
    void print_intx(outputStream* st, ccstr n, intx v, bool mod) { if (mod) { st->print("%s:" INTX_FORMAT " ", n, v); } }
    void print_bool(outputStream* st, ccstr n, bool v, bool mod) { if (mod) { st->print("%s:%s ", n, v ? "true" : "false"); } }
    void print_double(outputStream* st, ccstr n, double v, bool mod) { if (mod) { st->print("%s:%f ", n, v); } }
    void print_ccstr(outputStream* st, ccstr n, ccstr v, bool mod) { if (mod) { st->print("%s:%s ", n, v); } }
+   void print_ccstrlist(outputStream* st, ccstr n, ccstr v, bool mod) { print_ccstr(st, n, v, mod); }
  
  void print(outputStream* st) {
      print_inline(st);
      st->print("  ");
  #define print_function_definition(name, type, dvalue, cc_flag) print_##type(st, #name, this->name##Option, true);//(bool)_modified[name##Index]);