Changeset 27947 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 21, 2007, 7:08:41 PM (18 years ago)

Author:

[email protected]

Message:

Fix <rdar://problem/5602936> Need to resolve new GCC 4.2 warnings.

Reviewed by Tim Hatcher.

Fix all warnings emitted by GCC 4.2 when building JavaScriptCore. This allows builds with
-Werror to succeed. At present they will crash when executed due to code that is not safe
under strict aliasing (<rdar://problem/5536806>).

This required some format strings to be modified in WebCore and WebKit as their format
specifiers did not match the argument type.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/Base.xcconfig (modified) (1 diff)
• kjs/date_object.cpp (modified) (1 diff)
• kjs/dtoa.cpp (modified) (2 diffs)
• pcre/pcre_exec.cpp (modified) (2 diffs)
• wtf/Assertions.cpp (modified) (2 diffs)
• wtf/Assertions.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-20  Mark Rowe  <[email protected]>
+
+        Reviewed by Tim Hatcher.
+
+        <rdar://problem/5602936> Need to resolve new GCC 4.2 warnings
+
+        Fix all warnings emitted by GCC 4.2 when building JavaScriptCore.  This allows builds with
+        -Werror to succeed.  At present they will crash when executed due to code that is not safe
+        under strict aliasing (<rdar://problem/5536806>).
+
+        * Configurations/Base.xcconfig: Exclude the -Wno-long-double flag when building with GCC 4.2.
+        * kjs/date_object.cpp:
+        (KJS::formatTime): Test whether the stack-allocated string is empty rather than at a non-null address.
+        * kjs/dtoa.cpp:
+        (Bigint::): Tweak formatting to silence warnings.
+        * pcre/pcre_exec.cpp:
+        (match): Tweak formatting to silence warnings
+        * wtf/Assertions.cpp: Add printf format attribute to functions that warrant it.
+        * wtf/Assertions.h: Ditto.
+
 2007-11-19  Kevin Ollivier  <[email protected]>
 

trunk/JavaScriptCore/Configurations/Base.xcconfig

@@ -24 +24 @@
 VALID_ARCHS = i386 ppc x86_64 ppc64;
 WARNING_CFLAGS = $(WARNING_CFLAGS_$(CURRENT_ARCH));
-WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-long-double -Wundef;
+WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wundef;
 WARNING_CFLAGS_ = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_i386 = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -230 +230 @@
         strftime(tzname, sizeof(tzname), "%Z", &gtm);
 
-        if (tzname) {
+        if (tzname[0]) {
             snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT%c%02d%02d (%s)",
                 t.hour, t.minute, t.second,

trunk/JavaScriptCore/kjs/dtoa.cpp

@@ -2975 +2975 @@
                                                 goto bump_up;
                                         else if (dval(d) < 0.5 - dval(eps)) {
-                                                while(*--s == '0');
+                                                while (*--s == '0') { }
                                                 s++;
                                                 goto ret1;
@@ -3294 +3294 @@
 trimzeros:
 #endif
-                while(*--s == '0');
+                while (*--s == '0') { }
                 s++;
                 }

trunk/JavaScriptCore/pcre/pcre_exec.cpp

@@ -1658 +1658 @@
                                     (*stack.currentFrame->eptr < 128 && (md->ctypes[*stack.currentFrame->eptr] & ctype_space) != 0))
                                     RRETURN_NO_MATCH;
-                                while (++stack.currentFrame->eptr < md->end_subject && ISMIDCHAR(*stack.currentFrame->eptr));
+                                while (++stack.currentFrame->eptr < md->end_subject && ISMIDCHAR(*stack.currentFrame->eptr)) { }
                             }
                             break;
@@ -1676 +1676 @@
                                     (*stack.currentFrame->eptr < 128 && (md->ctypes[*stack.currentFrame->eptr] & ctype_word) != 0))
                                     RRETURN_NO_MATCH;
-                                while (++stack.currentFrame->eptr < md->end_subject && ISMIDCHAR(*stack.currentFrame->eptr));
+                                while (++stack.currentFrame->eptr < md->end_subject && ISMIDCHAR(*stack.currentFrame->eptr)) { }
                             }
                             break;

trunk/JavaScriptCore/wtf/Assertions.cpp

@@ -49 +49 @@
 extern "C" {
 
-// This is to work around the "you should use a printf format attribute" warning on GCC
-// We can't use _attribute__ ((format (printf, 2, 3))) since we allow %@
-static int (* vfprintf_no_warning)(FILE *, const char*, va_list) = vfprintf;
-
+WTF_ATTRIBUTE_PRINTF(1, 0)
 static void vprintf_stderr_common(const char* format, va_list args)
 {
@@ -92 +89 @@
     }
 #endif
-        vfprintf_no_warning(stderr, format, args);
+    vfprintf(stderr, format, args);
 }
 
+WTF_ATTRIBUTE_PRINTF(1, 2)
 static void printf_stderr_common(const char* format, ...)
 {

trunk/JavaScriptCore/wtf/Assertions.h

@@ -84 +84 @@
 #endif
 
+// WTF logging functions can process %@ in the format string to log a NSObject* but the printf format attribute
+// emits a warning when %@ is used in the format string.  Until <rdar://problem/5195437> is resolved we can't include
+// the attribute when being used from Objective-C code in case it decides to use %@.
+#if COMPILER(GCC) && !defined(__OBJC__)
+#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
+#else
+#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments) 
+#endif
+
 /* These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled. */
 
@@ -99 +108 @@
 
 void WTFReportAssertionFailure(const char* file, int line, const char* function, const char* assertion);
-void WTFReportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* assertion, const char* format, ...);
+void WTFReportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* assertion, const char* format, ...) WTF_ATTRIBUTE_PRINTF(5, 6);
 void WTFReportArgumentAssertionFailure(const char* file, int line, const char* function, const char* argName, const char* assertion);
-void WTFReportFatalError(const char* file, int line, const char* function, const char* format, ...) ;
-void WTFReportError(const char* file, int line, const char* function, const char* format, ...);
-void WTFLog(WTFLogChannel* channel, const char* format, ...);
-void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChannel* channel, const char* format, ...);
+void WTFReportFatalError(const char* file, int line, const char* function, const char* format, ...) WTF_ATTRIBUTE_PRINTF(4, 5);
+void WTFReportError(const char* file, int line, const char* function, const char* format, ...) WTF_ATTRIBUTE_PRINTF(4, 5);
+void WTFLog(WTFLogChannel* channel, const char* format, ...) WTF_ATTRIBUTE_PRINTF(2, 3);
+void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChannel* channel, const char* format, ...) WTF_ATTRIBUTE_PRINTF(5, 6);
 
 #ifdef __cplusplus