Fix -Wreorder-init-list warnings in metrics code
This CL fixes a few instances of 'reorder-init-list' warnings
within the ART codebase - in practice the code is already
working as intended (the warning message says the offending
field will be initialized after another field, respecting the
order of the fields in the declaration), but it's good to
remove a bit of noise during the compilation process.
Bug: 304475286
Test: m | grep 'reorder-init-list' | grep 'art' (with 0 matches)
Change-Id: I216b2cf146d1e71693a32eb53fca33f04dcb153c
diff --git a/libartbase/base/metrics/metrics_common.cc b/libartbase/base/metrics/metrics_common.cc
index 1f92d8d..7b8c2c4 100644
--- a/libartbase/base/metrics/metrics_common.cc
+++ b/libartbase/base/metrics/metrics_common.cc
@@ -50,10 +50,10 @@
#endif
return SessionData{
- .compilation_reason = CompilationReason::kUnknown,
- .compiler_filter = CompilerFilterReporting::kUnknown,
- .session_id = kInvalidSessionId,
- .uid = uid,
+ .session_id = kInvalidSessionId,
+ .uid = uid,
+ .compilation_reason = CompilationReason::kUnknown,
+ .compiler_filter = CompilerFilterReporting::kUnknown,
};
}
diff --git a/runtime/metrics/reporter.cc b/runtime/metrics/reporter.cc
index 6fc1a14..1c706af 100644
--- a/runtime/metrics/reporter.cc
+++ b/runtime/metrics/reporter.cc
@@ -293,12 +293,12 @@
return {
.dump_to_logcat = gFlags.MetricsWriteToLogcat(),
- .dump_to_file = gFlags.MetricsWriteToFile.GetValueOptional(),
.dump_to_statsd = gFlags.MetricsWriteToStatsd(),
+ .dump_to_file = gFlags.MetricsWriteToFile.GetValueOptional(),
.metrics_format = gFlags.MetricsFormat(),
.period_spec = period_spec,
- .reporting_num_mods = reporting_num_mods,
.reporting_mods = reporting_mods,
+ .reporting_num_mods = reporting_num_mods,
};
}