11504 2006-11-03 05:25:52 -0800 Fix warnings on non 32 bit platforms 2006-11-03 14:21:18 -0800 1 1 1 Unclassified WebKit JavaScriptCore 420+ PC Linux RESOLVED FIXED P2 Normal --- 11508 1 zack webkit-unassigned ap oldest_to_newest 47620 0 zack 2006-11-03 05:25:52 -0800 On platforms with 32bit userspace, uintptr_t is 32bits so compiler complains about truncating a 64bit type to 32bits. This is basically the same casts we added in kdelibs to kjs. 47621 1 11363 zack 2006-11-03 05:26:30 -0800 Created attachment 11363 fix warning by explicitly casting 47629 2 11363 timothy 2006-11-03 09:20:24 -0800 Comment on attachment 11363 fix warning by explicitly casting Looks fine. static_cast would be safer. 47630 3 11364 ap 2006-11-03 09:52:10 -0800 Created attachment 11364 alternative fix This should fix the issue by eliminating runtime checks. 47638 4 11364 darin 2006-11-03 12:27:26 -0800 Comment on attachment 11364 alternative fix I think Alexey's fix is better. r=me 47179 5 ap 2006-11-03 14:21:18 -0800 Committed revision 17580. Here's hope that my fix actually helps :-) 11363 2006-11-03 05:26:30 -0800 2006-11-04 06:03:48 -0800 fix warning by explicitly casting webk10.diff text/plain 1265 zack SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTY3KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDYtMTEtMDMgIFphY2sgUnVz aW4gIDx6YWNrQGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBranMvSlNJbW1lZGlhdGUuaDoKKyAgICAgICAgKEtKUzo6SlNJbW1lZGlh dGU6Ok5hbkFzQml0cyk6IEZpeGluZyB3YXJuaW5nIG9uIDMyYml0IHBsYXRmb3JtcworICAgICAg ICAoS0pTOjpKU0ltbWVkaWF0ZTo6b25lQXNCaXRzKTogRml4aW5nIHdhcm5pbmcgb24gMzJiaXQg cGxhdGZvcm1zCisKIDIwMDYtMTEtMDIgIEdlb3JnZSBTdGFpa29zIDxzdGFpa29zQGtkZS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqLgpJbmRleDogSmF2YVNjcmlwdENvcmUva2pz L0pTSW1tZWRpYXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUva2pzL0pTSW1tZWRp YXRlLmgJKHJldmlzaW9uIDE3NTY3KQorKysgSmF2YVNjcmlwdENvcmUva2pzL0pTSW1tZWRpYXRl LmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMyw3ICsyMTMsNyBAQCBwcml2YXRlOgogICAgICAgICBp ZiAoaXMzMmJpdCgpKQogICAgICAgICAgICAgcmV0dXJuIE5hTjMyQXNCaXRzOwogICAgICAgICBl bHNlIGlmIChpczY0Yml0KCkpCi0gICAgICAgICAgICByZXR1cm4gTmFONjRBc0JpdHM7CisgICAg ICAgICAgICByZXR1cm4gKHVpbnRwdHJfdClOYU42NEFzQml0czsKICAgICAgICAgZWxzZSB7CiAg ICAgICAgICAgICBhYm9ydCgpOwogICAgICAgICAgICAgcmV0dXJuIDA7CkBAIC0yMzMsNyArMjMz LDcgQEAgcHJpdmF0ZToKICAgICAgICAgaWYgKGlzMzJiaXQoKSkKICAgICAgICAgICAgIHJldHVy biBPbmUzMkFzQml0czsKICAgICAgICAgZWxzZSBpZiAoaXM2NGJpdCgpKQotICAgICAgICAgICAg cmV0dXJuIE9uZTY0QXNCaXRzOworICAgICAgICAgICAgcmV0dXJuICh1aW50cHRyX3QpT25lNjRB c0JpdHM7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgYWJvcnQoKTsKICAgICAgICAgICAg IHJldHVybiAwOwo= 11364 2006-11-03 09:52:10 -0800 2006-11-03 12:27:26 -0800 alternative fix 11504_patch.txt text/plain 4397 ap SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTczKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDYtMTEtMDMgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBueXBvcC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE1MDQKKyAgICAgICAgRml4IHdhcm5pbmdzIG9uIG5vbiAzMiBiaXQgcGxhdGZvcm1zCisK KyAgICAgICAgKiBranMvSlNJbW1lZGlhdGUuaDoKKyAgICAgICAgKEtKUzo6SlNJbW1lZGlhdGU6 Ok5hbkFzQml0cyk6CisgICAgICAgIChLSlM6OkpTSW1tZWRpYXRlOjpvbmVBc0JpdHMpOgorICAg ICAgICBSZXdyaXRlIGlzIGEgd2F5IHRoYXQgbW92ZXMgcnVudGltZSBjaGVja3MgdG8gY29tcGls ZS10aW1lLgorCisgICAgICAgIChLSlM6Oik6CisgICAgICAgIChLSlM6OkpTSW1tZWRpYXRlOjpm cm9tRG91YmxlKToKKyAgICAgICAgKEtKUzo6SlNJbW1lZGlhdGU6OnRvRG91YmxlKToKKwogMjAw Ni0xMS0wMiAgR2VvcmdlIFN0YWlrb3MgPHN0YWlrb3NAa2RlLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBNYWNpZWouCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9ranMvSlNJbW1lZGlhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9ranMvSlNJbW1lZGlhdGUuaAkocmV2aXNpb24g MTc1NzMpCisrKyBKYXZhU2NyaXB0Q29yZS9ranMvSlNJbW1lZGlhdGUuaAkod29ya2luZyBjb3B5 KQpAQCAtNDMsNiArNDMsMjIgQEAgY2xhc3MgSlNPYmplY3Q7CiBjbGFzcyBKU1ZhbHVlOwogY2xh c3MgVVN0cmluZzsKIAordGVtcGxhdGU8Ym9vbCBmb3IzMmJpdCwgYm9vbCBmb3I2NGJpdD4gc3Ry dWN0IE5hbkFzQml0c1ZhbHVlIHt9OwordGVtcGxhdGU8PiBzdHJ1Y3QgTmFuQXNCaXRzVmFsdWU8 dHJ1ZSwgZmFsc2U+IHsKKyAgICBlbnVtIHsgdmFsdWUgPSAweDdmYzAwMDAwIH07Cit9OwordGVt cGxhdGU8PiBzdHJ1Y3QgTmFuQXNCaXRzVmFsdWU8ZmFsc2UsIHRydWU+IHsKKyAgICBlbnVtIHsg dmFsdWUgPSAweDdmZjgwMDAwVUxMIDw8IDMyIH07Cit9OworCit0ZW1wbGF0ZTxib29sIGZvcjMy Yml0LCBib29sIGZvcjY0Yml0PiBzdHJ1Y3Qgb25lQXNCaXRzVmFsdWUge307Cit0ZW1wbGF0ZTw+ IHN0cnVjdCBvbmVBc0JpdHNWYWx1ZTx0cnVlLCBmYWxzZT4geworICAgIGVudW0geyB2YWx1ZSA9 IDB4M2Y4MDAwMDAgfTsKK307Cit0ZW1wbGF0ZTw+IHN0cnVjdCBvbmVBc0JpdHNWYWx1ZTxmYWxz ZSwgdHJ1ZT4geworICAgIGVudW0geyB2YWx1ZSA9IDB4M2ZmMDAwMDBVTEwgPDwgMzIgfTsKK307 CisKIC8qCiAgKiBBIEpTVmFsdWUgKiBpcyBlaXRoZXIgYSBwb2ludGVyIHRvIGEgY2VsbCAoYSBo ZWFwLWFsbG9jYXRlZCBvYmplY3QpIG9yIGFuIGltbWVkaWF0ZSAoYSB0eXBlLXRhZ2dlZCAKICAq IElFRUUgZmxvYXRpbmcgcG9pbnQgYml0IHBhdHRlcm4gbWFzcXVlcmFkaW5nIGFzIGEgcG9pbnRl cikuIFRoZSBsb3cgdHdvIGJpdHMgaW4gYSBKU1ZhbHVlICogYXJlIGF2YWlsYWJsZSAKQEAgLTkw LDcgKzEwNiw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBKU1ZhbHVlICpmcm9tRG91YmxlKGRv dWJsZSBkKQogICAgIHsKLSAgICAgICAgaWYgKGlzMzJiaXQoKSkgeworICAgICAgICBpZiAoaXMz MmJpdCkgewogICAgICAgICAgICAgRmxvYXRVbmlvbiBmbG9hdFVuaW9uOwogICAgICAgICAgICAg ZmxvYXRVbmlvbi5hc0Zsb2F0ID0gZDsKICAgICAgICAgICAgIApAQCAtMTA2LDcgKzEyMiw3IEBA IHB1YmxpYzoKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgICAgIAogICAgICAg ICAgICAgcmV0dXJuIHRhZyhmbG9hdFVuaW9uLmFzQml0cywgTnVtYmVyVHlwZSk7Ci0gICAgICAg IH0gZWxzZSBpZiAoaXM2NGJpdCgpKSB7CisgICAgICAgIH0gZWxzZSBpZiAoaXM2NGJpdCkgewog ICAgICAgICAgICAgRG91YmxlVW5pb24gZG91YmxlVW5pb247CiAgICAgICAgICAgICBkb3VibGVV bmlvbi5hc0RvdWJsZSA9IGQ7CiAgICAgICAgICAgICAKQEAgLTEyNiwxMSArMTQyLDExIEBAIHB1 YmxpYzoKICAgICB7CiAgICAgICAgIEFTU0VSVChpc0ltbWVkaWF0ZSh2KSk7CiAgICAgICAgIAot ICAgICAgICBpZiAoaXMzMmJpdCgpKSB7CisgICAgICAgIGlmIChpczMyYml0KSB7CiAgICAgICAg ICAgICBGbG9hdFVuaW9uIGZsb2F0VW5pb247CiAgICAgICAgICAgICBmbG9hdFVuaW9uLmFzQml0 cyA9IHVuVGFnKHYpOwogICAgICAgICAgICAgcmV0dXJuIGZsb2F0VW5pb24uYXNGbG9hdDsKLSAg ICAgICAgfSBlbHNlIGlmIChpczY0Yml0KCkpIHsKKyAgICAgICAgfSBlbHNlIGlmIChpczY0Yml0 KSB7CiAgICAgICAgICAgICBEb3VibGVVbmlvbiBkb3VibGVVbmlvbjsKICAgICAgICAgICAgIGRv dWJsZVVuaW9uLmFzQml0cyA9IHVuVGFnKHYpOwogICAgICAgICAgICAgcmV0dXJuIGRvdWJsZVVu aW9uLmFzRG91YmxlOwpAQCAtMTk0LDMwICsyMTAsMTYgQEAgcHJpdmF0ZToKICAgICB9OwogCiAg ICAgLy8gd2Ugc3VwcG9ydCAzMi1iaXQgcGxhdGZvcm1zIHdpdGggc2l6ZXMgbGlrZSB0aGlzCi0g ICAgc3RhdGljIGJvb2wgaXMzMmJpdCgpIAotICAgIHsKLSAgICAgICAgcmV0dXJuIHNpemVvZihm bG9hdCkgPT0gc2l6ZW9mKHVpbnQzMl90KSAmJiBzaXplb2YoZG91YmxlKSA9PSBzaXplb2YodWlu dDY0X3QpICYmIHNpemVvZih1aW50cHRyX3QpID09IHNpemVvZih1aW50MzJfdCk7Ci0gICAgfQor ICAgIHN0YXRpYyBjb25zdCBib29sIGlzMzJiaXQgPSAKKyAgICAgICAgc2l6ZW9mKGZsb2F0KSA9 PSBzaXplb2YodWludDMyX3QpICYmIHNpemVvZihkb3VibGUpID09IHNpemVvZih1aW50NjRfdCkg JiYgc2l6ZW9mKHVpbnRwdHJfdCkgPT0gc2l6ZW9mKHVpbnQzMl90KTsKIAogICAgIC8vIHdlIHN1 cHBvcnQgNjQtYml0IHBsYXRmb3JtcyB3aXRoIHNpemVzIGxpa2UgdGhpcwotICAgIHN0YXRpYyBi b29sIGlzNjRiaXQoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHNpemVvZihmbG9hdCkgPT0gc2l6 ZW9mKHVpbnQzMl90KSAmJiBzaXplb2YoZG91YmxlKSA9PSBzaXplb2YodWludDY0X3QpICYmIHNp emVvZih1aW50cHRyX3QpID09IHNpemVvZih1aW50NjRfdCk7Ci0gICAgfQorICAgIHN0YXRpYyBj b25zdCBib29sIGlzNjRiaXQgPQorICAgICAgICBzaXplb2YoZmxvYXQpID09IHNpemVvZih1aW50 MzJfdCkgJiYgc2l6ZW9mKGRvdWJsZSkgPT0gc2l6ZW9mKHVpbnQ2NF90KSAmJiBzaXplb2YodWlu dHB0cl90KSA9PSBzaXplb2YodWludDY0X3QpOwogCiAgICAgc3RhdGljIHVpbnRwdHJfdCBOYW5B c0JpdHMoKQogICAgIHsKLSAgICAgICAgY29uc3QgdWludDMyX3QgTmFOMzJBc0JpdHMgPSAweDdm YzAwMDAwOwotICAgICAgICBjb25zdCB1aW50NjRfdCBOYU42NEFzQml0cyA9IDB4N2ZmODAwMDBV TEwgPDwgMzI7Ci0KLSAgICAgICAgaWYgKGlzMzJiaXQoKSkKLSAgICAgICAgICAgIHJldHVybiBO YU4zMkFzQml0czsKLSAgICAgICAgZWxzZSBpZiAoaXM2NGJpdCgpKQotICAgICAgICAgICAgcmV0 dXJuIE5hTjY0QXNCaXRzOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGFib3J0KCk7Ci0g ICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgfQorICAgICAgICByZXR1cm4gTmFuQXNCaXRz VmFsdWU8aXMzMmJpdCwgaXM2NGJpdD46OnZhbHVlOwogICAgIH0KIAogICAgIHN0YXRpYyB1aW50 cHRyX3QgemVyb0FzQml0cygpCkBAIC0yMjcsMTcgKzIyOSw3IEBAIHByaXZhdGU6CiAKICAgICBz dGF0aWMgdWludHB0cl90IG9uZUFzQml0cygpCiAgICAgewotICAgICAgICBjb25zdCB1aW50MzJf dCBPbmUzMkFzQml0cyA9IDB4M2Y4MDAwMDA7Ci0gICAgICAgIGNvbnN0IHVpbnQ2NF90IE9uZTY0 QXNCaXRzID0gMHgzZmYwMDAwMFVMTCA8PCAzMjsKLQotICAgICAgICBpZiAoaXMzMmJpdCgpKQot ICAgICAgICAgICAgcmV0dXJuIE9uZTMyQXNCaXRzOwotICAgICAgICBlbHNlIGlmIChpczY0Yml0 KCkpCi0gICAgICAgICAgICByZXR1cm4gT25lNjRBc0JpdHM7Ci0gICAgICAgIGVsc2UgewotICAg ICAgICAgICAgYWJvcnQoKTsKLSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICB9CisgICAg ICAgIHJldHVybiBvbmVBc0JpdHNWYWx1ZTxpczMyYml0LCBpczY0Yml0Pjo6dmFsdWU7CiAgICAg fQogfTsKIAo=