LSC: Mark static const class/struct members as constexpr. This change fixes declarations that have initial values but are technically not definitions by marking them constexpr (which counts as a definition). This enables, among other things, the modified constants to be passed into functions and function templates that accept arguments by reference. Without this change, such functions would cause linker errors.
This change was approved as part of go/static-const-lsc.
Tested:
TAP --sample ran all affected tests and none failed
http://test/OCL:306267456:BASE:306358834:1586841679820:8a4004b4
PiperOrigin-RevId: 306441151
Change-Id: I08ca761948d281d7f5a7609576178793287673ff
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc
index 25fcccd..bb79ccf 100644
--- a/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -1033,7 +1033,7 @@
// Receiver
class MultiSenderTopologyParams {
public:
- static const size_t kNumLocalLinks = 8;
+ static constexpr size_t kNumLocalLinks = 8;
std::array<LinkParams, kNumLocalLinks> local_links = {
LinkParams(10000, 1987), LinkParams(10000, 1993), LinkParams(10000, 1997),
LinkParams(10000, 1999), LinkParams(10000, 2003), LinkParams(10000, 2011),
diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc
index 9395a70..6f92345 100644
--- a/quic/core/http/quic_headers_stream_test.cc
+++ b/quic/core/http/quic_headers_stream_test.cc
@@ -350,8 +350,8 @@
return next_promised_stream_id_ += next_stream_id_;
}
- static const bool kFrameComplete = true;
- static const bool kHasPriority = true;
+ static constexpr bool kFrameComplete = true;
+ static constexpr bool kHasPriority = true;
MockQuicConnectionHelper helper_;
MockAlarmFactory alarm_factory_;
diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 1507ae5..98e86c3 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -282,7 +282,7 @@
n * 2;
}
- static const QuicStreamOffset kOffset = 0u;
+ static constexpr QuicStreamOffset kOffset = 0u;
char buffer_[kMaxOutgoingPacketSize];
QuicConnectionId connection_id_;
