Title: [194659] trunk/Source/_javascript_Core
- Revision
- 194659
- Author
- mcatanz...@igalia.com
- Date
- 2016-01-06 13:13:32 -0800 (Wed, 06 Jan 2016)
Log Message
Silence -Wtautological-compare
https://bugs.webkit.org/show_bug.cgi?id=152768
Reviewed by Saam Barati.
* runtime/Options.cpp:
(JSC::Options::setAliasedOption):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (194658 => 194659)
--- trunk/Source/_javascript_Core/ChangeLog 2016-01-06 21:06:42 UTC (rev 194658)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-01-06 21:13:32 UTC (rev 194659)
@@ -1,3 +1,13 @@
+2016-01-06 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Silence -Wtautological-compare
+ https://bugs.webkit.org/show_bug.cgi?id=152768
+
+ Reviewed by Saam Barati.
+
+ * runtime/Options.cpp:
+ (JSC::Options::setAliasedOption):
+
2016-01-06 Filip Pizlo <fpi...@apple.com>
Make sure that the basic throw-from-operation mode of throwing makes sense in FTL B3
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (194658 => 194659)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2016-01-06 21:06:42 UTC (rev 194658)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2016-01-06 21:13:32 UTC (rev 194659)
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
#include <wtf/ASCIICType.h>
+#include <wtf/Compiler.h>
#include <wtf/DataLog.h>
#include <wtf/NumberOfCores.h>
#include <wtf/StdLibExtras.h>
@@ -597,6 +598,13 @@
if (!equalStr)
return false;
+#if COMPILER(CLANG)
+#if __has_warning("-Wtautological-compare")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+#endif
+#endif
+
// For each option, check if the specify arg is a match. If so, set the arg
// if the value makes sense. Otherwise, move on to checking the next option.
#define FOR_EACH_OPTION(aliasedName_, unaliasedName_, equivalence) \
@@ -618,6 +626,12 @@
JSC_ALIASED_OPTIONS(FOR_EACH_OPTION)
#undef FOR_EACH_OPTION
+#if COMPILER(CLANG)
+#if __has_warning("-Wtautological-compare")
+#pragma clang diagnostic pop
+#endif
+#endif
+
return false; // No option matched.
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
