src/hotspot/share/runtime/globals.hpp

*** 128,10 ***
--- 128,13 ---
                                                                              \
    product(bool, UseCompressedClassPointers, false,                          \
            "Use 32-bit class pointers in 64-bit VM. "                        \
            "lp64_product means flag is always constant in 32 bit VM")        \
                                                                              \
+   product(bool, UseCompactObjectHeaders, false, EXPERIMENTAL,               \
+           "Use 64-bit object headers instead of 96-bit headers")            \
+                                                                             \
    product(intx, ObjectAlignmentInBytes, 8,                                  \
            "Default object alignment in bytes, 8 is minimum")                \
            range(8, 256)                                                     \
            constraint(ObjectAlignmentInBytesConstraintFunc, AtParse)
  

*** 145,10 ***
--- 148,11 ---
                             notproduct,                                      \
                             range,                                           \
                             constraint)
  const bool UseCompressedOops = false;
  const bool UseCompressedClassPointers = false;
+ const bool UseCompactObjectHeaders = false;
  const intx ObjectAlignmentInBytes = 8;
  
  #endif // _LP64
  
  #define RUNTIME_FLAGS(develop,                                              \

*** 2092,10 ***
--- 2096,23 ---
    develop(bool, VerifyCrossModifyFence,                                     \
            false AARCH64_ONLY(DEBUG_ONLY(||true)),                           \
               "Mark all threads after a safepoint, and clear on a modify "   \
               "fence. Add cleanliness checks.")                              \
                                                                              \
+   product(bool, HeapObjectStats, false, DIAGNOSTIC,                         \
+              "Enable gathering of heap object statistics")                  \
+                                                                             \
+   product(size_t, HeapObjectStatsSamplingInterval, 500, DIAGNOSTIC,         \
+              "Heap object statistics sampling interval (ms)")               \
+                                                                             \
+   product(int, LockingMode, LM_LEGACY, EXPERIMENTAL,                        \
+           "Select locking mode: "                                           \
+           "0: monitors only (LM_MONITOR), "                                 \
+           "1: monitors & legacy stack-locking (LM_LEGACY, default), "       \
+           "2: monitors & new lightweight locking (LM_LIGHTWEIGHT)")         \
+           range(0, 2)                                                       \
+                                                                             \
    develop(bool, TraceOptimizedUpcallStubs, false,                              \
                  "Trace optimized upcall stub generation")                      \
                                                                              \
    product(uint, TrimNativeHeapInterval, 0, EXPERIMENTAL,                    \
            "Interval, in ms, at which the JVM will trim the native heap if " \