Merge

src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.cpp

@@ -31,6 +31,7 @@
 #include "gc/shenandoah/mode/shenandoahIUMode.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
+#include "runtime/java.hpp"
 
 void ShenandoahIUMode::initialize_flags() const {
   if (ShenandoahConcurrentRoots::can_do_concurrent_class_unloading()) {

src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp

@@ -31,6 +31,7 @@
 #include "gc/shenandoah/mode/shenandoahSATBMode.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
+#include "runtime/java.hpp"
 
 void ShenandoahSATBMode::initialize_flags() const {
   if (ShenandoahConcurrentRoots::can_do_concurrent_class_unloading()) {

src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp

@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
+#include "runtime/java.hpp"
 #include "utilities/defaultStream.hpp"
 
 void ShenandoahArguments::initialize() {

src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

@@ -76,6 +76,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/java.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/vmThread.hpp"

src/java.base/share/classes/java/text/DecimalFormat.java

@@ -338,9 +338,9 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  *
  * <h3>Example</h3>
  *
- * <blockquote><pre>{@code
- * <strong>// Print out a number using the localized number, integer, currency,
- * // and percent format for each locale</strong>
+ * <blockquote><pre><strong>{@code
+ * // Print out a number using the localized number, integer, currency,
+ * // and percent format for each locale}</strong>{@code
  * Locale[] locales = NumberFormat.getAvailableLocales();
  * double myNumber = -1234.56;
  * NumberFormat form;