ubsan shift fixes

include/core/SkFixed.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFixed_DEFINED
 #define SkFixed_DEFINED
 
@@ skipping 70 matching lines @@
 
 #define SkFixedAbs(x)       SkAbs32(x)
 #define SkFixedAve(a, b)    (((a) + (b)) >> 1)
 
 // Blink layout tests are baselined to Clang optimizing through undefined behavior in SkDivBits.
 #if defined(SK_SUPPORT_LEGACY_DIVBITS_UB)
     #define SkFixedDiv(numer, denom) SkDivBits(numer, denom, 16)
 #else
     // TODO(reed): this clamp shouldn't be needed.  Use SkToS32().
     #define SkFixedDiv(numer, denom) \
-        SkTPin<int32_t>(((int64_t)numer << 16) / denom, SK_MinS32, SK_MaxS32)
+        SkTPin<int32_t>((int32_t)(SkLeftShift((int64_t)numer, 16) / denom), SK_MinS32, SK_MaxS32)
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Now look for ASM overrides for our portable versions (should consider putting this in its own file)
 
 inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b) {
     return (SkFixed)((int64_t)a * b >> 16);
 }
 #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
 
@@ skipping 36 matching lines @@
     #define SkFixedMul(x, y)        SkFixedMul_arm(x, y)
 
     #undef SkFloatToFixed
     #define SkFloatToFixed(x)  SkFloatToFixed_arm(x)
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef int64_t SkFixed3232;   // 32.32
 
-#define SkIntToFixed3232(x)       ((SkFixed3232)(x) << 32)
+#define SkIntToFixed3232(x)       (SkLeftShift((SkFixed3232)(x), 32))
 #define SkFixed3232ToInt(x)       ((int)((x) >> 32))
-#define SkFixedToFixed3232(x)     ((SkFixed3232)(x) << 16)
+#define SkFixedToFixed3232(x)     (SkLeftShift((SkFixed3232)(x), 16))
 #define SkFixed3232ToFixed(x)     ((SkFixed)((x) >> 16))
 #define SkFloatToFixed3232(x)     ((SkFixed3232)((x) * (65536.0f * 65536.0f)))
 
 #define SkScalarToFixed3232(x)    SkFloatToFixed3232(x)
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // 64bits wide, with a 16bit bias. Useful when accumulating lots of 16.16 so
 // we don't overflow along the way
 typedef int64_t Sk48Dot16;
 
 #define Sk48Dot16FloorToInt(x)    static_cast<int>((x) >> 16)
 
 static inline float Sk48Dot16ToScalar(Sk48Dot16 x) {
     return static_cast<float>(x * 1.5258789e-5);  // x * (1.0f / (1 << 16))
 }
 #define SkFloatTo48Dot16(x)       (static_cast<Sk48Dot16>((x) * (1 << 16)))
 
 #define SkScalarTo48Dot16(x)      SkFloatTo48Dot16(x)
 
 #endif