OpenJDK / jdk / jdk
changeset 57500:f33197adda9a jdk-15+2
8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp
Reviewed-by: dholmes, kbarrett
| author | dcubed |
|---|---|
| date | Wed, 18 Dec 2019 18:22:52 -0500 |
| parents | 87266ac324d7 |
| children | dd4b4f273274 |
| files | src/hotspot/share/gc/z/zRootsIterator.cpp |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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:22:52 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"