fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: P2
    • 15
    • Affects Version/s: 15
    • Component/s: hotspot
    • gc
    • b02
    • Verified

      $ 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"

            Assignee:
            Daniel Daugherty
            Reporter:
            Daniel Daugherty
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: