Changeset 81624 in webkit

Timestamp:

Mar 21, 2011 5:16:41 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-03-21 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Solve the Assertions.cpp / -Wno-missing-format-attribute mystery
​https://bugs.webkit.org/show_bug.cgi?id=56780

The reason we couldn't resolve this warning in the GYP build was that
the normal build disables this warning specifically for this file.
This patch takes the same approach as the previous patch to
WebCoreObjCExtras.mm in that it uses a pragma to suppress the warning
(rather than a build system configuration).

• JavaScriptCore.xcodeproj/project.pbxproj:
  • Remove the special-case for this file.
• gyp/JavaScriptCore.gyp:
  • Remove the work-around for this issue.
• wtf/Assertions.cpp:
  • Add a pragma disabling this warning for this file.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• gyp/JavaScriptCore.gyp (modified) (1 diff)
• wtf/Assertions.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-21  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Solve the Assertions.cpp / -Wno-missing-format-attribute mystery
+        https://bugs.webkit.org/show_bug.cgi?id=56780
+
+        The reason we couldn't resolve this warning in the GYP build was that
+        the normal build disables this warning specifically for this file.
+        This patch takes the same approach as the previous patch to
+        WebCoreObjCExtras.mm in that it uses a pragma to suppress the warning
+        (rather than a build system configuration).
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+            - Remove the special-case for this file.
+        * gyp/JavaScriptCore.gyp:
+            - Remove the work-around for this issue.
+        * wtf/Assertions.cpp:
+            - Add a pragma disabling this warning for this file.
+
 2011-03-21  Adam Barth  <abarth@webkit.org>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -211 +211 @@
                 65DFC93308EA173A00F7300B /* HashTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65DFC92D08EA173A00F7300B /* HashTable.cpp */; };
                 65E1A3DF122B894500B26097 /* NonCopyingSort.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1A2F4122B880D00B26097 /* NonCopyingSort.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                65FDE49C0BDD1D4A00E80111 /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65E217B808E7EECC0023E5F6 /* Assertions.cpp */; settings = {COMPILER_FLAGS = "-Wno-missing-format-attribute"; }; };
+                65FDE49C0BDD1D4A00E80111 /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65E217B808E7EECC0023E5F6 /* Assertions.cpp */; };
                 76FB9F0F12E851860051A2EB /* SHA1.h in Headers */ = {isa = PBXBuildFile; fileRef = 76FB9F0E12E851860051A2EB /* SHA1.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 76FB9F1112E851960051A2EB /* SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FB9F1012E851960051A2EB /* SHA1.cpp */; };

trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

@@ -139 +139 @@
             'GCC_PREFIX_HEADER': '<(project_dir)/JavaScriptCorePrefix.h',
             'INFOPLIST_FILE': '<(project_dir)/Info.plist',
-            # This setting mirrors the setting in Base.xcconfig, with
-            # one difference noted below.
-            'WARNING_CFLAGS_BASE': [
-              '-Wall',
-              '-Wextra',
-              '-Wcast-qual',
-              '-Wchar-subscripts',
-              '-Wextra-tokens',
-              '-Wformat=2',
-              '-Winit-self',
-              # FIXME: For some reason, -Wmissing-format-attribute causes a
-              # build error in Assertions.cpp in the GYP build but not in the
-              # non-GYP build.
-              # '-Wmissing-format-attribute',
-              '-Wmissing-noreturn',
-              '-Wpacked',
-              '-Wpointer-arith',
-              '-Wredundant-decls',
-              '-Wundef',
-              '-Wwrite-strings',
-            ],
           },
         }],

trunk/Source/JavaScriptCore/wtf/Assertions.cpp

@@ -25 +25 @@
  */
 
+// The vprintf_stderr_common function triggers this error in the Mac build.
+// Feel free to remove this pragma if this file builds on Mac.
+// According to http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas
+// we need to place this directive before any data or functions are defined.
+#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
+
 #include "config.h"
 #include "Assertions.h"