--- a/src/hotspot/cpu/aarch64/aarch64.ad Tue Mar 27 11:51:39 2018 +0200
+++ b/src/hotspot/cpu/aarch64/aarch64.ad Tue Mar 27 14:40:19 2018 +0200
@@ -995,8 +995,10 @@
source_hpp %{
+#include "asm/macroAssembler.hpp"
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "opto/addnode.hpp"
class CallStubImpl {
--- a/src/hotspot/share/prims/privilegedStack.cpp Tue Mar 27 11:51:39 2018 +0200
+++ b/src/hotspot/share/prims/privilegedStack.cpp Tue Mar 27 14:40:19 2018 +0200
@@ -28,6 +28,7 @@
#include "oops/method.hpp"
#include "oops/oop.inline.hpp"
#include "prims/privilegedStack.hpp"
+#include "runtime/thread.inline.hpp"
#include "runtime/vframe.inline.hpp"
void PrivilegedElement::initialize(vframeStream* vfst, oop context, PrivilegedElement* next, TRAPS) {