Urgent RFR(T): 8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp

[Daniel D. Daugherty]

Greetings,

A merge error crept into the latest sync from JDK14 -> JDK15. I consider
this a trivial fix.

Here's the context diff:

$ hg diff
diff -r 87266ac324d7 src/hotspot/share/gc/z/zRootsIterator.cpp
--- a/src/hotspot/share/gc/z/zRootsIterator.cpp Wed Dec 18 23:46:55 2019 
+0100
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp Wed Dec 18 18:11:08 2019 
-0500
@@ -44,7 +44,8 @@
  #include "memory/universe.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "prims/resolvedMethodTable.hpp"
-#include "runtime/atomic.hpp"#include "runtime/safepoint.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/safepoint.hpp"
  #include "runtime/synchronizer.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vmThread.hpp"


Thanks, in advance, for any comments, questions or suggestions.

Dan