From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 946 invoked by alias); 24 Feb 2008 20:14:09 -0000 Received: (qmail 937 invoked by uid 22791); 24 Feb 2008 20:14:07 -0000 X-Spam-Check-By: sourceware.org Received: from rv-out-0910.google.com (HELO rv-out-0910.google.com) (209.85.198.188) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 24 Feb 2008 20:13:49 +0000 Received: by rv-out-0910.google.com with SMTP id g11so778710rvb.56 for ; Sun, 24 Feb 2008 12:13:46 -0800 (PST) Received: by 10.141.141.3 with SMTP id t3mr1377042rvn.226.1203884026450; Sun, 24 Feb 2008 12:13:46 -0800 (PST) Received: by 10.141.19.8 with HTTP; Sun, 24 Feb 2008 12:13:46 -0800 (PST) Message-ID: <6c33472e0802241213u19adf3bbn9e8f078b271c9bec@mail.gmail.com> Date: Sun, 24 Feb 2008 21:14:00 -0000 From: "=?ISO-8859-1?Q?Manuel_L=F3pez-Ib=E1=F1ez?=" To: "GCC Patches" Subject: [4.4] remove diagnostic_count_diagnostic MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_5352_29303505.1203884026448" X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2008-02/txt/msg01110.txt.bz2 ------=_Part_5352_29303505.1203884026448 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 361 The function diagnostic_count_diagnostic is unnecessary: it always return true, the switch is not needed. This patch removes it. Bootstrapped and regression tested on x86_64-unknown-linux-gnu 2008-02-24 Manuel Lopez-Ibanez * diagnostic.c (diagnostic_count_diagnostic): Delete. (diagnostic_report_diagnostic): Update. Handle ICEs here. ------=_Part_5352_29303505.1203884026448 Content-Type: text/plain; name=remove-count-diagnostic.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_fd21fmfk Content-Disposition: attachment; filename=remove-count-diagnostic.diff Content-length: 7951 SW5kZXg6IGdjYy9kaWFnbm9zdGljLmMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gZ2NjL2RpYWdub3N0aWMuYwkocmV2aXNpb24gMTMyMTY2KQorKysg Z2NjL2RpYWdub3N0aWMuYwkod29ya2luZyBjb3B5KQpAQCAtNDksMTIgKzQ5 LDExIEBAIHN0YXRpYyB2b2lkIGRlZmF1bHRfZGlhZ25vc3RpY19zdGFydGVy ICgKIAkJCQkJZGlhZ25vc3RpY19pbmZvICopOwogc3RhdGljIHZvaWQgZGVm YXVsdF9kaWFnbm9zdGljX2ZpbmFsaXplciAoZGlhZ25vc3RpY19jb250ZXh0 ICosCiAJCQkJCSAgZGlhZ25vc3RpY19pbmZvICopOwogCiBzdGF0aWMgdm9p ZCBlcnJvcl9yZWN1cnNpb24gKGRpYWdub3N0aWNfY29udGV4dCAqKSBBVFRS SUJVVEVfTk9SRVRVUk47Ci1zdGF0aWMgYm9vbCBkaWFnbm9zdGljX2NvdW50 X2RpYWdub3N0aWMgKGRpYWdub3N0aWNfY29udGV4dCAqLAotCQkJCQkgZGlh Z25vc3RpY19pbmZvICopOworCiBzdGF0aWMgdm9pZCBkaWFnbm9zdGljX2Fj dGlvbl9hZnRlcl9vdXRwdXQgKGRpYWdub3N0aWNfY29udGV4dCAqLAogCQkJ CQkgICAgZGlhZ25vc3RpY19pbmZvICopOwogc3RhdGljIHZvaWQgcmVhbF9h Ym9ydCAodm9pZCkgQVRUUklCVVRFX05PUkVUVVJOOwogCiAvKiBBIGRpYWdu b3N0aWNfY29udGV4dCBzdXJyb2dhdGUgZm9yIHN0ZGVyci4gICovCkBAIC0x NjIsNTggKzE2MSwxMCBAQCBkaWFnbm9zdGljX2J1aWxkX3ByZWZpeCAoZGlh Z25vc3RpY19pbmZvCiAgICAgID8gYnVpbGRfbWVzc2FnZV9zdHJpbmcgKCIl czolZDolZDogJXMiLCBzLmZpbGUsIHMubGluZSwgcy5jb2x1bW4sIHRleHQp CiAjZW5kaWYKICAgICAgOiBidWlsZF9tZXNzYWdlX3N0cmluZyAoIiVzOiVk OiAlcyIsIHMuZmlsZSwgcy5saW5lLCB0ZXh0KSk7CiB9CiAKLS8qIENvdW50 IGEgZGlhZ25vc3RpYy4gIFJldHVybiB0cnVlIGlmIHRoZSBtZXNzYWdlIHNo b3VsZCBiZSBwcmludGVkLiAgKi8KLXN0YXRpYyBib29sCi1kaWFnbm9zdGlj X2NvdW50X2RpYWdub3N0aWMgKGRpYWdub3N0aWNfY29udGV4dCAqY29udGV4 dCwKLQkJCSAgICAgZGlhZ25vc3RpY19pbmZvICpkaWFnbm9zdGljKQotewot ICBkaWFnbm9zdGljX3Qga2luZCA9IGRpYWdub3N0aWMtPmtpbmQ7Ci0gIHN3 aXRjaCAoa2luZCkKLSAgICB7Ci0gICAgZGVmYXVsdDoKLSAgICAgIGdjY191 bnJlYWNoYWJsZSAoKTsKLQotICAgIGNhc2UgREtfSUNFOgotI2lmbmRlZiBF TkFCTEVfQ0hFQ0tJTkcKLSAgICAgIC8qIFdoZW4gbm90IGNoZWNraW5nLCBJ Q0VzIGFyZSBjb252ZXJ0ZWQgdG8gZmF0YWwgZXJyb3JzIHdoZW4gYW4KLQkg ZXJyb3IgaGFzIGFscmVhZHkgb2NjdXJyZWQuICBUaGlzIGlzIGNvdW50ZXJh Y3RlZCBieQotCSBhYm9ydF9vbl9lcnJvci4gICovCi0gICAgICBpZiAoKGRp YWdub3N0aWNfa2luZF9jb3VudCAoY29udGV4dCwgREtfRVJST1IpID4gMAot CSAgIHx8IGRpYWdub3N0aWNfa2luZF9jb3VudCAoY29udGV4dCwgREtfU09S UlkpID4gMCkKLQkgICYmICFjb250ZXh0LT5hYm9ydF9vbl9lcnJvcikKLQl7 Ci0JICBleHBhbmRlZF9sb2NhdGlvbiBzID0gZXhwYW5kX2xvY2F0aW9uIChk aWFnbm9zdGljLT5sb2NhdGlvbik7Ci0JICBmbm90aWNlIChzdGRlcnIsICIl czolZDogY29uZnVzZWQgYnkgZWFybGllciBlcnJvcnMsIGJhaWxpbmcgb3V0 XG4iLAotCQkgICBzLmZpbGUsIHMubGluZSk7Ci0JICBleGl0IChJQ0VfRVhJ VF9DT0RFKTsKLQl9Ci0jZW5kaWYKLSAgICAgIGlmIChjb250ZXh0LT5pbnRl cm5hbF9lcnJvcikKLQkoKmNvbnRleHQtPmludGVybmFsX2Vycm9yKSAoZGlh Z25vc3RpYy0+bWVzc2FnZS5mb3JtYXRfc3BlYywKLQkJCQkgICAgZGlhZ25v c3RpYy0+bWVzc2FnZS5hcmdzX3B0cik7Ci0gICAgICAvKiBGYWxsIHRocm91 Z2guICAqLwotCi0gICAgY2FzZSBES19GQVRBTDogY2FzZSBES19TT1JSWToK LSAgICBjYXNlIERLX0FOQUNIUk9OSVNNOiBjYXNlIERLX05PVEU6Ci0gICAg ICArK2RpYWdub3N0aWNfa2luZF9jb3VudCAoY29udGV4dCwga2luZCk7Ci0g ICAgICBicmVhazsKLQotICAgIGNhc2UgREtfV0FSTklORzoKLSAgICAgICsr ZGlhZ25vc3RpY19raW5kX2NvdW50IChjb250ZXh0LCBES19XQVJOSU5HKTsK LSAgICAgIGJyZWFrOwotCi0gICAgY2FzZSBES19FUlJPUjoKLSAgICAgICsr ZGlhZ25vc3RpY19raW5kX2NvdW50IChjb250ZXh0LCBES19FUlJPUik7Ci0g ICAgICBicmVhazsKLSAgICB9Ci0KLSAgcmV0dXJuIHRydWU7Ci19Ci0KIC8q IFRha2UgYW55IGFjdGlvbiB3aGljaCBpcyBleHBlY3RlZCB0byBoYXBwZW4g YWZ0ZXIgdGhlIGRpYWdub3N0aWMKICAgIGlzIHdyaXR0ZW4gb3V0LiAgVGhp cyBmdW5jdGlvbiBkb2VzIG5vdCBhbHdheXMgcmV0dXJuLiAgKi8KIHN0YXRp YyB2b2lkCiBkaWFnbm9zdGljX2FjdGlvbl9hZnRlcl9vdXRwdXQgKGRpYWdu b3N0aWNfY29udGV4dCAqY29udGV4dCwKIAkJCQlkaWFnbm9zdGljX2luZm8g KmRpYWdub3N0aWMpCkBAIC0zNDMsMTAgKzI5NCwxMSBAQCBkaWFnbm9zdGlj X2NsYXNzaWZ5X2RpYWdub3N0aWMgKGRpYWdub3N0CiB2b2lkCiBkaWFnbm9z dGljX3JlcG9ydF9kaWFnbm9zdGljIChkaWFnbm9zdGljX2NvbnRleHQgKmNv bnRleHQsCiAJCQkgICAgICBkaWFnbm9zdGljX2luZm8gKmRpYWdub3N0aWMp CiB7CiAgIGJvb2wgbWF5YmVfcHJpbnRfd2FybmluZ3NfYXNfZXJyb3JzX21l c3NhZ2UgPSBmYWxzZTsKKyAgY29uc3QgY2hhciAqc2F2ZWRfZm9ybWF0X3Nw ZWM7CiAKICAgLyogR2l2ZSBwcmVmZXJlbmNlIHRvIGJlaW5nIGFibGUgdG8g aW5oaWJpdCB3YXJuaW5ncywgYmVmb3JlIHRoZXkKICAgICAgZ2V0IHJlY2xh c3NpZmllZCB0byBzb21ldGhpbmcgZWxzZS4gICovCiAgIGlmIChkaWFnbm9z dGljLT5raW5kID09IERLX1dBUk5JTkcgCiAgICAgICAmJiAhZGlhZ25vc3Rp Y19yZXBvcnRfd2FybmluZ3NfcCAoKSkKQEAgLTQwMywzMSArMzU1LDQ5IEBA IGRpYWdub3N0aWNfcmVwb3J0X2RpYWdub3N0aWMgKGRpYWdub3N0aWMKICAg ICAgIGNvbnRleHQtPmlzc3VlX3dhcm5pbmdzX2FyZV9lcnJvcnNfbWVzc2Fn ZSA9IGZhbHNlOwogICAgIH0KIAogICBjb250ZXh0LT5sb2NrKys7CiAKLSAg aWYgKGRpYWdub3N0aWNfY291bnRfZGlhZ25vc3RpYyAoY29udGV4dCwgZGlh Z25vc3RpYykpCisgIGlmIChkaWFnbm9zdGljLT5raW5kID09IERLX0lDRSkg CiAgICAgewotICAgICAgY29uc3QgY2hhciAqc2F2ZWRfZm9ybWF0X3NwZWMg PSBkaWFnbm9zdGljLT5tZXNzYWdlLmZvcm1hdF9zcGVjOwotCi0gICAgICBp ZiAoY29udGV4dC0+c2hvd19vcHRpb25fcmVxdWVzdGVkICYmIGRpYWdub3N0 aWMtPm9wdGlvbl9pbmRleCkKLQlkaWFnbm9zdGljLT5tZXNzYWdlLmZvcm1h dF9zcGVjCi0JICA9IEFDT05DQVQgKChkaWFnbm9zdGljLT5tZXNzYWdlLmZv cm1hdF9zcGVjLAotCQkgICAgICAiIFsiLCBjbF9vcHRpb25zW2RpYWdub3N0 aWMtPm9wdGlvbl9pbmRleF0ub3B0X3RleHQsICJdIiwgTlVMTCkpOwotCi0g ICAgICBkaWFnbm9zdGljLT5tZXNzYWdlLmxvY3VzID0gJmRpYWdub3N0aWMt PmxvY2F0aW9uOwotICAgICAgZGlhZ25vc3RpYy0+bWVzc2FnZS5hYnN0cmFj dF9vcmlnaW4gPSAmZGlhZ25vc3RpYy0+YWJzdHJhY3Rfb3JpZ2luOwotICAg ICAgZGlhZ25vc3RpYy0+YWJzdHJhY3Rfb3JpZ2luID0gTlVMTDsKLSAgICAg IHBwX2Zvcm1hdCAoY29udGV4dC0+cHJpbnRlciwgJmRpYWdub3N0aWMtPm1l c3NhZ2UpOwotICAgICAgKCpkaWFnbm9zdGljX3N0YXJ0ZXIgKGNvbnRleHQp KSAoY29udGV4dCwgZGlhZ25vc3RpYyk7Ci0gICAgICBwcF9vdXRwdXRfZm9y bWF0dGVkX3RleHQgKGNvbnRleHQtPnByaW50ZXIpOwotICAgICAgKCpkaWFn bm9zdGljX2ZpbmFsaXplciAoY29udGV4dCkpIChjb250ZXh0LCBkaWFnbm9z dGljKTsKLSAgICAgIHBwX2ZsdXNoIChjb250ZXh0LT5wcmludGVyKTsKLSAg ICAgIGRpYWdub3N0aWNfYWN0aW9uX2FmdGVyX291dHB1dCAoY29udGV4dCwg ZGlhZ25vc3RpYyk7Ci0gICAgICBkaWFnbm9zdGljLT5tZXNzYWdlLmZvcm1h dF9zcGVjID0gc2F2ZWRfZm9ybWF0X3NwZWM7Ci0gICAgICBkaWFnbm9zdGlj LT5hYnN0cmFjdF9vcmlnaW4gPSBOVUxMOworI2lmbmRlZiBFTkFCTEVfQ0hF Q0tJTkcKKyAgICAgIC8qIFdoZW4gbm90IGNoZWNraW5nLCBJQ0VzIGFyZSBj b252ZXJ0ZWQgdG8gZmF0YWwgZXJyb3JzIHdoZW4gYW4KKwkgZXJyb3IgaGFz IGFscmVhZHkgb2NjdXJyZWQuICBUaGlzIGlzIGNvdW50ZXJhY3RlZCBieQor CSBhYm9ydF9vbl9lcnJvci4gICovCisgICAgICBpZiAoKGRpYWdub3N0aWNf a2luZF9jb3VudCAoY29udGV4dCwgREtfRVJST1IpID4gMAorCSAgIHx8IGRp YWdub3N0aWNfa2luZF9jb3VudCAoY29udGV4dCwgREtfU09SUlkpID4gMCkK KwkgICYmICFjb250ZXh0LT5hYm9ydF9vbl9lcnJvcikKKwl7CisJICBleHBh bmRlZF9sb2NhdGlvbiBzID0gZXhwYW5kX2xvY2F0aW9uIChkaWFnbm9zdGlj LT5sb2NhdGlvbik7CisJICBmbm90aWNlIChzdGRlcnIsICIlczolZDogY29u ZnVzZWQgYnkgZWFybGllciBlcnJvcnMsIGJhaWxpbmcgb3V0XG4iLAorCQkg ICBzLmZpbGUsIHMubGluZSk7CisJICBleGl0IChJQ0VfRVhJVF9DT0RFKTsK Kwl9CisjZW5kaWYKKyAgICAgIGlmIChjb250ZXh0LT5pbnRlcm5hbF9lcnJv cikKKwkoKmNvbnRleHQtPmludGVybmFsX2Vycm9yKSAoZGlhZ25vc3RpYy0+ bWVzc2FnZS5mb3JtYXRfc3BlYywKKwkJCQkgICAgZGlhZ25vc3RpYy0+bWVz c2FnZS5hcmdzX3B0cik7CiAgICAgfQorICArK2RpYWdub3N0aWNfa2luZF9j b3VudCAoY29udGV4dCwgZGlhZ25vc3RpYy0+a2luZCk7CisgIAorICBzYXZl ZF9mb3JtYXRfc3BlYyA9IGRpYWdub3N0aWMtPm1lc3NhZ2UuZm9ybWF0X3Nw ZWM7CisgIGlmIChjb250ZXh0LT5zaG93X29wdGlvbl9yZXF1ZXN0ZWQgJiYg ZGlhZ25vc3RpYy0+b3B0aW9uX2luZGV4KQorICAgIGRpYWdub3N0aWMtPm1l c3NhZ2UuZm9ybWF0X3NwZWMKKyAgICAgID0gQUNPTkNBVCAoKGRpYWdub3N0 aWMtPm1lc3NhZ2UuZm9ybWF0X3NwZWMsCisgICAgICAgICAgICAgICAgICAi IFsiLCBjbF9vcHRpb25zW2RpYWdub3N0aWMtPm9wdGlvbl9pbmRleF0ub3B0 X3RleHQsICJdIiwgTlVMTCkpOworICAKKyAgZGlhZ25vc3RpYy0+bWVzc2Fn ZS5sb2N1cyA9ICZkaWFnbm9zdGljLT5sb2NhdGlvbjsKKyAgZGlhZ25vc3Rp Yy0+bWVzc2FnZS5hYnN0cmFjdF9vcmlnaW4gPSAmZGlhZ25vc3RpYy0+YWJz dHJhY3Rfb3JpZ2luOworICBkaWFnbm9zdGljLT5hYnN0cmFjdF9vcmlnaW4g PSBOVUxMOworICBwcF9mb3JtYXQgKGNvbnRleHQtPnByaW50ZXIsICZkaWFn bm9zdGljLT5tZXNzYWdlKTsKKyAgKCpkaWFnbm9zdGljX3N0YXJ0ZXIgKGNv bnRleHQpKSAoY29udGV4dCwgZGlhZ25vc3RpYyk7CisgIHBwX291dHB1dF9m b3JtYXR0ZWRfdGV4dCAoY29udGV4dC0+cHJpbnRlcik7CisgICgqZGlhZ25v c3RpY19maW5hbGl6ZXIgKGNvbnRleHQpKSAoY29udGV4dCwgZGlhZ25vc3Rp Yyk7CisgIHBwX2ZsdXNoIChjb250ZXh0LT5wcmludGVyKTsKKyAgZGlhZ25v c3RpY19hY3Rpb25fYWZ0ZXJfb3V0cHV0IChjb250ZXh0LCBkaWFnbm9zdGlj KTsKKyAgZGlhZ25vc3RpYy0+bWVzc2FnZS5mb3JtYXRfc3BlYyA9IHNhdmVk X2Zvcm1hdF9zcGVjOworICBkaWFnbm9zdGljLT5hYnN0cmFjdF9vcmlnaW4g PSBOVUxMOwogCiAgIGNvbnRleHQtPmxvY2stLTsKIH0KIAogLyogR2l2ZW4g YSBwYXJ0aWFsIHBhdGhuYW1lIGFzIGlucHV0LCByZXR1cm4gYW5vdGhlciBw YXRobmFtZSB0aGF0Cg== ------=_Part_5352_29303505.1203884026448--