Skip to content

8313882: Fix -Wconversion warnings in runtime code #15177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

8313882: Fix -Wconversion warnings in runtime code #15177

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bfeaafc
Fix relocator.cpp
coleenp Aug 1, 2023
3d668be
Fix objectMonitor.hpp - monitor_value is 2
coleenp Aug 1, 2023
b413244
Fix java.cpp
coleenp Aug 2, 2023
4186fee
Fixed sharedRuntime.cpp
coleenp Aug 2, 2023
20545c8
Fix arguments.cpp
coleenp Aug 2, 2023
4421daf
Fixed synchronizer.cpp by fixing _held_monitor_count and _jni_monitor…
coleenp Aug 3, 2023
c6ecce8
Fix deoptimization.cpp (size_of_frames is used to assign to _total_fr…
coleenp Aug 3, 2023
18e3f67
Fix continuationFreezeThaw.cpp
coleenp Aug 3, 2023
070e905
Fix signature.cpp
coleenp Aug 3, 2023
d086870
Fix asserted files in runtime with one warning.
coleenp Aug 3, 2023
48a306f
Fix gtests
coleenp Aug 3, 2023
12295ba
Fix format strings for monitor_counts and fix arguments.cpp differently.
coleenp Aug 4, 2023
4eeeb16
Fix jvmci for held_monitor_count type.
coleenp Aug 4, 2023
a77884e
Make bytecode.hpp index() functions return u2 not long.
coleenp Aug 8, 2023
1af1cfe
Dean's and Patricio's suggested changes.
coleenp Aug 9, 2023
512daa1
Change Arguments::parse_uintx to parse_uint and callers.
coleenp Aug 9, 2023
f496165
Merge branch 'master' into runtime-conversion
coleenp Aug 9, 2023
4366563
Revert histogram sum and weighted_sum changes.
coleenp Aug 9, 2023
51e7190
put checked_cast around getc().
coleenp Aug 9, 2023
17eaec5
put checked_cast around getc().
coleenp Aug 9, 2023
e254b2d
Put arguments back to the tested version.
coleenp Aug 9, 2023
0e21a92
Add a checked_cast.
coleenp Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/hotspot/share/runtime/sharedRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2343,22 +2343,22 @@ class MethodArityHistogram {

void print_histogram_helper(int n, uint64_t* histo, const char* name) {
const int N = MIN2(9, n);
uint64_t sum = 0;
uint64_t weighted_sum = 0;
for (int i = 0; i <= n; i++) { sum += histo[i]; weighted_sum += (i*histo[i]); }
double sum = 0;
double weighted_sum = 0;
for (int i = 0; i <= n; i++) { sum += (double)histo[i]; weighted_sum += (double)(i*histo[i]); }
if (sum >= 1) { // prevent divide by zero or divide overflow
uint64_t rest = sum;
double percent = (double)sum / 100;
double rest = sum;
double percent = sum / 100;
for (int i = 0; i <= N; i++) {
rest -= histo[i];
rest -= (double)histo[i];
tty->print_cr("%4d: " UINT64_FORMAT_W(12) " (%5.1f%%)", i, histo[i], (double)histo[i] / percent);
}
tty->print_cr("rest: " INT64_FORMAT_W(12) " (%5.1f%%)", rest, (double)rest / percent);
tty->print_cr("(avg. %s = %3.1f, max = %d)", name, (double)weighted_sum / (double)sum, n);
tty->print_cr("rest: " INT64_FORMAT_W(12) " (%5.1f%%)", (int64_t)rest, rest / percent);
tty->print_cr("(avg. %s = %3.1f, max = %d)", name, weighted_sum / sum, n);
tty->print_cr("(total # of compiled calls = " INT64_FORMAT_W(14) ")", _total_compiled_calls);
tty->print_cr("(max # of compiled calls = " INT64_FORMAT_W(14) ")", _max_compiled_calls_per_method);
} else {
tty->print_cr("Histogram generation failed for %s. n = %d, sum = %zu", name, n, sum);
tty->print_cr("Histogram generation failed for %s. n = %d, sum = %7.5f", name, n, sum);
}
}

Expand Down