archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8221408: Windows 32bit build build errors/warnings in hotspot

Browse source 
Reviewed-by: kbarrett, dholmes
This commit is contained in:
Thomas Stuefe 2019-03-29 08:36:33 +01:00
parent 88db8649df
commit 02ed0e3e52
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
View file

@ -465,6 +465,9 @@ frame os::get_sender_for_C_frame(frame* fr) {
} }
#ifndef AMD64 #ifndef AMD64
// Ignore "C4172: returning address of local variable or temporary" on 32bit
PRAGMA_DIAG_PUSH
PRAGMA_DISABLE_MSVC_WARNING(4172)
// Returns an estimate of the current stack pointer. Result must be guaranteed // Returns an estimate of the current stack pointer. Result must be guaranteed
// to point into the calling threads stack, and be no lower than the current // to point into the calling threads stack, and be no lower than the current
// stack pointer. // stack pointer.
@ -473,6 +476,7 @@ address os::current_stack_pointer() {
address sp = (address)&dummy; address sp = (address)&dummy;
return sp; return sp;
} }
PRAGMA_DIAG_POP
#else #else
// Returns the current stack pointer. Accurate value needed for // Returns the current stack pointer. Accurate value needed for
// os::verify_stack_alignment(). // os::verify_stack_alignment().

2
src/hotspot/share/classfile/classFileParser.cpp
View file

@ -312,7 +312,7 @@ void ClassFileParser::parse_constant_pool_entries(const ClassFileStream* const s
const char* const str = java_lang_String::as_utf8_string(patch()); const char* const str = java_lang_String::as_utf8_string(patch());
// (could use java_lang_String::as_symbol instead, but might as well batch them) // (could use java_lang_String::as_symbol instead, but might as well batch them)
utf8_buffer = (const u1*) str; utf8_buffer = (const u1*) str;
utf8_length = (int) strlen(str); utf8_length = (u2) strlen(str);
} }
unsigned int hash; unsigned int hash;

14
src/hotspot/share/oops/markOop.hpp
View file

@ -138,23 +138,15 @@ class markOopDesc: public oopDesc {
epoch_mask_in_place = epoch_mask << epoch_shift, epoch_mask_in_place = epoch_mask << epoch_shift,
cms_mask = right_n_bits(cms_bits), cms_mask = right_n_bits(cms_bits),
cms_mask_in_place = cms_mask << cms_shift cms_mask_in_place = cms_mask << cms_shift
#ifndef _WIN64
,hash_mask = right_n_bits(hash_bits),
hash_mask_in_place = (address_word)hash_mask << hash_shift
#endif
}; };
const static uintptr_t hash_mask = right_n_bits(hash_bits);
const static uintptr_t hash_mask_in_place = hash_mask << hash_shift;
// Alignment of JavaThread pointers encoded in object header required by biased locking // Alignment of JavaThread pointers encoded in object header required by biased locking
enum { biased_lock_alignment = 2 << (epoch_shift + epoch_bits) enum { biased_lock_alignment = 2 << (epoch_shift + epoch_bits)
}; };
#ifdef _WIN64
// These values are too big for Win64
const static uintptr_t hash_mask = right_n_bits(hash_bits);
const static uintptr_t hash_mask_in_place =
(address_word)hash_mask << hash_shift;
#endif
enum { locked_value = 0, enum { locked_value = 0,
unlocked_value = 1, unlocked_value = 1,
monitor_value = 2, monitor_value = 2,