*** old/src/share/vm/runtime/globals.hpp	Wed Sep 16 15:19:02 2015
--- new/src/share/vm/runtime/globals.hpp	Wed Sep 16 15:19:02 2015

*** 174,184 ****
--- 174,184 ----
  #ifdef TARGET_ARCH_zero
  # include "shark_globals_zero.hpp"
  #endif
  #endif
  
! #if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK) && !INCLUDE_JVMCI
  define_pd_global(bool, BackgroundCompilation,        false);
  define_pd_global(bool, UseTLAB,                      false);
  define_pd_global(bool, CICompileOSR,                 false);
  define_pd_global(bool, UseTypeProfile,               false);
  define_pd_global(bool, UseOnStackReplacement,        false);

*** 209,223 ****
--- 209,223 ----
  define_pd_global(bool, NeverActAsServerClassMachine, true);
  define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
  #define CI_COMPILER_COUNT 0
  #else
  
! #ifdef COMPILER2
! #if defined(COMPILER2) || INCLUDE_JVMCI
  #define CI_COMPILER_COUNT 2
  #else
  #define CI_COMPILER_COUNT 1
! #endif // COMPILER2 || INCLUDE_JVMCI
  
  #endif // no compilers
  
  // string type aliases used only in this file
  typedef const char* ccstr;

*** 252,261 ****
--- 252,262 ----
      KIND_C2                 = 1 << 13,
      KIND_ARCH               = 1 << 14,
      KIND_SHARK              = 1 << 15,
      KIND_LP64_PRODUCT       = 1 << 16,
      KIND_COMMERCIAL         = 1 << 17,
+     KIND_JVMCI              = 1 << 18,
  
      KIND_MASK = ~VALUE_ORIGIN_MASK
    };
  
    enum Error {

*** 1110,1122 ****
--- 1111,1132 ----
            "Print assembly code (using external disassembler.so)")           \
                                                                              \
    diagnostic(ccstr, PrintAssemblyOptions, NULL,                             \
            "Print options string passed to disassembler.so")                 \
                                                                              \
+   notproduct(bool, PrintNMethodStatistics, false,                           \
+           "Print a summary statistic for the generated nmethods")           \
+                                                                             \
+   product(bool, ShareDebugInfo, IS_JVMCI_DEFINED,                           \
+           "Always tries to share similar debug info inside a nmethod")      \
+                                                                             \
    diagnostic(bool, PrintNMethods, false,                                    \
            "Print assembly code for nmethods when generated")                \
                                                                              \
+   diagnostic(intx, PrintNMethodsAtLevel, -1,                                \
+           "Only print code for nmethods at the given compilation level")    \
+                                                                             \
    diagnostic(bool, PrintNativeNMethods, false,                              \
            "Print assembly code for native nmethods when generated")         \
                                                                              \
    develop(bool, PrintDebugInfo, false,                                      \
            "Print debug information for all nmethods when generated")        \

*** 3083,3092 ****
--- 3093,3105 ----
                                                                              \
    /* deoptimization */                                                      \
    develop(bool, TraceDeoptimization, false,                                 \
            "Trace deoptimization")                                           \
                                                                              \
+   develop(bool, PrintDeoptimizationDetails, false,                          \
+           "Print more information about deoptimization")                    \
+                                                                             \
    develop(bool, DebugDeoptimization, false,                                 \
            "Tracing various information while debugging deoptimization")     \
                                                                              \
    product(intx, SelfDestructTimer, 0,                                       \
            "Will cause VM to terminate after a given time (in minutes) "     \

*** 3232,3241 ****
--- 3245,3257 ----
            "allocate (for testing only)")                                    \
                                                                              \
    product(intx, TypeProfileWidth, 2,                                        \
            "Number of receiver types to record in call/cast profile")        \
                                                                              \
+   product(intx, MethodProfileWidth, 0,                                      \
+           "Number of methods to record in call profile")                    \
+                                                                             \
    develop(intx, BciProfileWidth,      2,                                    \
            "Number of return bci's to record in ret profile")                \
                                                                              \
    product(intx, PerMethodRecompilationCutoff, 400,                          \
            "After recompiling N times, stay in the interpreter (-1=>'Inf')") \

*** 3767,3777 ****
--- 3783,3793 ----
    product(intx, Tier3MinInvocationThreshold, 100,                           \
            "Minimum invocation to compile at tier 3")                        \
                                                                              \
    product(intx, Tier3CompileThreshold, 2000,                                \
            "Threshold at which tier 3 compilation is invoked (invocation "   \
!           "minimum must be satisfied")                                      \
!           "minimum must be satisfied)")                                     \
                                                                              \
    product(intx, Tier3BackEdgeThreshold,  60000,                             \
            "Back edge threshold at which tier 3 OSR compilation is invoked") \
                                                                              \
    product(intx, Tier4InvocationThreshold, 5000,                             \