# HG changeset patch

diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h

--- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h

+++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h

@@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo

         case kBottomRight_SkEncodedOrigin: return SkMatrix::MakeAll(-1,  0, w,  0, -1, h, 0, 0, 1);

         case  kBottomLeft_SkEncodedOrigin: return SkMatrix::MakeAll( 1,  0, 0,  0, -1, h, 0, 0, 1);

         case     kLeftTop_SkEncodedOrigin: return SkMatrix::MakeAll( 0,  1, 0,  1,  0, 0, 0, 0, 1);

         case    kRightTop_SkEncodedOrigin: return SkMatrix::MakeAll( 0, -1, w,  1,  0, 0, 0, 0, 1);

         case kRightBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0, -1, w, -1,  0, h, 0, 0, 1);

         case  kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0,  1, 0, -1,  0, h, 0, 0, 1);

     }

     SK_ABORT("Unexpected origin");

+    SkUNREACHABLE;

 }

 /**

  * Return true if the encoded origin includes a 90 degree rotation, in which case the width

  * and height of the source data are swapped relative to a correctly oriented destination.

  */

 static inline bool SkEncodedOriginSwapsWidthHeight(SkEncodedOrigin origin) {

     return origin >= kLeftTop_SkEncodedOrigin;

diff --git a/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h b/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h

--- a/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h

+++ b/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h

@@ -320,16 +320,17 @@ static inline bool GrTextureTypeHasRestr

             return false;

         case GrTextureType::kRectangle:

             return true;

         case GrTextureType::kExternal:

             return true;

         default:

             SK_ABORT("Unexpected texture type");

     }

