Automatic merge of jdk:master into master

Author: duke

test/hotspot/jtreg/runtime/Thread/ThreadObjAccessAtExit.java

@@ -30,8 +30,8 @@
  * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @comment run with a small heap, but we need at least 7M for ZGC
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx7m -XX:-DisableExplicitGC ThreadObjAccessAtExit
+ * @comment run with a small heap, but we need at least 11M for ZGC with JFR
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx11m -XX:-DisableExplicitGC ThreadObjAccessAtExit
  */
 
 import sun.hotspot.WhiteBox;