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

Merge

Browse Source
This commit is contained in:
Christian Tornqvist 2016-05-19 11:39:53 -04:00
commit 1fc82093ca
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hotspot/make/lib/CompileGtest.gmk
View File

@ -36,9 +36,6 @@ endif
################################################################################ ################################################################################
GTEST_TEST_SRC_FILES := $(shell $(FIND) $(HOTSPOT_TOPDIR)/test/native -name \
"test*.cpp" -type f)
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
GTEST_JVM_MAPFILE := $(JVM_MAPFILE) GTEST_JVM_MAPFILE := $(JVM_MAPFILE)
else else
@ -58,10 +55,12 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
TOOLCHAIN := $(JVM_TOOLCHAIN), \ TOOLCHAIN := $(JVM_TOOLCHAIN), \
LIBRARY := jvm, \ LIBRARY := jvm, \
OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \ OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
EXTRA_FILES := $(GTEST_TEST_SRC_FILES) \
$(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc \
$(GTEST_TEST_SRC)/gtestMain.cpp, \
OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \ OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \
SRC := $(GTEST_TEST_SRC), \
EXCLUDES := $(JVM_EXCLUDES), \
EXCLUDE_FILES := gtestLauncher.cpp, \
EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
EXTRA_FILES := $(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc, \
EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \ EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \
$(BUILD_LIBJVM_ALL_OBJS)), \ $(BUILD_LIBJVM_ALL_OBJS)), \
CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \ CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \

6
hotspot/src/share/vm/classfile/classFileParser.cpp
View File

@ -5708,8 +5708,10 @@ void ClassFileParser::parse_stream(const ClassFileStream* const stream,
#if INCLUDE_CDS #if INCLUDE_CDS
if (DumpLoadedClassList != NULL && stream->source() != NULL && classlist_file->is_open()) { if (DumpLoadedClassList != NULL && stream->source() != NULL && classlist_file->is_open()) {
// Only dump the classes that can be stored into CDS archive // Only dump the classes that can be stored into CDS archive.
if (SystemDictionaryShared::is_sharing_possible(_loader_data)) { // Anonymous classes such as generated LambdaForm classes are also not included.
if (SystemDictionaryShared::is_sharing_possible(_loader_data) &&
_host_klass == NULL) {
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
classlist_file->print_cr("%s", _class_name->as_C_string()); classlist_file->print_cr("%s", _class_name->as_C_string());
classlist_file->flush(); classlist_file->flush();

4
hotspot/src/share/vm/classfile/classLoaderData.cpp
View File

@ -382,6 +382,10 @@ void ClassLoaderData::unload() {
} }
log->cr(); log->cr();
} }
// In some rare cases items added to this list will not be freed elsewhere.
// To keep it simple, just free everything in it here.
free_deallocate_list();
} }
PackageEntryTable* ClassLoaderData::packages() { PackageEntryTable* ClassLoaderData::packages() {

7
hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
View File

@ -394,13 +394,6 @@ void ParallelCompact_test() {
HeapWord* end_heap = HeapWord* end_heap =
(HeapWord*) heap->young_gen()->virtual_space()->high_boundary(); (HeapWord*) heap->young_gen()->virtual_space()->high_boundary();
size_t end_index =
PSParallelCompact::summary_data().addr_to_region_idx(end_heap);
ParallelCompactData::RegionData* c = PSParallelCompact::summary_data().region(end_index);
// Initialize the end region with a bad destination.
c->set_destination(begin_heap - 1);
print_generic_summary_data(PSParallelCompact::summary_data(), print_generic_summary_data(PSParallelCompact::summary_data(),
begin_heap, end_heap); begin_heap, end_heap);
} }

8
hotspot/src/share/vm/memory/metaspaceShared.hpp
View File

@ -43,11 +43,11 @@
// for the x64 platform // for the x64 platform
#define DEFAULT_VTBL_COMMON_CODE_SIZE (1*K) // conservative size of the "common_code" for the x64 platform #define DEFAULT_VTBL_COMMON_CODE_SIZE (1*K) // conservative size of the "common_code" for the x64 platform
#define DEFAULT_SHARED_READ_WRITE_SIZE (NOT_LP64(9*M) LP64_ONLY(10*M)) #define DEFAULT_SHARED_READ_WRITE_SIZE (NOT_LP64(6*M) LP64_ONLY(10*M))
#define MIN_SHARED_READ_WRITE_SIZE (NOT_LP64(7*M) LP64_ONLY(10*M)) #define MIN_SHARED_READ_WRITE_SIZE (NOT_LP64(6*M) LP64_ONLY(10*M))
#define DEFAULT_SHARED_READ_ONLY_SIZE (NOT_LP64(9*M) LP64_ONLY(10*M)) #define DEFAULT_SHARED_READ_ONLY_SIZE (NOT_LP64(6*M) LP64_ONLY(10*M))
#define MIN_SHARED_READ_ONLY_SIZE (NOT_LP64(9*M) LP64_ONLY(10*M)) #define MIN_SHARED_READ_ONLY_SIZE (NOT_LP64(6*M) LP64_ONLY(10*M))
// the MIN_SHARED_MISC_DATA_SIZE and MIN_SHARED_MISC_CODE_SIZE estimates are based on // the MIN_SHARED_MISC_DATA_SIZE and MIN_SHARED_MISC_CODE_SIZE estimates are based on
// the sizes required for dumping the archive using the default classlist. The sizes // the sizes required for dumping the archive using the default classlist. The sizes