<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162793] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162793">162793</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-25 19:54:55 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add FALLTHROUGH and -Wimplicit-fallthrough to warn about unannotated implicit fallthroughs in switches
https://bugs.webkit.org/show_bug.cgi?id=127637
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-01-25
Reviewed by Darin Adler.
For information about [[clang::fallthrough]], see:
<http://clang.llvm.org/docs/LanguageExtensions.html#the-clang-fallthrough-attribute>
* Configurations/Base.xcconfig:
Enable -Wimplicit-fallthrough warnings.
* wtf/Compiler.h:
Define FALLTHROUGH on clang and fallback to outputing nothing when unsupported.
* wtf/dtoa/fast-dtoa.cc:
* wtf/unicode/UTF8.cpp:
(WTF::Unicode::convertLatin1ToUTF8):
(WTF::Unicode::convertUTF16ToUTF8):
(WTF::Unicode::isLegalUTF8):
(WTF::Unicode::readUTF8Sequence):
Explicitly annotate implicit fallthroughs with FALLTHROUGH.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFConfigurationsBasexcconfig">trunk/Source/WTF/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWTFwtfCompilerh">trunk/Source/WTF/wtf/Compiler.h</a></li>
<li><a href="#trunkSourceWTFwtfdtoafastdtoacc">trunk/Source/WTF/wtf/dtoa/fast-dtoa.cc</a></li>
<li><a href="#trunkSourceWTFwtfunicodeUTF8cpp">trunk/Source/WTF/wtf/unicode/UTF8.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (162792 => 162793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-26 03:43:21 UTC (rev 162792)
+++ trunk/Source/WTF/ChangeLog 2014-01-26 03:54:55 UTC (rev 162793)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-25 Joseph Pecoraro <pecoraro@apple.com>
+
+ Add FALLTHROUGH and -Wimplicit-fallthrough to warn about unannotated implicit fallthroughs in switches
+ https://bugs.webkit.org/show_bug.cgi?id=127637
+
+ Reviewed by Darin Adler.
+
+ For information about [[clang::fallthrough]], see:
+ <http://clang.llvm.org/docs/LanguageExtensions.html#the-clang-fallthrough-attribute>
+
+ * Configurations/Base.xcconfig:
+ Enable -Wimplicit-fallthrough warnings.
+
+ * wtf/Compiler.h:
+ Define FALLTHROUGH on clang and fallback to outputing nothing when unsupported.
+
+ * wtf/dtoa/fast-dtoa.cc:
+ * wtf/unicode/UTF8.cpp:
+ (WTF::Unicode::convertLatin1ToUTF8):
+ (WTF::Unicode::convertUTF16ToUTF8):
+ (WTF::Unicode::isLegalUTF8):
+ (WTF::Unicode::readUTF8Sequence):
+ Explicitly annotate implicit fallthroughs with FALLTHROUGH.
+
</ins><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Call deprecatedCharacters instead of characters at more call sites
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/Base.xcconfig (162792 => 162793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/Base.xcconfig 2014-01-26 03:43:21 UTC (rev 162792)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2014-01-26 03:54:55 UTC (rev 162793)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx"> PREBINDING = NO;
</span><del>-WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare;
</del><ins>+WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</ins><span class="cx"> HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/$(INSTALL_PATH_PREFIX)/usr/local/include icu $(HEADER_SEARCH_PATHS);
</span><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compiler.h (162792 => 162793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compiler.h 2014-01-26 03:43:21 UTC (rev 162792)
+++ trunk/Source/WTF/wtf/Compiler.h 2014-01-26 03:54:55 UTC (rev 162793)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #define WTF_COMPILER_SUPPORTS_CXX_GENERALIZED_INITIALIZERS __has_feature(cxx_generalized_initializers)
</span><span class="cx"> #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions)
</span><span class="cx"> #define WTF_COMPILER_SUPPORTS_CXX_USER_LITERALS __has_feature(cxx_user_literals)
</span><ins>+#define WTF_COMPILER_SUPPORTS_FALLTHROUGH_WARNINGS __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* COMPILER(GCC) - GNU Compiler Collection */
</span><span class="lines">@@ -152,6 +153,16 @@
</span><span class="cx"> #define CONSTEXPR
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+/* FALLTHROUGH */
+
+#if !defined(FALLTHROUGH) && COMPILER_SUPPORTS(FALLTHROUGH_WARNINGS) && COMPILER(CLANG)
+#define FALLTHROUGH [[clang::fallthrough]]
+#endif
+
+#if !defined(FALLTHROUGH)
+#define FALLTHROUGH
+#endif
+
</ins><span class="cx"> /* LIKELY */
</span><span class="cx">
</span><span class="cx"> #if !defined(LIKELY) && COMPILER(GCC)
</span></span></pre></div>
<a id="trunkSourceWTFwtfdtoafastdtoacc"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/dtoa/fast-dtoa.cc (162792 => 162793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/dtoa/fast-dtoa.cc 2014-01-26 03:43:21 UTC (rev 162792)
+++ trunk/Source/WTF/wtf/dtoa/fast-dtoa.cc 2014-01-26 03:54:55 UTC (rev 162793)
</span><span class="lines">@@ -253,7 +253,8 @@
</span><span class="cx"> *power = kTen9;
</span><span class="cx"> *exponent = 9;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 29:
</span><span class="cx"> case 28:
</span><span class="cx"> case 27:
</span><span class="lines">@@ -261,7 +262,8 @@
</span><span class="cx"> *power = kTen8;
</span><span class="cx"> *exponent = 8;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 26:
</span><span class="cx"> case 25:
</span><span class="cx"> case 24:
</span><span class="lines">@@ -269,7 +271,8 @@
</span><span class="cx"> *power = kTen7;
</span><span class="cx"> *exponent = 7;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 23:
</span><span class="cx"> case 22:
</span><span class="cx"> case 21:
</span><span class="lines">@@ -278,7 +281,8 @@
</span><span class="cx"> *power = kTen6;
</span><span class="cx"> *exponent = 6;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 19:
</span><span class="cx"> case 18:
</span><span class="cx"> case 17:
</span><span class="lines">@@ -286,7 +290,8 @@
</span><span class="cx"> *power = kTen5;
</span><span class="cx"> *exponent = 5;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 16:
</span><span class="cx"> case 15:
</span><span class="cx"> case 14:
</span><span class="lines">@@ -294,7 +299,8 @@
</span><span class="cx"> *power = kTen4;
</span><span class="cx"> *exponent = 4;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 13:
</span><span class="cx"> case 12:
</span><span class="cx"> case 11:
</span><span class="lines">@@ -303,7 +309,8 @@
</span><span class="cx"> *power = 1000;
</span><span class="cx"> *exponent = 3;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 9:
</span><span class="cx"> case 8:
</span><span class="cx"> case 7:
</span><span class="lines">@@ -311,7 +318,8 @@
</span><span class="cx"> *power = 100;
</span><span class="cx"> *exponent = 2;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 6:
</span><span class="cx"> case 5:
</span><span class="cx"> case 4:
</span><span class="lines">@@ -319,7 +327,8 @@
</span><span class="cx"> *power = 10;
</span><span class="cx"> *exponent = 1;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 3:
</span><span class="cx"> case 2:
</span><span class="cx"> case 1:
</span><span class="lines">@@ -327,7 +336,8 @@
</span><span class="cx"> *power = 1;
</span><span class="cx"> *exponent = 0;
</span><span class="cx"> break;
</span><del>- } // else fallthrough
</del><ins>+ }
+ FALLTHROUGH;
</ins><span class="cx"> case 0:
</span><span class="cx"> *power = 0;
</span><span class="cx"> *exponent = -1;
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeUTF8cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/UTF8.cpp (162792 => 162793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/UTF8.cpp 2014-01-26 03:43:21 UTC (rev 162792)
+++ trunk/Source/WTF/wtf/unicode/UTF8.cpp 2014-01-26 03:54:55 UTC (rev 162793)
</span><span class="lines">@@ -157,6 +157,7 @@
</span><span class="cx"> case 2:
</span><span class="cx"> *--target = (char)((ch | byteMark) & byteMask);
</span><span class="cx"> ch >>= 6;
</span><ins>+ FALLTHROUGH;
</ins><span class="cx"> case 1:
</span><span class="cx"> *--target = (char)(ch | firstByteMark[bytesToWrite]);
</span><span class="cx"> }
</span><span class="lines">@@ -230,9 +231,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> switch (bytesToWrite) { // note: everything falls through.
</span><del>- case 4: *--target = (char)((ch | byteMark) & byteMask); ch >>= 6;
- case 3: *--target = (char)((ch | byteMark) & byteMask); ch >>= 6;
- case 2: *--target = (char)((ch | byteMark) & byteMask); ch >>= 6;
</del><ins>+ case 4: *--target = (char)((ch | byteMark) & byteMask); ch >>= 6; FALLTHROUGH;
+ case 3: *--target = (char)((ch | byteMark) & byteMask); ch >>= 6; FALLTHROUGH;
+ case 2: *--target = (char)((ch | byteMark) & byteMask); ch >>= 6; FALLTHROUGH;
</ins><span class="cx"> case 1: *--target = (char)(ch | firstByteMark[bytesToWrite]);
</span><span class="cx"> }
</span><span class="cx"> target += bytesToWrite;
</span><span class="lines">@@ -252,8 +253,8 @@
</span><span class="cx"> switch (length) {
</span><span class="cx"> default: return false;
</span><span class="cx"> // Everything else falls through when "true"...
</span><del>- case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
- case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
</del><ins>+ case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; FALLTHROUGH;
+ case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; FALLTHROUGH;
</ins><span class="cx"> case 2: if ((a = (*--srcptr)) > 0xBF) return false;
</span><span class="cx">
</span><span class="cx"> switch (*source) {
</span><span class="lines">@@ -264,6 +265,7 @@
</span><span class="cx"> case 0xF4: if (a > 0x8F) return false; break;
</span><span class="cx"> default: if (a < 0x80) return false;
</span><span class="cx"> }
</span><ins>+ FALLTHROUGH;
</ins><span class="cx">
</span><span class="cx"> case 1: if (*source >= 0x80 && *source < 0xC2) return false;
</span><span class="cx"> }
</span><span class="lines">@@ -283,11 +285,11 @@
</span><span class="cx">
</span><span class="cx"> // The cases all fall through.
</span><span class="cx"> switch (length) {
</span><del>- case 6: character += static_cast<unsigned char>(*sequence++); character <<= 6;
- case 5: character += static_cast<unsigned char>(*sequence++); character <<= 6;
- case 4: character += static_cast<unsigned char>(*sequence++); character <<= 6;
- case 3: character += static_cast<unsigned char>(*sequence++); character <<= 6;
- case 2: character += static_cast<unsigned char>(*sequence++); character <<= 6;
</del><ins>+ case 6: character += static_cast<unsigned char>(*sequence++); character <<= 6; FALLTHROUGH;
+ case 5: character += static_cast<unsigned char>(*sequence++); character <<= 6; FALLTHROUGH;
+ case 4: character += static_cast<unsigned char>(*sequence++); character <<= 6; FALLTHROUGH;
+ case 3: character += static_cast<unsigned char>(*sequence++); character <<= 6; FALLTHROUGH;
+ case 2: character += static_cast<unsigned char>(*sequence++); character <<= 6; FALLTHROUGH;
</ins><span class="cx"> case 1: character += static_cast<unsigned char>(*sequence++);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>