Mercurial > hg > graal-jvmci-8
changeset 20643:b2399f0d9611
Merge
author | coleenp |
---|---|
date | Mon, 17 Nov 2014 16:36:09 +0000 |
parents | ec2c6fdd1ce6 (diff) 89266fdfa9e6 (current diff) |
children | 2f445c5048df 4e4ebe50c8e3 |
files | make/solaris/makefiles/add_gnu_debuglink.make make/solaris/makefiles/fix_empty_sec_hdr_flags.make src/os/solaris/add_gnu_debuglink/add_gnu_debuglink.c src/os/solaris/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c |
diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/services/mallocTracker.hpp Mon Nov 17 02:30:15 2014 -0800 +++ b/src/share/vm/services/mallocTracker.hpp Mon Nov 17 16:36:09 2014 +0000 @@ -243,15 +243,15 @@ size_t _flags : 8; size_t _pos_idx : 16; size_t _bucket_idx: 40; -#define MAX_MALLOCSITE_TABLE_SIZE ((size_t)1 << 40) -#define MAX_BUCKET_LENGTH ((size_t)(1 << 16)) +#define MAX_MALLOCSITE_TABLE_SIZE right_n_bits(40) +#define MAX_BUCKET_LENGTH right_n_bits(16) #else size_t _size : 32; size_t _flags : 8; size_t _pos_idx : 8; size_t _bucket_idx: 16; -#define MAX_MALLOCSITE_TABLE_SIZE ((size_t)(1 << 16)) -#define MAX_BUCKET_LENGTH ((size_t)(1 << 8)) +#define MAX_MALLOCSITE_TABLE_SIZE right_n_bits(16) +#define MAX_BUCKET_LENGTH right_n_bits(8) #endif // _LP64 public:
--- a/test/runtime/NMT/MallocSiteHashOverflow.java Mon Nov 17 02:30:15 2014 -0800 +++ b/test/runtime/NMT/MallocSiteHashOverflow.java Mon Nov 17 16:36:09 2014 +0000 @@ -27,7 +27,6 @@ * @requires sun.arch.data.model == "32" * @key nmt jcmd stress * @library /testlibrary /testlibrary/whitebox - * @ignore 8062870 * @build MallocSiteHashOverflow * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow