stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8199220: Zero build broken after 8195103, 8191102 and 8189871

Browse Source 
Reviewed-by: dholmes, stuefe, eosterlund, glaubitz, coleenp
This commit is contained in:
Ed Nevill 2018-03-13 18:22:53 +00:00
parent 2ab07cc314
commit 828e824a0f
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/cpu/zero/cppInterpreter_zero.cpp
View File

@ -31,6 +31,7 @@
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp"
#include "oops/arrayOop.hpp"
#include "oops/cpCache.inline.hpp"
#include "oops/methodData.hpp"
#include "oops/method.hpp"
#include "oops/oop.inline.hpp"

4
src/hotspot/cpu/zero/globalDefinitions_zero.hpp
View File

@ -26,6 +26,10 @@
#ifndef CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
#define CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
#ifdef _LP64
#define SUPPORTS_NATIVE_CX8
#endif
#include <ffi.h>
// Indicates whether the C calling conventions require that

1
src/hotspot/cpu/zero/methodHandles_zero.cpp
View File

@ -28,6 +28,7 @@
#include "interpreter/interpreter.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
#include "oops/method.inline.hpp"
#include "oops/oop.inline.hpp"
#include "prims/methodHandles.hpp"

2
src/hotspot/share/gc/shared/cardTableModRefBS.cpp
View File

@ -116,6 +116,7 @@ void CardTableModRefBS::print_on(outputStream* st) const {
// that specific collector in mind, and the documentation above suitably
// extended and updated.
void CardTableModRefBS::on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {
#if defined(COMPILER2) || INCLUDE_JVMCI
if (!ReduceInitialCardMarks) {
return;
}
@ -137,6 +138,7 @@ void CardTableModRefBS::on_slowpath_allocation_exit(JavaThread* thread, oop new_
invalidate(mr);
}
}
#endif // COMPILER2 || JVMCI
}
void CardTableModRefBS::initialize_deferred_card_mark_barriers() {

5
src/hotspot/share/interpreter/bytecodeInterpreter.cpp
View File

@ -33,11 +33,14 @@
#include "interpreter/interpreterRuntime.hpp"
#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
#include "oops/constantPool.inline.hpp"
#include "oops/cpCache.inline.hpp"
#include "oops/method.inline.hpp"
#include "oops/methodCounters.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/typeArrayOop.inline.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/jvmtiThreadState.hpp"
#include "runtime/atomic.hpp"
@ -2824,7 +2827,7 @@ run:
HandleMark __hm(THREAD);
THREAD->clear_pending_exception();
assert(except_oop(), "No exception to process");
assert(except_oop() != NULL, "No exception to process");
intptr_t continuation_bci;
// expression stack is emptied
topOfStack = istate->stack_base() - Interpreter::stackElementWords;