+    SkUNREACHABLE;

 }

 //////////////////////////////////////////////////////////////////////////////

 /**

  * Types used to describe format of vertices in arrays.

  */

 enum GrVertexAttribType {

diff --git a/gfx/skia/skia/src/core/SkDescriptor.cpp b/gfx/skia/skia/src/core/SkDescriptor.cpp

--- a/gfx/skia/skia/src/core/SkDescriptor.cpp

+++ b/gfx/skia/skia/src/core/SkDescriptor.cpp

@@ -21,16 +21,17 @@ std::unique_ptr<SkDescriptor> SkDescript

     SkASSERT(length >= sizeof(SkDescriptor) && SkAlign4(length) == length);

     void* allocation = ::operator new(length);

     return std::unique_ptr<SkDescriptor>(new (allocation) SkDescriptor{});

 }

 void SkDescriptor::operator delete(void* p) { ::operator delete(p); }

 void* SkDescriptor::operator new(size_t) {

     SK_ABORT("Descriptors are created with placement new.");

+    SkUNREACHABLE;

 }

 void SkDescriptor::flatten(SkWriteBuffer& buffer) const {

     buffer.writePad32(static_cast<const void*>(this), this->fLength);

 }

 void* SkDescriptor::addEntry(uint32_t tag, size_t length, const void* data) {

     SkASSERT(tag);

diff --git a/gfx/skia/skia/src/core/SkGeometry.h b/gfx/skia/skia/src/core/SkGeometry.h

--- a/gfx/skia/skia/src/core/SkGeometry.h

+++ b/gfx/skia/skia/src/core/SkGeometry.h

@@ -276,28 +276,30 @@ static inline bool SkCubicIsDegenerate(S

         case SkCubicType::kLocalCusp:

         case SkCubicType::kCuspAtInfinity:

             return false;

         case SkCubicType::kQuadratic:

         case SkCubicType::kLineOrPoint:

             return true;

     }

     SK_ABORT("Invalid SkCubicType");

+    SkUNREACHABLE;

 }

 static inline const char* SkCubicTypeName(SkCubicType type) {

     switch (type) {

         case SkCubicType::kSerpentine: return "kSerpentine";

         case SkCubicType::kLoop: return "kLoop";

         case SkCubicType::kLocalCusp: return "kLocalCusp";

         case SkCubicType::kCuspAtInfinity: return "kCuspAtInfinity";

         case SkCubicType::kQuadratic: return "kQuadratic";

         case SkCubicType::kLineOrPoint: return "kLineOrPoint";

     }

     SK_ABORT("Invalid SkCubicType");

+    SkUNREACHABLE;

 }

 /** Returns the cubic classification.

     t[],s[] are set to the two homogeneous parameter values at which points the lines L & M

     intersect with K, sorted from smallest to largest and oriented so positive values of the

     implicit are on the "left" side. For a serpentine curve they are the inflection points. For a

     loop they are the double point. For a local cusp, they are both equal and denote the cusp point.

diff --git a/gfx/skia/skia/src/core/SkTextBlob.cpp b/gfx/skia/skia/src/core/SkTextBlob.cpp

--- a/gfx/skia/skia/src/core/SkTextBlob.cpp

+++ b/gfx/skia/skia/src/core/SkTextBlob.cpp

@@ -199,16 +199,17 @@ unsigned SkTextBlob::ScalarsPerGlyph(Gly

 }

 void SkTextBlob::operator delete(void* p) {

     sk_free(p);

 }

 void* SkTextBlob::operator new(size_t) {

     SK_ABORT("All blobs are created by placement new.");

+    SkUNREACHABLE;

 }

 void* SkTextBlob::operator new(size_t, void* p) {

     return p;

 }

 SkTextBlobRunIterator::SkTextBlobRunIterator(const SkTextBlob* blob)

     : fCurrentRun(SkTextBlob::RunRecord::First(blob)) {

diff --git a/gfx/skia/skia/src/core/SkTypeface_remote.h b/gfx/skia/skia/src/core/SkTypeface_remote.h

--- a/gfx/skia/skia/src/core/SkTypeface_remote.h

+++ b/gfx/skia/skia/src/core/SkTypeface_remote.h

@@ -90,83 +90,97 @@ public:

     SkTypefaceID remoteTypefaceID() const {return fTypefaceID;}

     int glyphCount() const {return fGlyphCount;}

     bool isLogging() const {return fIsLogging;}

 protected:

-    int onGetUPEM() const override { SK_ABORT("Should never be called."); }

+    int onGetUPEM() const override { SK_ABORT("Should never be called."); SkUNREACHABLE; }

     std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     bool onGlyphMaskNeedsCurrentColor() const override {

         return fGlyphMaskNeedsCurrentColor;

     }

     int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],

                                      int coordinateCount) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],

                                        int parameterCount) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     void onGetFamilyName(SkString* familyName) const override {

         // Used by SkStrikeCache::DumpMemoryStatistics.

         *familyName = "";

     }

     bool onGetPostScriptName(SkString*) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     int onGetTableTags(SkFontTableTag tags[]) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     std::unique_ptr<SkScalerContext> onCreateScalerContext(

         const SkScalerContextEffects& effects, const SkDescriptor* desc) const override

     {

         return std::make_unique<SkScalerContextProxy>(

                 sk_ref_sp(const_cast<SkTypefaceProxy*>(this)), effects, desc, fDiscardableManager);

     }

     void onFilterRec(SkScalerContextRec* rec) const override {

         // The rec filtering is already applied by the server when generating

         // the glyphs.

     }

     void onGetFontDescriptor(SkFontDescriptor*, bool*) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     void getGlyphToUnicodeMap(SkUnichar*) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     void getPostScriptGlyphNames(SkString*) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     void onCharsToGlyphs(const SkUnichar* chars, int count, SkGlyphID glyphs[]) const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

     int onCountGlyphs() const override {

         return this->glyphCount();

     }

     void* onGetCTFontRef() const override {

         SK_ABORT("Should never be called.");

+        SkUNREACHABLE;

     }

 private:

     const SkTypefaceID                              fTypefaceID;

     const int                                       fGlyphCount;

     const bool                                      fIsLogging;

     const bool                                      fGlyphMaskNeedsCurrentColor;

     sk_sp<SkStrikeClient::DiscardableHandleManager> fDiscardableManager;

diff --git a/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp b/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp

--- a/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp

+++ b/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp

@@ -810,16 +810,17 @@ sk_sp<SkSpecialImage> cpu_blur(

         SkASSERT(0 <= sigma && sigma <= 2183); // should be guaranteed after map_sigma

         if (PassMaker* maker = GaussPass::MakeMaker(sigma, &alloc)) {

             return maker;

         }

         if (PassMaker* maker = TentPass::MakeMaker(sigma, &alloc)) {

             return maker;

         }

         SK_ABORT("Sigma is out of range.");

+        SkUNREACHABLE;

     };

     PassMaker* makerX = makeMaker(sigma.x());

     PassMaker* makerY = makeMaker(sigma.y());

     if (makerX->window() <= 1 && makerY->window() <= 1) {

         return copy_image_with_bounds(ctx, input, srcBounds, dstBounds);

     }

diff --git a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp

--- a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp

+++ b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp

@@ -64,16 +64,17 @@ int SkFontMgr_Indirect::onCountFamilies(

 }

 void SkFontMgr_Indirect::onGetFamilyName(int index, SkString* familyName) const {

     SK_ABORT("Not implemented");

 }

 SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {

     SK_ABORT("Not implemented");

+    SkUNREACHABLE;

 }

 SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const {

     return new SkStyleSet_Indirect(this, -1, fProxy->matchName(familyName));

 }

 SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& id) const {

     if (id.fDataId == SkFontIdentity::kInvalidDataId) {

diff --git a/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp b/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp

--- a/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp

+++ b/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp

@@ -157,28 +157,32 @@ public:

     SkFontMgr_FCI(sk_sp<SkFontConfigInterface> fci)

         : fFCI(std::move(fci))

         , fCache(kMaxSize)

     {}

 protected:

     int onCountFamilies() const override {

         SK_ABORT("Not implemented.");

+	SkUNREACHABLE;

     }

     void onGetFamilyName(int index, SkString* familyName) const override {

         SK_ABORT("Not implemented.");

+	SkUNREACHABLE;

     }

     SkFontStyleSet* onCreateStyleSet(int index) const override {

         SK_ABORT("Not implemented.");

+	SkUNREACHABLE;

     }

     SkFontStyleSet* onMatchFamily(const char familyName[]) const override {

         SK_ABORT("Not implemented.");

+	SkUNREACHABLE;

     }

     SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[],

                                    const SkFontStyle& requestedStyle) const override

     {

         SkAutoMutexExclusive ama(fMutex);

         SkFontConfigInterface::FontIdentity identity;

diff --git a/gfx/skia/skia/src/sksl/SkSLCompiler.cpp b/gfx/skia/skia/src/sksl/SkSLCompiler.cpp

--- a/gfx/skia/skia/src/sksl/SkSLCompiler.cpp

+++ b/gfx/skia/skia/src/sksl/SkSLCompiler.cpp

@@ -272,16 +272,17 @@ std::unique_ptr<Expression> Compiler::co

         case Symbol::Kind::kType: {

             // go through DSLType so we report errors on private types

             dsl::DSLModifiers modifiers;

             dsl::DSLType dslType(result->name(), &modifiers, pos);

             return TypeReference::Convert(*fContext, pos, &dslType.skslType());

         }

         default:

             SK_ABORT("unsupported symbol type %d\n", (int) result->kind());

+            SkUNREACHABLE;

     }

 }

 bool Compiler::optimizeModuleBeforeMinifying(ProgramKind kind, Module& module) {

     SkASSERT(this->errorCount() == 0);

     auto m = SkSL::ModuleLoader::Get();

diff --git a/gfx/skia/skia/src/sksl/SkSLOperator.cpp b/gfx/skia/skia/src/sksl/SkSLOperator.cpp

--- a/gfx/skia/skia/src/sksl/SkSLOperator.cpp

+++ b/gfx/skia/skia/src/sksl/SkSLOperator.cpp

@@ -46,17 +46,17 @@ OperatorPrecedence Operator::getBinaryPr

         case Kind::SLASHEQ:      // fall through

         case Kind::PERCENTEQ:    // fall through

         case Kind::SHLEQ:        // fall through

         case Kind::SHREQ:        // fall through

         case Kind::BITWISEANDEQ: // fall through

         case Kind::BITWISEXOREQ: // fall through

         case Kind::BITWISEOREQ:  return OperatorPrecedence::kAssignment;

         case Kind::COMMA:        return OperatorPrecedence::kSequence;

-        default: SK_ABORT("unsupported binary operator");

+        default: SkUNREACHABLE;

     }

 }

 const char* Operator::operatorName() const {

     switch (this->kind()) {

         case Kind::PLUS:         return " + ";

         case Kind::MINUS:        return " - ";

         case Kind::STAR:         return " * ";

diff --git a/gfx/skia/skia/src/sksl/ir/SkSLType.h b/gfx/skia/skia/src/sksl/ir/SkSLType.h

--- a/gfx/skia/skia/src/sksl/ir/SkSLType.h

+++ b/gfx/skia/skia/src/sksl/ir/SkSLType.h

@@ -417,16 +417,17 @@ public:

      * Returns the number of scalars needed to hold this type.

      */

     virtual size_t slotCount() const {

         return 0;

     }

     virtual const std::vector<Field>& fields() const {

         SK_ABORT("Internal error: not a struct");

+        SkUNREACHABLE;

     }

     /**

      * For generic types, returns the types that this generic type can substitute for.

      */

     virtual SkSpan<const Type* const> coercibleTypes() const {

         SkDEBUGFAIL("Internal error: not a generic type");

         return {};

diff --git a/gfx/skia/skia/src/utils/SkShadowUtils.cpp b/gfx/skia/skia/src/utils/SkShadowUtils.cpp

--- a/gfx/skia/skia/src/utils/SkShadowUtils.cpp

+++ b/gfx/skia/skia/src/utils/SkShadowUtils.cpp

@@ -135,16 +135,17 @@ struct SpotVerticesFactory {

                 }

                 return false;

             case OccluderType::kDirectional:

             case OccluderType::kDirectionalTransparent:

                 *translate = that.fOffset - fOffset;

                 return true;

         }

         SK_ABORT("Uninitialized occluder type?");

