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

7036021: G1: build failure on win64 and linux with hs21 in jdk6 build environment

Browse Source 
Missing parentheses around a casted expression and some missing casts were causing build failures with the jdk6 build tools.

Reviewed-by: kvn, brutisso
This commit is contained in:
John Cuthbertson 2011-04-15 10:10:50 -07:00
parent 3a33c2639e
commit f603d437be
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
View File

@ -172,7 +172,7 @@ class ConcurrentG1Refine: public CHeapObj {
// hash a given key (index of card_ptr) with the specified size // hash a given key (index of card_ptr) with the specified size
static unsigned int hash(size_t key, size_t size) { static unsigned int hash(size_t key, size_t size) {
return (unsigned int) key % size; return (unsigned int) (key % size);
} }
// hash a given key (index of card_ptr) // hash a given key (index of card_ptr)
@ -180,11 +180,11 @@ class ConcurrentG1Refine: public CHeapObj {
return hash(key, _n_card_counts); return hash(key, _n_card_counts);
} }
unsigned ptr_2_card_num(jbyte* card_ptr) { unsigned int ptr_2_card_num(jbyte* card_ptr) {
return (unsigned) (card_ptr - _ct_bot); return (unsigned int) (card_ptr - _ct_bot);
} }
jbyte* card_num_2_ptr(unsigned card_num) { jbyte* card_num_2_ptr(unsigned int card_num) {
return (jbyte*) (_ct_bot + card_num); return (jbyte*) (_ct_bot + card_num);
} }

4
hotspot/src/share/vm/opto/library_call.cpp
View File

@ -2193,7 +2193,7 @@ void LibraryCallKit::insert_g1_pre_barrier(Node* base_oop, Node* offset, Node* p
// Use the pre-barrier to record the value in the referent field // Use the pre-barrier to record the value in the referent field
pre_barrier(false /* do_load */, pre_barrier(false /* do_load */,
__ ctrl(), __ ctrl(),
NULL /* obj */, NULL /* adr */, -1 /* alias_idx */, NULL /* val */, NULL /* val_type */, NULL /* obj */, NULL /* adr */, max_juint /* alias_idx */, NULL /* val */, NULL /* val_type */,
pre_val /* pre_val */, pre_val /* pre_val */,
T_OBJECT); T_OBJECT);
@ -5419,7 +5419,7 @@ bool LibraryCallKit::inline_reference_get() {
// Use the pre-barrier to record the value in the referent field // Use the pre-barrier to record the value in the referent field
pre_barrier(false /* do_load */, pre_barrier(false /* do_load */,
control(), control(),
NULL /* obj */, NULL /* adr */, -1 /* alias_idx */, NULL /* val */, NULL /* val_type */, NULL /* obj */, NULL /* adr */, max_juint /* alias_idx */, NULL /* val */, NULL /* val_type */,
result /* pre_val */, result /* pre_val */,
T_OBJECT); T_OBJECT);