Merge r241316 - Unreviewed, fix build warnings after content extensio…

…ns enablement https://bugs.webkit.org/show_bug.cgi?id=193622 <rdar://problem/47982850> Source/WebCore: * contentextensions/DFABytecode.h: (WebCore::ContentExtensions::instructionSizeWithArguments): * contentextensions/DFABytecodeCompiler.h: * contentextensions/URLFilterParser.cpp: (WebCore::ContentExtensions::URLFilterParser::statusString): Source/WebKit: * UIProcess/API/C/WKUserContentExtensionStoreRef.cpp: (toResult):
WebKit · Feb 13, 2019 · 2c1c6b8 · 2c1c6b8
1 parent db84951
commit 2c1c6b8
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2019-02-12  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, fix build warnings after content extensions enablement
+        https://bugs.webkit.org/show_bug.cgi?id=193622
+        <rdar://problem/47982850>
+
+        * contentextensions/DFABytecode.h:
+        (WebCore::ContentExtensions::instructionSizeWithArguments):
+        * contentextensions/DFABytecodeCompiler.h:
+        * contentextensions/URLFilterParser.cpp:
+        (WebCore::ContentExtensions::URLFilterParser::statusString):
+
 2019-02-12  Youenn Fablet  <youenn@apple.com>
 
         Make use of is<SubresourceLoader>

diff --git a/Source/WebCore/contentextensions/DFABytecode.h b/Source/WebCore/contentextensions/DFABytecode.h
@@ -126,6 +126,7 @@ static inline size_t instructionSizeWithArguments(DFABytecodeInstruction instruc
     case DFABytecodeInstruction::Terminate:
         return sizeof(DFABytecodeInstruction);
     }
+    RELEASE_ASSERT_NOT_REACHED();
 }
 
 } // namespace ContentExtensions    

diff --git a/Source/WebCore/contentextensions/DFABytecodeCompiler.h b/Source/WebCore/contentextensions/DFABytecodeCompiler.h
@@ -64,7 +64,7 @@ class WEBCORE_EXPORT DFABytecodeCompiler {
     struct JumpTable {
         ~JumpTable()
         {
-            ASSERT(min + destinations.size() == max + 1);
+            ASSERT(min + destinations.size() == static_cast<size_t>(max + 1));
             ASSERT(min == max || destinations.size() > 1);
         }
 

diff --git a/Source/WebCore/contentextensions/URLFilterParser.cpp b/Source/WebCore/contentextensions/URLFilterParser.cpp
@@ -403,6 +403,8 @@ String URLFilterParser::statusString(ParseStatus status)
     case InvalidQuantifier:
         return "Arbitrary atom repetitions are not supported.";
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
 }
 
 } // namespace ContentExtensions

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2019-02-12  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, fix build warnings after content extensions enablement
+        https://bugs.webkit.org/show_bug.cgi?id=193622
+        <rdar://problem/47982850>
+
+        * UIProcess/API/C/WKUserContentExtensionStoreRef.cpp:
+        (toResult):
+
 2019-02-12  Youenn Fablet  <youenn@apple.com>
 
         Make use of is<SubresourceLoader>

diff --git a/Source/WebKit/UIProcess/API/C/WKUserContentExtensionStoreRef.cpp b/Source/WebKit/UIProcess/API/C/WKUserContentExtensionStoreRef.cpp
@@ -68,6 +68,8 @@ static inline WKUserContentExtensionStoreResult toResult(const std::error_code&
     case API::ContentRuleListStore::Error::RemoveFailed:
         return kWKUserContentExtensionStoreRemoveFailed;
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
 }
 #endif