+        SkUNREACHABLE;

     }

     sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm,

                                    SkVector* translate) const {

         bool transparent = fOccluderType == OccluderType::kPointTransparent ||

                            fOccluderType == OccluderType::kDirectionalTransparent;

         bool directional = fOccluderType == OccluderType::kDirectional ||

                            fOccluderType == OccluderType::kDirectionalTransparent;

diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/number_rounding.cpp

--- a/intl/icu/source/i18n/number_rounding.cpp

+++ b/intl/icu/source/i18n/number_rounding.cpp

@@ -282,27 +282,29 @@ Precision IncrementPrecision::withMinFra

 }

 FractionPrecision Precision::constructFraction(int32_t minFrac, int32_t maxFrac) {

     FractionSignificantSettings settings;

     settings.fMinFrac = static_cast<digits_t>(minFrac);

     settings.fMaxFrac = static_cast<digits_t>(maxFrac);

     settings.fMinSig = -1;

     settings.fMaxSig = -1;

+    settings.fPriority = UNUM_ROUNDING_PRIORITY_RELAXED;

     PrecisionUnion union_;

     union_.fracSig = settings;

     return {RND_FRACTION, union_};

 }

 Precision Precision::constructSignificant(int32_t minSig, int32_t maxSig) {

     FractionSignificantSettings settings;

     settings.fMinFrac = -1;

     settings.fMaxFrac = -1;

     settings.fMinSig = static_cast<digits_t>(minSig);

     settings.fMaxSig = static_cast<digits_t>(maxSig);

+    settings.fPriority = UNUM_ROUNDING_PRIORITY_RELAXED;

     PrecisionUnion union_;

     union_.fracSig = settings;

     return {RND_SIGNIFICANT, union_};

 }

 Precision

 Precision::constructFractionSignificant(

         const FractionPrecision &base,

diff --git a/js/src/irregexp/imported/regexp-parser.cc b/js/src/irregexp/imported/regexp-parser.cc

--- a/js/src/irregexp/imported/regexp-parser.cc

+++ b/js/src/irregexp/imported/regexp-parser.cc

@@ -2644,16 +2644,17 @@ bool MayContainStrings(ClassSetOperandTy

       return false;

     case ClassSetOperandType::kCharacterClassEscape:

     case ClassSetOperandType::kClassStringDisjunction:

       return operand->AsClassSetOperand()->has_strings();

     case ClassSetOperandType::kNestedClass:

       if (operand->IsClassRanges()) return false;

       return operand->AsClassSetExpression()->may_contain_strings();

   }

+  UNREACHABLE();

 }

 }  // namespace

 // TODO(v8:11935): Change permalink once proposal is in stage 4.

 // https://arai-a.github.io/ecma262-compare/snapshot.html?pr=2418#prod-ClassUnion

 template <class CharT>

 RegExpTree* RegExpParserImpl<CharT>::ParseClassUnion(

diff --git a/third_party/libwebrtc/api/adaptation/resource.cc b/third_party/libwebrtc/api/adaptation/resource.cc

--- a/third_party/libwebrtc/api/adaptation/resource.cc

+++ b/third_party/libwebrtc/api/adaptation/resource.cc

@@ -17,16 +17,17 @@ namespace webrtc {

 const char* ResourceUsageStateToString(ResourceUsageState usage_state) {

   switch (usage_state) {

     case ResourceUsageState::kOveruse:

       return "kOveruse";

     case ResourceUsageState::kUnderuse:

       return "kUnderuse";

   }

   RTC_CHECK_NOTREACHED();

+  return nullptr;

 }

 ResourceListener::~ResourceListener() {}

 Resource::Resource() {}

 Resource::~Resource() {}

diff --git a/third_party/libwebrtc/api/rtp_parameters.cc b/third_party/libwebrtc/api/rtp_parameters.cc

--- a/third_party/libwebrtc/api/rtp_parameters.cc

+++ b/third_party/libwebrtc/api/rtp_parameters.cc

@@ -27,16 +27,17 @@ const char* DegradationPreferenceToStrin

     case DegradationPreference::MAINTAIN_FRAMERATE:

       return "maintain-framerate";

     case DegradationPreference::MAINTAIN_RESOLUTION:

       return "maintain-resolution";

     case DegradationPreference::BALANCED:

       return "balanced";

   }

   RTC_CHECK_NOTREACHED();

+  return "";

 }

 const double kDefaultBitratePriority = 1.0;

 RtcpFeedback::RtcpFeedback() = default;

 RtcpFeedback::RtcpFeedback(RtcpFeedbackType type) : type(type) {}

 RtcpFeedback::RtcpFeedback(RtcpFeedbackType type,

                            RtcpFeedbackMessageType message_type)

diff --git a/third_party/libwebrtc/api/video/video_frame_buffer.cc b/third_party/libwebrtc/api/video/video_frame_buffer.cc

--- a/third_party/libwebrtc/api/video/video_frame_buffer.cc

+++ b/third_party/libwebrtc/api/video/video_frame_buffer.cc

@@ -101,16 +101,18 @@ const char* VideoFrameBufferTypeToString

       return "kI210";

     case VideoFrameBuffer::Type::kI410:

       return "kI410";

     case VideoFrameBuffer::Type::kNV12:

       return "kNV12";

     default:

       RTC_DCHECK_NOTREACHED();

   }

+  RTC_DCHECK_NOTREACHED();

+  return nullptr;