src/hotspot/share/runtime/globals.hpp

*** 796,13 ***
            "Number of OutOfMemoryErrors preallocated with backtrace")        \
                                                                              \
    product(bool, UseXMMForArrayCopy, false,                                  \
            "Use SSE2 MOVQ instruction for Arraycopy")                        \
                                                                              \
!   develop(bool, PrintFieldLayout, false,                                    \
            "Print field layout for each class")                              \
                                                                              \
    /* Need to limit the extent of the padding to reasonable size.          */\
    /* 8K is well beyond the reasonable HW cache line size, even with       */\
    /* aggressive prefetching, while still leaving the room for segregating */\
    /* among the distinct pages.                                            */\
    product(int, ContendedPaddingWidth, 128,                                  \
--- 796,37 ---
            "Number of OutOfMemoryErrors preallocated with backtrace")        \
                                                                              \
    product(bool, UseXMMForArrayCopy, false,                                  \
            "Use SSE2 MOVQ instruction for Arraycopy")                        \
                                                                              \
!   product(bool, PrintFieldLayout, false, DIAGNOSTIC,                        \
            "Print field layout for each class")                              \
                                                                              \
+   product(bool, PrintInlineLayout, false, DIAGNOSTIC,                       \
+           "Print field layout for each inline type or class with inline fields") \
+                                                                             \
+   product(bool, PrintFlatArrayLayout, false, DIAGNOSTIC,                    \
+           "Print array layout for each inline type array")                  \
+                                                                             \
+   product(intx, FlatArrayElementMaxSize, -1,                                \
+           "Max size for flattening inline array elements, <0 no limit")     \
+                                                                             \
+   product(intx, InlineFieldMaxFlatSize, 128,                                \
+           "Max size for flattening inline type fields, <0 no limit")        \
+                                                                             \
+   product(bool, NullableFieldFlattening, false,                             \
+           "Allow the JVM to flatten some nullable fields")                  \
+                                                                             \
+   product(bool, AtomicFieldFlattening, false,                               \
+           "Allow the JVM to flatten some atomic fields")                    \
+                                                                             \
+   product(intx, FlatArrayElementMaxOops, 4,                                 \
+           "Max nof embedded object references in an inline type to flatten, <0 no limit")  \
+                                                                             \
+   product(bool, InlineArrayAtomicAccess, false,                             \
+           "Atomic inline array accesses by-default, for all inline arrays") \
+                                                                             \
    /* Need to limit the extent of the padding to reasonable size.          */\
    /* 8K is well beyond the reasonable HW cache line size, even with       */\
    /* aggressive prefetching, while still leaving the room for segregating */\
    /* among the distinct pages.                                            */\
    product(int, ContendedPaddingWidth, 128,                                  \

*** 1933,10 ***
--- 1957,27 ---
            "Start flight recording with options"))                           \
                                                                              \
    product(bool, UseFastUnorderedTimeStamps, false, EXPERIMENTAL,            \
            "Use platform unstable time where supported for timestamps only") \
                                                                              \
+   product(bool, EnableValhalla, true,                                       \
+           "Enable experimental Valhalla features")                          \
+                                                                             \
+   product_pd(bool, InlineTypePassFieldsAsArgs,                              \
+           "Pass each inline type field as an argument at calls")            \
+                                                                             \
+   product_pd(bool, InlineTypeReturnedAsFields,                              \
+           "Return fields instead of an inline type reference")              \
+                                                                             \
+   develop(bool, StressCallingConvention, false,                             \
+           "Stress the scalarized calling convention.")                      \
+                                                                             \
+   product(ccstrlist, ForceNonTearable, "", DIAGNOSTIC,                      \
+           "List of inline classes which are forced to be atomic "           \
+           "(whitespace and commas separate names, "                         \
+           "and leading and trailing stars '*' are wildcards)")              \
+                                                                             \
    product(bool, DeoptimizeNMethodBarriersALot, false, DIAGNOSTIC,           \
                  "Make nmethod barriers deoptimise a lot.")                  \
                                                                              \
    develop(bool, VerifyCrossModifyFence,                                     \
            false AARCH64_ONLY(DEBUG_ONLY(||true)),                           \