# HG changeset patch # User goetz # Date 1447842719 -3600 # Node ID e81619fb4f767c9987192c8890e01fd6a0c4a5a6 # Parent 4da64841abd7f1ffb6217c6b23bb160d5633cdc0 8143215: gcc 4.1.2: fix three issues breaking the build. diff --git a/src/share/vm/gc/g1/concurrentG1RefineThread.cpp b/src/share/vm/gc/g1/concurrentG1RefineThread.cpp --- a/src/share/vm/gc/g1/concurrentG1RefineThread.cpp +++ b/src/share/vm/gc/g1/concurrentG1RefineThread.cpp @@ -199,4 +199,4 @@ void ConcurrentG1RefineThread::stop_service() { MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag); _monitor->notify(); -} \ No newline at end of file +} diff --git a/src/share/vm/gc/g1/g1CollectorPolicy.cpp b/src/share/vm/gc/g1/g1CollectorPolicy.cpp --- a/src/share/vm/gc/g1/g1CollectorPolicy.cpp +++ b/src/share/vm/gc/g1/g1CollectorPolicy.cpp @@ -476,7 +476,7 @@ // (100 + TargetPLABWastePct) represents the increase in expected bytes during // copying due to anticipated waste in the PLABs. double safety_factor = (100.0 / G1ConfidencePercent) * (100 + TargetPLABWastePct) / 100.0; - size_t expected_bytes_to_copy = safety_factor * bytes_to_copy; + size_t expected_bytes_to_copy = (size_t)(safety_factor * bytes_to_copy); if (expected_bytes_to_copy > free_bytes) { // end condition 3: out-of-space @@ -523,7 +523,7 @@ } void G1CollectorPolicy::update_young_list_max_and_target_length() { - update_young_list_max_and_target_length(get_new_prediction(_rs_lengths_seq)); + update_young_list_max_and_target_length((size_t)get_new_prediction(_rs_lengths_seq)); } void G1CollectorPolicy::update_young_list_max_and_target_length(size_t rs_lengths) { @@ -536,7 +536,7 @@ } void G1CollectorPolicy::update_young_list_target_length() { - update_young_list_target_length(get_new_prediction(_rs_lengths_seq)); + update_young_list_target_length((size_t)get_new_prediction(_rs_lengths_seq)); } uint G1CollectorPolicy::bounded_young_list_target_length(size_t rs_lengths) const { @@ -726,7 +726,7 @@ } void G1CollectorPolicy::update_rs_lengths_prediction() { - update_rs_lengths_prediction(get_new_prediction(_rs_lengths_seq)); + update_rs_lengths_prediction((size_t)get_new_prediction(_rs_lengths_seq)); } void G1CollectorPolicy::update_rs_lengths_prediction(size_t prediction) {