| 1 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp |
| 2 |
--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 3 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 4 |
@@ -2659,7 +2659,7 @@ void CFLS_LAB::get_from_global_pool(size |
| 5 |
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) { |
| 6 |
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); |
| 7 |
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks; |
| 8 |
- n_blks = MIN2(n_blks, CMSOldPLABMax); |
| 9 |
+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax); |
| 10 |
} |
| 11 |
assert(n_blks > 0, "Error"); |
| 12 |
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); |
| 13 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp |
| 14 |
--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 15 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 16 |
@@ -951,7 +951,7 @@ void ConcurrentMarkSweepGeneration::comp |
| 17 |
if (free_percentage < desired_free_percentage) { |
| 18 |
size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); |
| 19 |
assert(desired_capacity >= capacity(), "invalid expansion size"); |
| 20 |
- size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes); |
| 21 |
+ size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t)MinHeapDeltaBytes); |
| 22 |
if (PrintGCDetails && Verbose) { |
| 23 |
size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); |
| 24 |
gclog_or_tty->print_cr("\nFrom compute_new_size: "); |
| 25 |
@@ -6569,7 +6569,7 @@ void CMSCollector::reset(bool asynch) { |
| 26 |
HeapWord* curAddr = _markBitMap.startWord(); |
| 27 |
while (curAddr < _markBitMap.endWord()) { |
| 28 |
size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); |
| 29 |
- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining)); |
| 30 |
+ MemRegion chunk(curAddr, MIN2((size_t)CMSBitMapYieldQuantum, remaining)); |
| 31 |
_markBitMap.clear_large_range(chunk); |
| 32 |
if (ConcurrentMarkSweepThread::should_yield() && |
| 33 |
!foregroundGCIsActive() && |
| 34 |
@@ -6868,7 +6868,7 @@ void CMSMarkStack::expand() { |
| 35 |
return; |
| 36 |
} |
| 37 |
// Double capacity if possible |
| 38 |
- size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax); |
| 39 |
+ size_t new_capacity = MIN2(_capacity*2, (size_t)MarkStackSizeMax); |
| 40 |
// Do not give up existing stack until we have managed to |
| 41 |
// get the double capacity that we desired. |
| 42 |
ReservedSpace rs(ReservedSpace::allocation_align_size_up( |
| 43 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp |
| 44 |
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 45 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 46 |
@@ -3891,7 +3891,7 @@ void CMTask::drain_local_queue(bool part |
| 47 |
// of things to do) or totally (at the very end). |
| 48 |
size_t target_size; |
| 49 |
if (partially) { |
| 50 |
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize); |
| 51 |
+ target_size = MIN2((size_t)(_task_queue->max_elems()/3), (size_t) GCDrainStackTargetSize); |
| 52 |
} else { |
| 53 |
target_size = 0; |
| 54 |
} |
| 55 |
@@ -4717,7 +4717,7 @@ size_t G1PrintRegionLivenessInfoClosure: |
| 56 |
// The > 0 check is to deal with the prev and next live bytes which |
| 57 |
// could be 0. |
| 58 |
if (*hum_bytes > 0) { |
| 59 |
- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes); |
| 60 |
+ bytes = MIN2(HeapRegion::GrainBytes, (size_t)*hum_bytes); |
| 61 |
*hum_bytes -= bytes; |
| 62 |
} |
| 63 |
return bytes; |
| 64 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp |
| 65 |
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 66 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 67 |
@@ -1737,7 +1737,7 @@ HeapWord* G1CollectedHeap::expand_and_al |
| 68 |
|
| 69 |
verify_region_sets_optional(); |
| 70 |
|
| 71 |
- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes); |
| 72 |
+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes); |
| 73 |
ergo_verbose1(ErgoHeapSizing, |
| 74 |
"attempt heap expansion", |
| 75 |
ergo_format_reason("allocation request failed") |
| 76 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp |
| 77 |
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.s390 2015-01-09 16:12:23.063809100 -0500 |
| 78 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-01-09 16:13:02.213809100 -0500 |
| 79 |
@@ -38,7 +38,7 @@ G1StringDedupQueue::G1StringDedupQueue() |
| 80 |
_cancel(false), |
| 81 |
_empty(true), |
| 82 |
_dropped(0) { |
| 83 |
- _nqueues = MAX2(ParallelGCThreads, (size_t)1); |
| 84 |
+ _nqueues = MAX2(ParallelGCThreads, (uintx)1); |
| 85 |
_queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC); |
| 86 |
for (size_t i = 0; i < _nqueues; i++) { |
| 87 |
new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size); |
| 88 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp |
| 89 |
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.s390 2015-01-09 16:13:29.713809100 -0500 |
| 90 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-01-09 16:13:57.713809100 -0500 |
| 91 |
@@ -110,7 +110,7 @@ public: |
| 92 |
}; |
| 93 |
|
| 94 |
G1StringDedupEntryCache::G1StringDedupEntryCache() { |
| 95 |
- _nlists = MAX2(ParallelGCThreads, (size_t)1); |
| 96 |
+ _nlists = MAX2(ParallelGCThreads, (uintx)1); |
| 97 |
_lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists); |
| 98 |
} |
| 99 |
|
| 100 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp |
| 101 |
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.s390 2015-01-09 16:14:57.193809100 -0500 |
| 102 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-01-09 16:15:41.163809100 -0500 |
| 103 |
@@ -147,7 +147,7 @@ void HeapRegion::setup_heap_region_size( |
| 104 |
if (FLAG_IS_DEFAULT(G1HeapRegionSize)) { |
| 105 |
size_t average_heap_size = (initial_heap_size + max_heap_size) / 2; |
| 106 |
region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(), |
| 107 |
- (uintx) HeapRegionBounds::min_size()); |
| 108 |
+ HeapRegionBounds::min_size()); |
| 109 |
} |
| 110 |
|
| 111 |
int region_size_log = log2_long((jlong) region_size); |
| 112 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp |
| 113 |
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 114 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2015-01-09 16:16:27.533809100 -0500 |
| 115 |
@@ -833,7 +833,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC |
| 116 |
// This can be done by either mutator threads together with the |
| 117 |
// concurrent refinement threads or GC threads. |
| 118 |
uint HeapRegionRemSet::num_par_rem_sets() { |
| 119 |
- return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (uint)ParallelGCThreads); |
| 120 |
+ return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads); |
| 121 |
} |
| 122 |
|
| 123 |
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa, |
| 124 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp |
| 125 |
--- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 126 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 127 |
@@ -910,8 +910,8 @@ void PSParallelCompact::initialize_space |
| 128 |
void PSParallelCompact::initialize_dead_wood_limiter() |
| 129 |
{ |
| 130 |
const size_t max = 100; |
| 131 |
- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0; |
| 132 |
- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0; |
| 133 |
+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0; |
| 134 |
+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0; |
| 135 |
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); |
| 136 |
DEBUG_ONLY(_dwl_initialized = true;) |
| 137 |
_dwl_adjustment = normal_distribution(1.0); |
| 138 |
diff -up jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp |
| 139 |
--- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 140 |
+++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 141 |
@@ -194,7 +194,7 @@ bool ParScanThreadState::take_from_overf |
| 142 |
const size_t num_overflow_elems = of_stack->size(); |
| 143 |
const size_t space_available = queue->max_elems() - queue->size(); |
| 144 |
const size_t num_take_elems = MIN3(space_available / 4, |
| 145 |
- ParGCDesiredObjsFromOverflowList, |
| 146 |
+ (size_t)ParGCDesiredObjsFromOverflowList, |
| 147 |
num_overflow_elems); |
| 148 |
// Transfer the most recent num_take_elems from the overflow |
| 149 |
// stack to our work queue. |
| 150 |
diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.s390 jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp |
| 151 |
--- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 152 |
+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-01-09 16:05:36.093809100 -0500 |
| 153 |
@@ -389,7 +389,7 @@ void TwoGenerationCollectorPolicy::initi |
| 154 |
uintx calculated_size = NewSize + OldSize; |
| 155 |
double shrink_factor = (double) MaxHeapSize / calculated_size; |
| 156 |
uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment); |
| 157 |
- FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size)); |
| 158 |
+ FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), (size_t)smaller_new_size)); |
| 159 |
_initial_gen0_size = NewSize; |
| 160 |
|
| 161 |
// OldSize is already aligned because above we aligned MaxHeapSize to |
| 162 |
@@ -437,7 +437,7 @@ void GenCollectorPolicy::initialize_size |
| 163 |
// yield a size that is too small) and bound it by MaxNewSize above. |
| 164 |
// Ergonomics plays here by previously calculating the desired |
| 165 |
// NewSize and MaxNewSize. |
| 166 |
- max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize); |
| 167 |
+ max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize), (size_t)MaxNewSize); |
| 168 |
} |
| 169 |
assert(max_new_size > 0, "All paths should set max_new_size"); |
| 170 |
|
| 171 |
@@ -459,24 +459,23 @@ void GenCollectorPolicy::initialize_size |
| 172 |
// lower limit. |
| 173 |
_min_gen0_size = NewSize; |
| 174 |
desired_new_size = NewSize; |
| 175 |
- max_new_size = MAX2(max_new_size, NewSize); |
| 176 |
+ max_new_size = MAX2(max_new_size, (size_t)NewSize); |
| 177 |
} else if (FLAG_IS_ERGO(NewSize)) { |
| 178 |
// If NewSize is set ergonomically, we should use it as a lower |
| 179 |
// limit, but use NewRatio to calculate the initial size. |
| 180 |
_min_gen0_size = NewSize; |
| 181 |
desired_new_size = |
| 182 |
- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize); |
| 183 |
- max_new_size = MAX2(max_new_size, NewSize); |
| 184 |
+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize); |
| 185 |
+ max_new_size = MAX2(max_new_size, (size_t)NewSize); |
| 186 |
} else { |
| 187 |
// For the case where NewSize is the default, use NewRatio |
| 188 |
// to size the minimum and initial generation sizes. |
| 189 |
// Use the default NewSize as the floor for these values. If |
| 190 |
// NewRatio is overly large, the resulting sizes can be too |
| 191 |
// small. |
| 192 |
- _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), NewSize); |
| 193 |
+ _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize); |
| 194 |
desired_new_size = |
| 195 |
- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize); |
| 196 |
- } |
| 197 |
+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize); } |
| 198 |
|
| 199 |
assert(_min_gen0_size > 0, "Sanity check"); |
| 200 |
_initial_gen0_size = desired_new_size; |
| 201 |
@@ -577,7 +576,7 @@ void TwoGenerationCollectorPolicy::initi |
| 202 |
} else { |
| 203 |
// It's been explicitly set on the command line. Use the |
| 204 |
// OldSize and then determine the consequences. |
| 205 |
- _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size); |
| 206 |
+ _min_gen1_size = MIN2((size_t)OldSize, _min_heap_byte_size - _min_gen0_size); |
| 207 |
_initial_gen1_size = OldSize; |
| 208 |
|
| 209 |
// If the user has explicitly set an OldSize that is inconsistent |
| 210 |
diff -up jdk8/hotspot/src/share/vm/memory/metaspace.cpp.s390 jdk8/hotspot/src/share/vm/memory/metaspace.cpp |
| 211 |
--- jdk8/hotspot/src/share/vm/memory/metaspace.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 212 |
+++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2015-01-09 16:18:54.233809100 -0500 |
| 213 |
@@ -1455,7 +1455,7 @@ void MetaspaceGC::initialize() { |
| 214 |
|
| 215 |
void MetaspaceGC::post_initialize() { |
| 216 |
// Reset the high-water mark once the VM initialization is done. |
| 217 |
- _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize); |
| 218 |
+ _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t)MetaspaceSize); |
| 219 |
} |
| 220 |
|
| 221 |
bool MetaspaceGC::can_expand(size_t word_size, bool is_class) { |
| 222 |
@@ -1515,7 +1515,7 @@ void MetaspaceGC::compute_new_size() { |
| 223 |
(size_t)MIN2(min_tmp, double(max_uintx)); |
| 224 |
// Don't shrink less than the initial generation size |
| 225 |
minimum_desired_capacity = MAX2(minimum_desired_capacity, |
| 226 |
- MetaspaceSize); |
| 227 |
+ (size_t)MetaspaceSize); |
| 228 |
|
| 229 |
if (PrintGCDetails && Verbose) { |
| 230 |
gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: "); |
| 231 |
@@ -1573,7 +1573,7 @@ void MetaspaceGC::compute_new_size() { |
| 232 |
const double max_tmp = used_after_gc / minimum_used_percentage; |
| 233 |
size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx)); |
| 234 |
maximum_desired_capacity = MAX2(maximum_desired_capacity, |
| 235 |
- MetaspaceSize); |
| 236 |
+ (size_t)MetaspaceSize); |
| 237 |
if (PrintGCDetails && Verbose) { |
| 238 |
gclog_or_tty->print_cr(" " |
| 239 |
" maximum_free_percentage: %6.2f" |
| 240 |
@@ -3235,7 +3235,7 @@ void Metaspace::global_initialize() { |
| 241 |
// on the medium chunk list. The next chunk will be small and progress |
| 242 |
// from there. This size calculated by -version. |
| 243 |
_first_class_chunk_word_size = MIN2((size_t)MediumChunk*6, |
| 244 |
- (CompressedClassSpaceSize/BytesPerWord)*2); |
| 245 |
+ (size_t)(CompressedClassSpaceSize/BytesPerWord)*2); |
| 246 |
_first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size); |
| 247 |
// Arbitrarily set the initial virtual space to a multiple |
| 248 |
// of the boot class loader size. |
| 249 |
diff -up jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.s390 jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp |
| 250 |
--- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 251 |
+++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 252 |
@@ -238,7 +238,7 @@ size_t ThreadLocalAllocBuffer::initial_d |
| 253 |
size_t init_sz; |
| 254 |
|
| 255 |
if (TLABSize > 0) { |
| 256 |
- init_sz = MIN2(TLABSize / HeapWordSize, max_size()); |
| 257 |
+ init_sz = MIN2((size_t)(TLABSize / HeapWordSize), max_size()); |
| 258 |
} else if (global_stats() == NULL) { |
| 259 |
// Startup issue - main thread initialized before heap initialized. |
| 260 |
init_sz = min_size(); |
| 261 |
diff -up jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.s390 jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp |
| 262 |
--- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 263 |
+++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-01-09 15:57:32.423809100 -0500 |
| 264 |
@@ -48,7 +48,7 @@ void ObjArrayKlass::objarray_follow_cont |
| 265 |
const size_t beg_index = size_t(index); |
| 266 |
assert(beg_index < len || len == 0, "index too large"); |
| 267 |
|
| 268 |
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); |
| 269 |
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride); |
| 270 |
const size_t end_index = beg_index + stride; |
| 271 |
T* const base = (T*)a->base(); |
| 272 |
T* const beg = base + beg_index; |
| 273 |
@@ -82,7 +82,7 @@ void ObjArrayKlass::objarray_follow_cont |
| 274 |
const size_t beg_index = size_t(index); |
| 275 |
assert(beg_index < len || len == 0, "index too large"); |
| 276 |
|
| 277 |
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); |
| 278 |
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride); |
| 279 |
const size_t end_index = beg_index + stride; |
| 280 |
T* const base = (T*)a->base(); |
| 281 |
T* const beg = base + beg_index; |
| 282 |
diff -up jdk8/hotspot/src/share/vm/runtime/arguments.cpp.s390 jdk8/hotspot/src/share/vm/runtime/arguments.cpp |
| 283 |
--- jdk8/hotspot/src/share/vm/runtime/arguments.cpp.s390 2014-10-23 18:32:14.000000000 -0400 |
| 284 |
+++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2015-01-09 15:57:32.423809100 -0500 |
| 285 |
@@ -1250,7 +1250,7 @@ void Arguments::set_cms_and_parnew_gc_fl |
| 286 |
// NewSize was set on the command line and it is larger than |
| 287 |
// preferred_max_new_size. |
| 288 |
if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line |
| 289 |
- FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size)); |
| 290 |
+ FLAG_SET_ERGO(uintx, MaxNewSize, MAX2((size_t)NewSize, preferred_max_new_size)); |
| 291 |
} else { |
| 292 |
FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size); |
| 293 |
} |
| 294 |
@@ -1275,8 +1275,8 @@ void Arguments::set_cms_and_parnew_gc_fl |
| 295 |
// Unless explicitly requested otherwise, make young gen |
| 296 |
// at least min_new, and at most preferred_max_new_size. |
| 297 |
if (FLAG_IS_DEFAULT(NewSize)) { |
| 298 |
- FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new)); |
| 299 |
- FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize)); |
| 300 |
+ FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t)NewSize, min_new)); |
| 301 |
+ FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize)); |
| 302 |
if (PrintGCDetails && Verbose) { |
| 303 |
// Too early to use gclog_or_tty |
| 304 |
tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize); |
| 305 |
@@ -1286,7 +1286,7 @@ void Arguments::set_cms_and_parnew_gc_fl |
| 306 |
// so it's NewRatio x of NewSize. |
| 307 |
if (FLAG_IS_DEFAULT(OldSize)) { |
| 308 |
if (max_heap > NewSize) { |
| 309 |
- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize)); |
| 310 |
+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize)); |
| 311 |
if (PrintGCDetails && Verbose) { |
| 312 |
// Too early to use gclog_or_tty |
| 313 |
tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize); |
Parent Directory
| 
Revision Log