62630 2011-06-14 05:12:28 -0700 Remove dead code in DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-06-14 05:33:12 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Linux RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 abecsi abecsi eric mrobinson ossy oldest_to_newest 420329 0 abecsi 2011-06-14 05:12:28 -0700 http://trac.webkit.org/changeset/88712 revealed a dead variable: Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:135:10: error: variable 'forceCarbon' set but not used [-Werror=unused-but-set-variable] The forceCarbon variable is initialized false in the common code-path, then checked in a section guarded by XP_MACOSX: Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:168: if (supportsCocoa && !forceCarbon) and then set to true in Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:218 else if (strcasecmp(argn[i], "forcecarbon") == 0) forceCarbon = true; Since forceCarbon is always false in main.cpp:168 it is irrelevant in this function and can be removed. 420330 1 ossy 2011-06-14 05:15:32 -0700 (In reply to comment #0) > http://trac.webkit.org/changeset/88712 revealed a dead variable: > > Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:135:10: error: variable 'forceCarbon' set but not used [-Werror=unused-but-set-variable] > > The forceCarbon variable is initialized false in the common code-path, then checked in a section guarded by XP_MACOSX: > > Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:168: if (supportsCocoa && !forceCarbon) > > and then set to true in Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp:218 > > else if (strcasecmp(argn[i], "forcecarbon") == 0) > forceCarbon = true; > > Since forceCarbon is always false in main.cpp:168 it is irrelevant in this function and can be removed. I agree. Additionally setting forceCarbon to true in main.cpp:219 is dead code, because its value isn't used after this line. It should be removed too. 420331 2 97098 abecsi 2011-06-14 05:16:14 -0700 Created attachment 97098 proposed patch 420332 3 97098 ossy 2011-06-14 05:21:53 -0700 Comment on attachment 97098 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=97098&action=review LGTM, r=me, but please rename the bug to "Remove dead code in DumpRenderTree/TestNetscapePlugIn/main.cpp" > Tools/ChangeLog:5 > + [Qt] Fix the build with gcc 4.6 after r88712. The bug name is misleading, because it isn't Qt specific bug, but we need a simple dead code elimination. 420337 4 abecsi 2011-06-14 05:32:48 -0700 (In reply to comment #3) > (From update of attachment 97098 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97098&action=review > > LGTM, r=me, but please rename the bug to "Remove dead code in DumpRenderTree/TestNetscapePlugIn/main.cpp" > > > Tools/ChangeLog:5 > > + [Qt] Fix the build with gcc 4.6 after r88712. > > The bug name is misleading, because it isn't Qt specific > bug, but we need a simple dead code elimination. Committed in r88791 420338 5 97098 abecsi 2011-06-14 05:33:12 -0700 Comment on attachment 97098 proposed patch Clearing flags. 97098 2011-06-14 05:16:14 -0700 2011-06-14 05:33:12 -0700 proposed patch forcecarbon.patch text/plain 1980 abecsi ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmZTBh YzVkLi4yYWE5ZTcyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMTQgIEFuZHJhcyBCZWNzaSAgPGFiZWNz aUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRml4IHRoZSBidWlsZCB3aXRoIGdjYyA0LjYgYWZ0ZXIgcjg4NzEyLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MzAKKworICAg ICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9tYWluLmNwcDoKKyAgICAg ICAgKE5QUF9OZXcpOiByZW1vdmUgZGVhZCB2YXJpYWJsZSAnZm9yY2VDYXJib24nCisKIDIwMTEt MDYtMTMgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0 TmV0c2NhcGVQbHVnSW4vbWFpbi5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2Nh cGVQbHVnSW4vbWFpbi5jcHAKaW5kZXggNzYyYTI0OS4uNTYzOTM2MiAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL21haW4uY3BwCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9tYWluLmNwcApAQCAtMTMyLDggKzEz Miw2IEBAIHN0YXRpYyB2b2lkIGV4ZWN1dGVTY3JpcHQoY29uc3QgUGx1Z2luT2JqZWN0KiBvYmos IGNvbnN0IGNoYXIqIHNjcmlwdCk7CiAKIE5QRXJyb3IgTlBQX05ldyhOUE1JTUVUeXBlIHBsdWdp blR5cGUsIE5QUCBpbnN0YW5jZSwgdWludDE2X3QgbW9kZSwgaW50MTZfdCBhcmdjLCBjaGFyICph cmduW10sIGNoYXIgKmFyZ3ZbXSwgTlBTYXZlZERhdGEgKnNhdmVkKQogewotICAgIGJvb2wgZm9y Y2VDYXJib24gPSBmYWxzZTsKLQogI2lmZGVmIFhQX01BQ09TWAogICAgIE5QRXZlbnRNb2RlbCBl dmVudE1vZGVsOwogICAgIApAQCAtMTY1LDcgKzE2Myw3IEBAIE5QRXJyb3IgTlBQX05ldyhOUE1J TUVUeXBlIHBsdWdpblR5cGUsIE5QUCBpbnN0YW5jZSwgdWludDE2X3QgbW9kZSwgaW50MTZfdCBh cmdjCiAgICAgaWYgKGJyb3dzZXItPmdldHZhbHVlKGluc3RhbmNlLCBOUE5Wc3VwcG9ydHNDb2Nv YUJvb2wsICZzdXBwb3J0c0NvY29hKSAhPSBOUEVSUl9OT19FUlJPUikKICAgICAgICAgc3VwcG9y dHNDb2NvYSA9IGZhbHNlOwogCi0gICAgaWYgKHN1cHBvcnRzQ29jb2EgJiYgIWZvcmNlQ2FyYm9u KSB7CisgICAgaWYgKHN1cHBvcnRzQ29jb2EpIHsKICAgICAgICAgZXZlbnRNb2RlbCA9IE5QRXZl bnRNb2RlbENvY29hOwogI2lmbmRlZiBOUF9OT19DQVJCT04KICAgICB9IGVsc2UgaWYgKHN1cHBv cnRzQ2FyYm9uKSB7CkBAIC0yMTQsOCArMjEyLDYgQEAgTlBFcnJvciBOUFBfTmV3KE5QTUlNRVR5 cGUgcGx1Z2luVHlwZSwgTlBQIGluc3RhbmNlLCB1aW50MTZfdCBtb2RlLCBpbnQxNl90IGFyZ2MK ICAgICAgICAgICAgIG9iai0+bG9nU2V0V2luZG93ID0gVFJVRTsKICAgICAgICAgZWxzZSBpZiAo c3RyY2FzZWNtcChhcmduW2ldLCAidGVzdG5wcnVudGltZSIpID09IDApCiAgICAgICAgICAgICB0 ZXN0TlBSdW50aW1lKGluc3RhbmNlKTsKLSAgICAgICAgZWxzZSBpZiAoc3RyY2FzZWNtcChhcmdu W2ldLCAiZm9yY2VjYXJib24iKSA9PSAwKQotICAgICAgICAgICAgZm9yY2VDYXJib24gPSB0cnVl OwogICAgICAgICBlbHNlIGlmIChzdHJjYXNlY21wKGFyZ25baV0sICJsb2dTcmMiKSA9PSAwKSB7 CiAgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGFyZ2M7IGkrKykKICAgICAgICAgICAg ICAgICBpZiAoc3RyY2FzZWNtcChhcmduW2ldLCAic3JjIikgPT0gMCkK