diff --git a/Cargo.lock b/Cargo.lock

index 6f54a9380d..09911c0273 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -2063,8 +2063,6 @@ dependencies = [

 [[package]]

 name = "glslopt"

 version = "0.1.9"

-source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "74a3f5c04450dfdadb4b08f6e5ee6f5110f674de1acbd6199bfec68392a8cbaf"

 dependencies = [

  "cc",

 ]

diff --git a/Cargo.toml b/Cargo.toml

index 09f3e7292f..3581baf2aa 100644

--- a/Cargo.toml

+++ b/Cargo.toml

@@ -83,6 +83,7 @@ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"

 nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }

 spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }

 minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "85551909b95a5cf553a85dbcddfa5f117cfbbe0e" }

+glslopt = { path = "third_party/rust/glslopt/" }

 [patch.crates-io.cranelift-codegen]

@@ -105,4 +106,4 @@ path = "third_party/rust/mio"

 # Patch failure 0.1.8 to disable the backtrace feature by default. See bug 1608157.

 [patch.crates-io.failure]

-path = "third_party/rust/failure"

\ No newline at end of file

+path = "third_party/rust/failure"

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

index 2eed1c6ac6..49d0309034 100644

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

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

@@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginToMatrix(SkEncodedOrigin origin, int w, in

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

     }

     SK_ABORT("Unexpected origin");

+    SkUNREACHABLE;

 }

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

index 90718038e0..4ec7729ab8 100644

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

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

@@ -540,6 +540,7 @@ static inline GrSLType GrSLCombinedSamplerTypeForTextureType(GrTextureType type)

         default:

             SK_ABORT("Unexpected texture type");

     }

