Attachment #86386 for bug #56780

View Details Raw Unified Return to Bug 56780

| Differences between




        Reviewed by NOBODY (OOPS!).

        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>

        Reviewed by NOBODY (OOPS!).

        WebCore GYP build shouldn't crash on startup
        https://bugs.webkit.org/show_bug.cgi?id=56776


Lines 210-216 a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj_sec1
- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj -1 / +1 lines
210	655EB29B10CE2581001A990E /* NodesCodegen.cpp in Sources / = {isa = PBXBuildFile; fileRef = 655EB29A10CE2581001A990E / NodesCodegen.cpp */; };	210	655EB29B10CE2581001A990E /* NodesCodegen.cpp in Sources / = {isa = PBXBuildFile; fileRef = 655EB29A10CE2581001A990E / NodesCodegen.cpp */; };
211	65DFC93308EA173A00F7300B /* HashTable.cpp in Sources / = {isa = PBXBuildFile; fileRef = 65DFC92D08EA173A00F7300B / HashTable.cpp */; };	211	65DFC93308EA173A00F7300B /* HashTable.cpp in Sources / = {isa = PBXBuildFile; fileRef = 65DFC92D08EA173A00F7300B / HashTable.cpp */; };
212	65E1A3DF122B894500B26097 /* NonCopyingSort.h in Headers / = {isa = PBXBuildFile; fileRef = 65E1A2F4122B880D00B26097 / NonCopyingSort.h */; settings = {ATTRIBUTES = (Private, ); }; };	212	65E1A3DF122B894500B26097 /* NonCopyingSort.h in Headers / = {isa = PBXBuildFile; fileRef = 65E1A2F4122B880D00B26097 / NonCopyingSort.h */; settings = {ATTRIBUTES = (Private, ); }; };
213	65FDE49C0BDD1D4A00E80111 /* Assertions.cpp in Sources / = {isa = PBXBuildFile; fileRef = 65E217B808E7EECC0023E5F6 / Assertions.cpp */; settings = {COMPILER_FLAGS = "-Wno-missing-format-attribute"; }; };	213	65FDE49C0BDD1D4A00E80111 /* Assertions.cpp in Sources / = {isa = PBXBuildFile; fileRef = 65E217B808E7EECC0023E5F6 / Assertions.cpp */; };
214	76FB9F0F12E851860051A2EB /* SHA1.h in Headers / = {isa = PBXBuildFile; fileRef = 76FB9F0E12E851860051A2EB / SHA1.h */; settings = {ATTRIBUTES = (Private, ); }; };	214	76FB9F0F12E851860051A2EB /* SHA1.h in Headers / = {isa = PBXBuildFile; fileRef = 76FB9F0E12E851860051A2EB / SHA1.h */; settings = {ATTRIBUTES = (Private, ); }; };
215	76FB9F1112E851960051A2EB /* SHA1.cpp in Sources / = {isa = PBXBuildFile; fileRef = 76FB9F1012E851960051A2EB / SHA1.cpp */; };	215	76FB9F1112E851960051A2EB /* SHA1.cpp in Sources / = {isa = PBXBuildFile; fileRef = 76FB9F1012E851960051A2EB / SHA1.cpp */; };
216	7E4EE7090EBB7963005934AA /* StructureChain.h in Headers / = {isa = PBXBuildFile; fileRef = 7E4EE7080EBB7963005934AA / StructureChain.h */; settings = {ATTRIBUTES = (Private, ); }; };	216	7E4EE7090EBB7963005934AA /* StructureChain.h in Headers / = {isa = PBXBuildFile; fileRef = 7E4EE7080EBB7963005934AA / StructureChain.h */; settings = {ATTRIBUTES = (Private, ); }; };



            # used only by this project.
            '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',
            ],
          },
        }],
      ],

Lines 24-29 a/Source/JavaScriptCore/wtf/Assertions.cpp_sec1
- a/Source/JavaScriptCore/wtf/Assertions.cpp +4 lines
24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*/	25	*/
26		26
		27	// According to http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas
		28	// we need to place this directive before any data or functions are defined.
		29	#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
		30
27	#include "config.h"	31	#include "config.h"
28	#include "Assertions.h"	32	#include "Assertions.h"
29		33

Return to Bug 56780

Lines 138-164 a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp_sec1
- a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp -21 lines
138	# used only by this project.	138	# used only by this project.
139	'GCC_PREFIX_HEADER': '<(project_dir)/JavaScriptCorePrefix.h',	139	'GCC_PREFIX_HEADER': '<(project_dir)/JavaScriptCorePrefix.h',
140	'INFOPLIST_FILE': '<(project_dir)/Info.plist',	140	'INFOPLIST_FILE': '<(project_dir)/Info.plist',
141	# This setting mirrors the setting in Base.xcconfig, with
142	# one difference noted below.
143	'WARNING_CFLAGS_BASE': [
144	'-Wall',
145	'-Wextra',
146	'-Wcast-qual',
147	'-Wchar-subscripts',
148	'-Wextra-tokens',
149	'-Wformat=2',
150	'-Winit-self',
151	# FIXME: For some reason, -Wmissing-format-attribute causes a
152	# build error in Assertions.cpp in the GYP build but not in the
153	# non-GYP build.
154	# '-Wmissing-format-attribute',
155	'-Wmissing-noreturn',
156	'-Wpacked',
157	'-Wpointer-arith',
158	'-Wredundant-decls',
159	'-Wundef',
160	'-Wwrite-strings',
161	],
162	},	141	},
163	}],	142	}],
164	],	143	],

Lines 2-7 a/Source/JavaScriptCore/ChangeLog_sec1
- a/Source/JavaScriptCore/ChangeLog +20 lines
2		2
3	Reviewed by NOBODY (OOPS!).	3	Reviewed by NOBODY (OOPS!).
4		4
		5	Solve the Assertions.cpp / -Wno-missing-format-attribute mystery
		6	https://bugs.webkit.org/show_bug.cgi?id=56780
		7
		8	The reason we couldn't resolve this warning in the GYP build was that
		9	the normal build disables this warning specifically for this file.
		10	This patch takes the same approach as the previous patch to
		11	WebCoreObjCExtras.mm in that it uses a pragma to suppress the warning
		12	(rather than a build system configuration).
		13
		14	* JavaScriptCore.xcodeproj/project.pbxproj:
		15	- Remove the special-case for this file.
		16	* gyp/JavaScriptCore.gyp:
		17	- Remove the work-around for this issue.
		18	* wtf/Assertions.cpp:
		19	- Add a pragma disabling this warning for this file.
		20
		21	2011-03-21 Adam Barth <abarth@webkit.org>
		22
		23	Reviewed by NOBODY (OOPS!).
		24
5	WebCore GYP build shouldn't crash on startup	25	WebCore GYP build shouldn't crash on startup
6	https://bugs.webkit.org/show_bug.cgi?id=56776	26	https://bugs.webkit.org/show_bug.cgi?id=56776
7		27