Index: webrtc/common_audio/vad/vad_core.c diff --git a/webrtc/common_audio/vad/vad_core.c b/webrtc/common_audio/vad/vad_core.c index 0340165eb5050ec9fbc386f6d373d0d90a4868f1..1a3889c36787f7bf993692e8fe7781c2ae35e2c2 100644 --- a/webrtc/common_audio/vad/vad_core.c +++ b/webrtc/common_audio/vad/vad_core.c @@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset, // undefined behavior, so not a good idea; this just makes UBSan ignore the // violation, so that our old code can continue to do what it's always been // doing.) -static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) - RTC_NO_SANITIZE("signed-integer-overflow") { +static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") + OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) { return a * b; } Index: webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c index 039bbc8af7ec26e286dfc94b4383428e5e6e863b..dc8bcf3f481012caab8718430aa9242cf91ad480 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c @@ -193,16 +193,16 @@ static void CalcCorrelation(int32_t *PSpecQ12, int32_t *CorrQ7) // undefined behavior, so not a good idea; this just makes UBSan ignore the // violations, so that our old code can continue to do what it's always been // doing.) -static inline int32_t OverflowingMulS16S32ToS32(int16_t a, int32_t b) - RTC_NO_SANITIZE("signed-integer-overflow") { +static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") + OverflowingMulS16S32ToS32(int16_t a, int32_t b) { return a * b; } -static inline int32_t OverflowingAddS32S32ToS32(int32_t a, int32_t b) - RTC_NO_SANITIZE("signed-integer-overflow") { +static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") + OverflowingAddS32S32ToS32(int32_t a, int32_t b) { return a + b; } -static inline int32_t OverflowingSubS32S32ToS32(int32_t a, int32_t b) - RTC_NO_SANITIZE("signed-integer-overflow") { +static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") + OverflowingSubS32S32ToS32(int32_t a, int32_t b) { return a - b; } Index: webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c index 2b92acb64a3d7dd268574abb57a24850b60cb3d1..b69a885f34de9eaa762a69f11d84cc8bec637376 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c @@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef, // Left shift of an int32_t that's allowed to overflow. (It's still undefined // behavior, so not a good idea; this just makes UBSan ignore the violation, so // that our old code can continue to do what it's always been doing.) -static inline int32_t OverflowingLShiftS32(int32_t x, int shift) - RTC_NO_SANITIZE("shift") { +static inline int32_t RTC_NO_SANITIZE("shift") + OverflowingLShiftS32(int32_t x, int shift) { return x << shift; }