infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-06 11:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

8201427: Fix Minimal VM builds on Linux x64

Browse Source 
Reviewed-by: shade
This commit is contained in:
Stefan Karlsson 2018-04-11 13:52:23 +02:00
parent ab5c67bb0c
commit 623c83dad9
7 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/c1/c1_LIRGenerator.cpp
View File

@ -1659,9 +1659,11 @@ void LIRGenerator::CardTableBarrierSet_post_barrier(LIR_OprDesc* addr, LIR_OprDe
__ move(dirty, card_addr);
__ branch_destination(L_already_dirty->label());
} else {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
__ membar_storestore();
}
#endif
__ move(dirty, card_addr);
}
#endif

1
src/hotspot/share/code/codeCache.cpp
View File

@ -51,6 +51,7 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/safepointVerifiers.hpp"
#include "runtime/sweeper.hpp"
#include "runtime/vmThread.hpp"
#include "services/memoryService.hpp"
#include "trace/tracing.hpp"
#include "utilities/align.hpp"

2
src/hotspot/share/oops/klass.hpp
View File

@ -166,7 +166,7 @@ private:
#endif
// The _archived_mirror is set at CDS dump time pointing to the cached mirror
// in the open archive heap region when archiving java object is supported.
CDS_JAVA_HEAP_ONLY(narrowOop _archived_mirror);
CDS_JAVA_HEAP_ONLY(narrowOop _archived_mirror;)
friend class SharedClassUtil;
protected:

2
src/hotspot/share/runtime/arguments.hpp
View File

@ -703,7 +703,7 @@ class Arguments : AllStatic {
static void check_unsupported_dumping_properties() NOT_CDS_RETURN;
static bool check_unsupported_cds_runtime_properties() NOT_CDS_RETURN;
static bool check_unsupported_cds_runtime_properties() NOT_CDS_RETURN0;
static bool atojulong(const char *s, julong* result);
};

3
src/hotspot/share/runtime/thread.cpp
View File

@ -106,6 +106,7 @@
#include "trace/traceMacros.hpp"
#include "trace/tracing.hpp"
#include "utilities/align.hpp"
#include "utilities/copy.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/dtrace.hpp"
#include "utilities/events.hpp"
@ -3891,10 +3892,12 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
// cache the system and platform class loaders
SystemDictionary::compute_java_loaders(CHECK_JNI_ERR);
#if INCLUDE_CDS
if (DumpSharedSpaces) {
// capture the module path info from the ModuleEntryTable
ClassLoader::initialize_module_path(THREAD);
}
#endif
#if INCLUDE_JVMCI
if (force_JVMCI_intialization) {

3
src/hotspot/share/services/memTracker.hpp
View File

@ -41,7 +41,7 @@ class Tracker : public StackObj {
release
};
Tracker(enum TrackerType type) : _type(type) { }
void record(address addr, size_t size);
void record(address addr, size_t size) { }
private:
enum TrackerType _type;
};
@ -313,4 +313,3 @@ class MemTracker : AllStatic {
#endif // INCLUDE_NMT
#endif // SHARE_VM_SERVICES_MEM_TRACKER_HPP

4
src/hotspot/share/utilities/macros.hpp
View File

@ -109,11 +109,13 @@
#define CDS_ONLY(x) x
#define NOT_CDS(x)
#define NOT_CDS_RETURN /* next token must be ; */
#define NOT_CDS_RETURN0 /* next token must be ; */
#define NOT_CDS_RETURN_(code) /* next token must be ; */
#else
#define CDS_ONLY(x)
#define NOT_CDS(x) x
#define NOT_CDS_RETURN {}
#define NOT_CDS_RETURN {}
#define NOT_CDS_RETURN0 { return 0; }
#define NOT_CDS_RETURN_(code) { return code; }
#endif // INCLUDE_CDS