+    SkUNREACHABLE;

 }

 /** Rectangle and external textures only support the clamp wrap mode and do not support

@@ -556,6 +557,7 @@ static inline bool GrTextureTypeHasRestrictedSampling(GrTextureType type) {

         default:

             SK_ABORT("Unexpected texture type");

     }

+    SkUNREACHABLE;

 }

 static constexpr bool GrSLTypeIsCombinedSamplerType(GrSLType type) {

@@ -858,6 +860,7 @@ static inline size_t GrCompressedFormatDataSize(SkImage::CompressionType compres

     }

     SK_ABORT("Invalid pixel config");

+    SkUNREACHABLE;

 }

 /**

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

index 23bdbc1c42..ea2d23f6e8 100644

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

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

@@ -182,6 +182,7 @@ static inline bool SkCubicIsDegenerate(SkCubicType type) {

             return true;

     }

     SK_ABORT("Invalid SkCubicType");

+    SkUNREACHABLE;

 }

 static inline const char* SkCubicTypeName(SkCubicType type) {

@@ -194,6 +195,7 @@ static inline const char* SkCubicTypeName(SkCubicType type) {

         case SkCubicType::kLineOrPoint: return "kLineOrPoint";

     }

     SK_ABORT("Invalid SkCubicType");

+    SkUNREACHABLE;

 }

 /** Returns the cubic classification.

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

index 3c84bda6f8..e2fba375cc 100644

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

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

@@ -201,6 +201,7 @@ void SkTextBlob::operator delete(void* 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) {

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

index 838a783313..d878fadc08 100644

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

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

@@ -29,6 +29,7 @@ void SkScalerContextProxy::initCache(SkStrike* cache, SkStrikeCache* strikeCache

 unsigned SkScalerContextProxy::generateGlyphCount()  {

     SK_ABORT("Should never be called.");

+    SkUNREACHABLE;

 }

 bool SkScalerContextProxy::generateAdvance(SkGlyph* glyph) {

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

index 3d454cf760..554f7c0617 100644

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

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

@@ -63,23 +63,28 @@ public:

     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;

     }

     std::unique_ptr<SkFontData> onMakeFontData() 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;

     }

     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.

@@ -87,12 +92,15 @@ protected:

     }

     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;

     }

     SkScalerContext* onCreateScalerContext(const SkScalerContextEffects& effects,

                                            const SkDescriptor* desc) const override {

@@ -116,6 +124,7 @@ protected:

     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.");

@@ -126,6 +135,7 @@ protected:

     void* onGetCTFontRef() const override {

         SK_ABORT("Should never be called.");

+	SkUNREACHABLE;

     }

 private:

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

index 2dde5e2be7..dd8550dfad 100644

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

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

@@ -144,6 +144,7 @@ static GrTextureDomain::Mode to_texture_domain_mode(SkTileMode tileMode) {

             return GrTextureDomain::kRepeat_Mode;

         default:

             SK_ABORT("Unsupported tile mode.");

+	    SkUNREACHABLE;

     }

 }

 #endif

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

index 43d32dcc91..4a8143e2e2 100644

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

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

@@ -1701,6 +1701,7 @@ static SkImageFilterLight* create_random_light(SkRandom* random) {

         }

         default:

             SK_ABORT("Unexpected value.");

+	    SkUNREACHABLE;

     }

 }

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

index da7678a725..63330e58c2 100644

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

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

@@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName(int index, SkString* familyName) const

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

     SK_ABORT("Not implemented");

+    SkUNREACHABLE;

 }

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

diff --git a/gfx/skia/skia/src/gpu/GrDataUtils.cpp b/gfx/skia/skia/src/gpu/GrDataUtils.cpp

index 6265aaec28..0da5190e4a 100644

--- a/gfx/skia/skia/src/gpu/GrDataUtils.cpp

+++ b/gfx/skia/skia/src/gpu/GrDataUtils.cpp

@@ -128,6 +128,7 @@ size_t GrCompressedDataSize(SkImage::CompressionType type, int width, int height

             return numBlocks * sizeof(ETC1Block);

     }

     SK_ABORT("Unexpected compression type");

+    SkUNREACHABLE;

 }

 size_t GrCompressedRowBytes(SkImage::CompressionType type, int width) {

@@ -137,6 +138,7 @@ size_t GrCompressedRowBytes(SkImage::CompressionType type, int width) {

             return numBlocksWidth * sizeof(ETC1Block);

     }

     SK_ABORT("Unexpected compression type");

+    SkUNREACHABLE;

 }

 // Fill in 'dest' with ETC1 blocks derived from 'colorf'

diff --git a/gfx/skia/skia/src/gpu/GrFragmentProcessor.h b/gfx/skia/skia/src/gpu/GrFragmentProcessor.h

index 21e27b868b..5b96868075 100644

--- a/gfx/skia/skia/src/gpu/GrFragmentProcessor.h

+++ b/gfx/skia/skia/src/gpu/GrFragmentProcessor.h

@@ -375,6 +375,7 @@ protected:

 private:

     virtual SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& /* inputColor */) const {

         SK_ABORT("Subclass must override this if advertising this optimization.");

+	SkUNREACHABLE;

     }

     /** Returns a new instance of the appropriate *GL* implementation class

diff --git a/gfx/skia/skia/src/gpu/GrPathRendering.cpp b/gfx/skia/skia/src/gpu/GrPathRendering.cpp

index 5e44531d2e..a6bd5e4cbc 100644

--- a/gfx/skia/skia/src/gpu/GrPathRendering.cpp

+++ b/gfx/skia/skia/src/gpu/GrPathRendering.cpp

@@ -19,6 +19,7 @@ const GrUserStencilSettings& GrPathRendering::GetStencilPassSettings(FillType fi

     switch (fill) {

         default:

             SK_ABORT("Unexpected path fill.");

+	    SkUNREACHABLE;

         case GrPathRendering::kWinding_FillType: {

             constexpr static GrUserStencilSettings kWindingStencilPass(

                 GrUserStencilSettings::StaticInit<

diff --git a/gfx/skia/skia/src/gpu/GrPathRendering.h b/gfx/skia/skia/src/gpu/GrPathRendering.h

index 3e143e4d0f..3a672fabc6 100644

--- a/gfx/skia/skia/src/gpu/GrPathRendering.h

+++ b/gfx/skia/skia/src/gpu/GrPathRendering.h

@@ -63,6 +63,7 @@ public:

             default:

                 SK_ABORT("Unknown path transform type");

+		SkUNREACHABLE;

         }

     }

diff --git a/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp b/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp

index 8d8efa7685..2d56d2cb09 100644

--- a/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp

+++ b/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp

@@ -20,6 +20,7 @@ std::unique_ptr<GrFragmentProcessor> GrProcessorUnitTest::MakeChildFP(GrProcesso

     return fp;

 #else

     SK_ABORT("Should not be called if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS");

+    SkUNREACHABLE;

 #endif

 }

 #endif

diff --git a/gfx/skia/skia/src/gpu/GrReducedClip.cpp b/gfx/skia/skia/src/gpu/GrReducedClip.cpp

index 9224e005c6..5c1d44b613 100644

--- a/gfx/skia/skia/src/gpu/GrReducedClip.cpp

+++ b/gfx/skia/skia/src/gpu/GrReducedClip.cpp

@@ -525,6 +525,7 @@ GrReducedClip::ClipResult GrReducedClip::clipInsideElement(const Element* elemen

     }

     SK_ABORT("Unexpected DeviceSpaceType");

+    SkUNREACHABLE;

 }

 GrReducedClip::ClipResult GrReducedClip::clipOutsideElement(const Element* element) {

@@ -591,6 +592,7 @@ GrReducedClip::ClipResult GrReducedClip::clipOutsideElement(const Element* eleme

     }

     SK_ABORT("Unexpected DeviceSpaceType");

+    SkUNREACHABLE;

 }

 inline void GrReducedClip::addWindowRectangle(const SkRect& elementInteriorRect, bool elementIsAA) {

diff --git a/gfx/skia/skia/src/gpu/GrResourceCache.cpp b/gfx/skia/skia/src/gpu/GrResourceCache.cpp

index 6d9a961886..5f2e68dd7b 100644

--- a/gfx/skia/skia/src/gpu/GrResourceCache.cpp

+++ b/gfx/skia/skia/src/gpu/GrResourceCache.cpp

@@ -40,6 +40,7 @@ GrScratchKey::ResourceType GrScratchKey::GenerateResourceType() {

     int32_t type = nextType++;

     if (type > SkTo<int32_t>(UINT16_MAX)) {

         SK_ABORT("Too many Resource Types");

+	SkUNREACHABLE;

     }

     return static_cast<ResourceType>(type);

@@ -51,6 +52,7 @@ GrUniqueKey::Domain GrUniqueKey::GenerateDomain() {

     int32_t domain = nextDomain++;

     if (domain > SkTo<int32_t>(UINT16_MAX)) {

         SK_ABORT("Too many GrUniqueKey Domains");

+	SkUNREACHABLE;

     }

     return static_cast<Domain>(domain);

diff --git a/gfx/skia/skia/src/gpu/GrShaderVar.cpp b/gfx/skia/skia/src/gpu/GrShaderVar.cpp

index 6f7ccccd60..67156a74bc 100644

--- a/gfx/skia/skia/src/gpu/GrShaderVar.cpp

+++ b/gfx/skia/skia/src/gpu/GrShaderVar.cpp

@@ -18,6 +18,7 @@ static const char* type_modifier_string(GrShaderVar::TypeModifier t) {

         case GrShaderVar::kUniform_TypeModifier: return "uniform";

     }

     SK_ABORT("Unknown shader variable type modifier.");

+    SkUNREACHABLE;

 }

 void GrShaderVar::setIOType(GrIOType ioType) {

@@ -32,6 +33,7 @@ void GrShaderVar::setIOType(GrIOType ioType) {

             return;

     }

     SK_ABORT("Unknown io type.");

+    SkUNREACHABLE;

 }

 void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) const {

diff --git a/gfx/skia/skia/src/gpu/SkGpuDevice.cpp b/gfx/skia/skia/src/gpu/SkGpuDevice.cpp

index 77b9963ba5..f6d7ca05dd 100644

--- a/gfx/skia/skia/src/gpu/SkGpuDevice.cpp

+++ b/gfx/skia/skia/src/gpu/SkGpuDevice.cpp

@@ -283,6 +283,7 @@ static inline GrPrimitiveType point_mode_to_primitive_type(SkCanvas::PointMode m

             return GrPrimitiveType::kLineStrip;

     }

     SK_ABORT("Unexpected mode");

+    SkUNREACHABLE;

 }

 void SkGpuDevice::drawPoints(SkCanvas::PointMode mode,

diff --git a/gfx/skia/skia/src/gpu/SkGr.h b/gfx/skia/skia/src/gpu/SkGr.h

index 79a68822b9..716f59d7e6 100644

--- a/gfx/skia/skia/src/gpu/SkGr.h

+++ b/gfx/skia/skia/src/gpu/SkGr.h

@@ -159,6 +159,7 @@ static inline GrPrimitiveType SkVertexModeToGrPrimitiveType(SkVertices::VertexMo

             break;

     }

     SK_ABORT("Invalid mode");

+    SkUNREACHABLE;

 }

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

diff --git a/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h b/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h

index 5fdb488ea5..eb81f47ba6 100644

--- a/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h

+++ b/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h

@@ -240,6 +240,7 @@ inline const char* GrCCCoverageProcessor::PrimitiveTypeName(PrimitiveType type)

         case PrimitiveType::kConics: return "kConics";

     }

     SK_ABORT("Invalid PrimitiveType");

+    SkUNREACHABLE;

 }

 inline void GrCCCoverageProcessor::TriPointInstance::set(

diff --git a/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp b/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp

index 40884d7d8f..c920365f50 100644

--- a/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp

+++ b/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp

@@ -60,6 +60,7 @@ static GrCCStrokeGeometry::Verb join_verb_from_join(SkPaint::Join join) {

             return Verb::kRoundJoin;

     }

     SK_ABORT("Invalid SkPaint::Join.");

+    SkUNREACHABLE;

 }

 void GrCCStrokeGeometry::beginPath(const SkStrokeRec& stroke, float strokeDevWidth,

diff --git a/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h b/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h

index 24569accc4..d105836141 100644

--- a/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h

+++ b/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h

@@ -175,5 +175,6 @@ inline bool GrCCStrokeGeometry::IsInternalJoinVerb(Verb verb) {

             return false;

     }

     SK_ABORT("Invalid GrCCStrokeGeometry::Verb.");

+    SkUNREACHABLE;

 }

 #endif

diff --git a/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp

index 4e86d7e071..0376cf40c3 100644

--- a/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp

+++ b/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp

@@ -164,6 +164,7 @@ GrPathRenderer::CanDrawPath GrCoverageCountingPathRenderer::onCanDrawPath(

     }

     SK_ABORT("Invalid stroke style.");

+    SkUNREACHABLE;

 }

 bool GrCoverageCountingPathRenderer::onDrawPath(const DrawPathArgs& args) {

diff --git a/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp b/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp

index ae5cfca504..89beff076a 100644

--- a/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp

+++ b/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp

@@ -550,4 +550,5 @@ GrGLSLPrimitiveProcessor* GrVSCoverageProcessor::onCreateGLSLInstance(

             return new Impl(std::move(shader), 4);

     }

     SK_ABORT("Invalid PrimitiveType");

+    SkUNREACHABLE;

 }

diff --git a/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp b/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp

index 48fc8a7f48..9321f43b7e 100644

--- a/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp

+++ b/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp

@@ -39,7 +39,9 @@ static dawn::LoadOp to_dawn_load_op(GrLoadOp loadOp) {

             return dawn::LoadOp::Clear;

         default:

             SK_ABORT("Invalid LoadOp");

+	    SkUNREACHABLE;

     }

+    SkUNREACHABLE;

 }

 GrDawnOpsRenderPass::GrDawnOpsRenderPass(GrDawnGpu* gpu, GrRenderTarget* rt, GrSurfaceOrigin origin,

diff --git a/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp b/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp

index 74fd1e31a4..2546126406 100644

--- a/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp

+++ b/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp

@@ -95,6 +95,7 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {

             break;

     }

     SK_ABORT("Unexpected type");

+    SkUNREACHABLE;

 }

 static inline uint32_t grsltype_to_size(GrSLType type) {

@@ -173,6 +174,7 @@ static inline uint32_t grsltype_to_size(GrSLType type) {

             break;

     }

     SK_ABORT("Unexpected type");

+    SkUNREACHABLE;

 }

 uint32_t get_ubo_offset(uint32_t* currentOffset,

diff --git a/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp b/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp

index b3885d20c9..0d2bac39de 100644

--- a/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp

+++ b/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp

@@ -76,6 +76,7 @@ static inline int grsltype_to_location_size(GrSLType type) {

              return 0;

     }

     SK_ABORT("Unexpected type");

+    SkUNREACHABLE;

 }

 static void finalize_helper(GrDawnVaryingHandler::VarArray& vars) {

diff --git a/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp b/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp

index 18cc91a4b1..fd6694bb76 100644

--- a/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp

+++ b/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp

@@ -58,6 +58,7 @@ void main() {

                 return color * input;

         }

         SK_ABORT("Unexpected mode");

+	SkUNREACHABLE;

     }

 }

diff --git a/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp b/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp

index b75842c94a..714fc350d5 100644

--- a/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp

+++ b/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp

@@ -204,6 +204,7 @@ const GrXPFactory* GrCoverageSetOpXPFactory::Get(SkRegion::Op regionOp, bool inv

     }

 #undef _CONSTEXPR_

     SK_ABORT("Unknown region op.");

+    SkUNREACHABLE;

 }

 sk_sp<const GrXferProcessor> GrCoverageSetOpXPFactory::makeXferProcessor(

diff --git a/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp

index 47d92dbde4..1d44d9ad82 100644

--- a/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp

+++ b/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp

@@ -753,6 +753,7 @@ const GrXPFactory* GrPorterDuffXPFactory::Get(SkBlendMode blendMode) {

             return &gScreenPDXPF;

         default:

             SK_ABORT("Unexpected blend mode.");

+	    SkUNREACHABLE;

     }

 }

diff --git a/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp b/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp

index 9269ebf668..3169ab6e3f 100644

--- a/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp

+++ b/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp

@@ -154,6 +154,7 @@ public:

         }

         printf("%s\n", SkSL::String(type.fName).c_str());

         SK_ABORT("unsupported uniform type");

+	SkUNREACHABLE;

     }

     void emitCode(EmitArgs& args) override {

@@ -568,6 +569,7 @@ std::unique_ptr<GrFragmentProcessor> GrSkSLFP::TestCreate(GrProcessorTestData* d

         }

     }

     SK_ABORT("unreachable");

+    SkUNREACHABLE;

 }