From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13133 invoked by alias); 30 Jul 2018 11:51:32 -0000 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 Received: (qmail 13122 invoked by uid 89); 30 Jul 2018 11:51:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.6 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=integral_type_p, INTEGRAL_TYPE_P, HCC:D*de, H*c:HHH X-HELO: EUR02-VE1-obe.outbound.protection.outlook.com Received: from mail-oln040092069048.outbound.protection.outlook.com (HELO EUR02-VE1-obe.outbound.protection.outlook.com) (40.92.69.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 30 Jul 2018 11:51:29 +0000 Received: from HE1EUR02FT033.eop-EUR02.prod.protection.outlook.com (10.152.10.53) by HE1EUR02HT226.eop-EUR02.prod.protection.outlook.com (10.152.11.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1038.3; Mon, 30 Jul 2018 11:51:25 +0000 Received: from AM5PR0701MB2657.eurprd07.prod.outlook.com (10.152.10.54) by HE1EUR02FT033.mail.protection.outlook.com (10.152.10.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.1038.3 via Frontend Transport; Mon, 30 Jul 2018 11:51:25 +0000 Received: from AM5PR0701MB2657.eurprd07.prod.outlook.com ([fe80::b1fe:1b4f:88c3:5243]) by AM5PR0701MB2657.eurprd07.prod.outlook.com ([fe80::b1fe:1b4f:88c3:5243%9]) with mapi id 15.20.1017.010; Mon, 30 Jul 2018 11:51:25 +0000 From: Bernd Edlinger To: GCC Patches CC: Richard Biener , Jakub Jelinek , "Jeff Law" , "Joseph S. Myers" , "Martin Sebor" Subject: [PATCH] Fix the damage done by my other patch from yesterday to strlenopt-49.c Date: Mon, 30 Jul 2018 11:51:00 -0000 Message-ID: received-spf: None (protection.outlook.com: hotmail.de does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=bernd.edlinger@hotmail.de; Content-Type: multipart/mixed; boundary="_002_AM5PR0701MB26577C800216899DCF6647E6E42F0AM5PR0701MB2657_" MIME-Version: 1.0 X-SW-Source: 2018-07/txt/msg01833.txt.bz2 --_002_AM5PR0701MB26577C800216899DCF6647E6E42F0AM5PR0701MB2657_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-length: 554 Hi, this is how I would like to handle the over length strings issue in the C F= E. If the string constant is exactly the right length and ends in one explicit NUL character, shorten it by one character. I thought Martin would be working on it, but as this is a really simple fi= x, I would dare to send it to gcc-patches anyway, hope you don't mind... The patch is relative to the other patch here: https://gcc.gnu.org/ml/gcc-p= atches/2018-07/msg01800.html Bootstrapped and reg-tested on x86_64-pc-linux-gnu. Is it OK for trunk? Thanks Bernd.= --_002_AM5PR0701MB26577C800216899DCF6647E6E42F0AM5PR0701MB2657_ Content-Type: text/x-patch; name="patch-overlength-strings.diff" Content-Description: patch-overlength-strings.diff Content-Disposition: attachment; filename="patch-overlength-strings.diff"; size=3713; creation-date="Mon, 30 Jul 2018 11:47:38 GMT"; modification-date="Mon, 30 Jul 2018 11:47:38 GMT" Content-Transfer-Encoding: base64 Content-length: 5035 Z2NjL2M6CjIwMTgtMDctMzAgIEJlcm5kIEVkbGluZ2VyICA8YmVybmQuZWRs aW5nZXJAaG90bWFpbC5kZT4KCgkqIGMtdHlwZWNrLmMgKGRpZ2VzdF9pbml0 KTogRml4IG92ZXJsZW5ndGggc3RyaW5ncy4KCnRlc3RzdWl0ZToKMjAxOC0w Ny0zMCAgQmVybmQgRWRsaW5nZXIgIDxiZXJuZC5lZGxpbmdlckBob3RtYWls LmRlPgoKCSogZ2NjLmRnL3N0cmxlbm9wdC00OS5jOiBBZGp1c3QgdGVzdCBl eHBlY3RhdGlvbnMuCgpkaWZmIC1wdXIgZ2NjL2MvYy10eXBlY2suYyBnY2Mv Yy9jLXR5cGVjay5jCi0tLSBnY2MvYy9jLXR5cGVjay5jCTIwMTgtMDYtMjAg MTg6MzU6MTUuMDAwMDAwMDAwICswMjAwCisrKyBnY2MvYy9jLXR5cGVjay5j CTIwMTgtMDctMzAgMTI6MTc6MzQuMTc1NDgxMzcyICswMjAwCkBAIC03NDM1 LDI5ICs3NDM1LDM4IEBAIGRpZ2VzdF9pbml0IChsb2NhdGlvbl90IGluaXRf bG9jLCB0cmVlIHQKIAkJfQogCSAgICB9CiAKLQkgIFRSRUVfVFlQRSAoaW5z aWRlX2luaXQpID0gdHlwZTsKIAkgIGlmIChUWVBFX0RPTUFJTiAodHlwZSkg IT0gTlVMTF9UUkVFCiAJICAgICAgJiYgVFlQRV9TSVpFICh0eXBlKSAhPSBO VUxMX1RSRUUKIAkgICAgICAmJiBUUkVFX0NPREUgKFRZUEVfU0laRSAodHlw ZSkpID09IElOVEVHRVJfQ1NUKQogCSAgICB7CiAJICAgICAgdW5zaWduZWQg SE9TVF9XSURFX0lOVCBsZW4gPSBUUkVFX1NUUklOR19MRU5HVEggKGluc2lk ZV9pbml0KTsKKwkgICAgICB1bnNpZ25lZCB1bml0ID0gVFlQRV9QUkVDSVNJ T04gKHR5cDEpIC8gQklUU19QRVJfVU5JVDsKIAogCSAgICAgIC8qIFN1YnRy YWN0IHRoZSBzaXplIG9mIGEgc2luZ2xlIChwb3NzaWJseSB3aWRlKSBjaGFy YWN0ZXIKIAkJIGJlY2F1c2UgaXQncyBvayB0byBpZ25vcmUgdGhlIHRlcm1p bmF0aW5nIG51bGwgY2hhcgogCQkgdGhhdCBpcyBjb3VudGVkIGluIHRoZSBs ZW5ndGggb2YgdGhlIGNvbnN0YW50LiAgKi8KLQkgICAgICBpZiAoY29tcGFy ZV90cmVlX2ludCAoVFlQRV9TSVpFX1VOSVQgKHR5cGUpLAotCQkJCSAgICAo bGVuIC0gKFRZUEVfUFJFQ0lTSU9OICh0eXAxKQotCQkJCQkgICAgLyBCSVRT X1BFUl9VTklUKSkpIDwgMCkKKwkgICAgICBpZiAoY29tcGFyZV90cmVlX2lu dCAoVFlQRV9TSVpFX1VOSVQgKHR5cGUpLCBsZW4gLSB1bml0KSA8IDApCiAJ CXBlZHdhcm5faW5pdCAoaW5pdF9sb2MsIDAsCiAJCQkgICAgICAoImluaXRp YWxpemVyLXN0cmluZyBmb3IgYXJyYXkgb2YgY2hhcnMgIgogCQkJICAgICAg ICJpcyB0b28gbG9uZyIpKTsKLQkgICAgICBlbHNlIGlmICh3YXJuX2N4eF9j b21wYXQKLQkJICAgICAgICYmIGNvbXBhcmVfdHJlZV9pbnQgKFRZUEVfU0la RV9VTklUICh0eXBlKSwgbGVuKSA8IDApCi0JCXdhcm5pbmdfYXQgKGluaXRf bG9jLCBPUFRfV2NfX19jb21wYXQsCi0JCQkgICAgKCJpbml0aWFsaXplci1z dHJpbmcgZm9yIGFycmF5IGNoYXJzICIKLQkJCSAgICAgImlzIHRvbyBsb25n IGZvciBDKysiKSk7CisJICAgICAgZWxzZSBpZiAoY29tcGFyZV90cmVlX2lu dCAoVFlQRV9TSVpFX1VOSVQgKHR5cGUpLCBsZW4pIDwgMCkKKwkJeworCQkg IGlmICh3YXJuX2N4eF9jb21wYXQpCisJCSAgICB3YXJuaW5nX2F0IChpbml0 X2xvYywgT1BUX1djX19fY29tcGF0LAorCQkJCSgiaW5pdGlhbGl6ZXItc3Ry aW5nIGZvciBhcnJheSBjaGFycyAiCisJCQkJICJpcyB0b28gbG9uZyBmb3Ig QysrIikpOworCQkgIGlmIChsZW4gPj0gMiAqIHVuaXQpCisJCSAgICB7CisJ CSAgICAgIGNvbnN0IGNoYXIgKnAgPSBUUkVFX1NUUklOR19QT0lOVEVSIChp bnNpZGVfaW5pdCk7CisKKwkJICAgICAgbGVuIC09IHVuaXQ7CisJCSAgICAg IGlmIChtZW1jbXAgKHAgKyBsZW4gLSB1bml0LCAiXDBcMFwwXDAiLCB1bml0 KSA9PSAwKQorCQkJaW5zaWRlX2luaXQgPSBidWlsZF9zdHJpbmcgKGxlbiwg cCk7CisJCSAgICB9CisJCX0KIAkgICAgfQogCisJICBUUkVFX1RZUEUgKGlu c2lkZV9pbml0KSA9IHR5cGU7CiAJICByZXR1cm4gaW5zaWRlX2luaXQ7CiAJ fQogICAgICAgZWxzZSBpZiAoSU5URUdSQUxfVFlQRV9QICh0eXAxKSkKZGlm ZiAtcHVyIGdjYy90ZXN0c3VpdGUvZ2NjLmRnL3N0cmxlbm9wdC00OS5jIGdj Yy90ZXN0c3VpdGUvZ2NjLmRnL3N0cmxlbm9wdC00OS5jCi0tLSBnY2MvdGVz dHN1aXRlL2djYy5kZy9zdHJsZW5vcHQtNDkuYwkyMDE4LTA3LTMwIDEzOjAy OjM0LjczNTQ3ODcyNiArMDIwMAorKysgZ2NjL3Rlc3RzdWl0ZS9nY2MuZGcv c3RybGVub3B0LTQ5LmMJMjAxOC0wNy0zMCAxMzowODoyMS4wNzQ4NTkzMDMg KzAyMDAKQEAgLTExLDkgKzExLDYgQEAgY29uc3QgY2hhciBhM1szXSA9ICIx MlwwIjsKIGNvbnN0IGNoYXIgYThbOF0gPSAiMTIzNDU2N1wwIjsKIGNvbnN0 IGNoYXIgYTlbOV0gPSAiMTIzNDU2NzhcMCI7CiAKLWNvbnN0IGNoYXIgYXhb OV0gPSAiMTIzNDU2NzhcMFwwXDBcMCI7ICAgLyogeyBkZy13YXJuaW5nICJp bml0aWFsaXplci1zdHJpbmcgZm9yIGFycmF5IG9mIGNoYXJzIGlzIHRvbyBs b25nIiB9ICovCi1jb25zdCBjaGFyIGF5WzldID0gIlwwMDAxMjM0NTY3OFww XDBcMFwwIjsgICAvKiB7IGRnLXdhcm5pbmcgImluaXRpYWxpemVyLXN0cmlu ZyBmb3IgYXJyYXkgb2YgY2hhcnMgaXMgdG9vIGxvbmciIH0gKi8KLQogCiBp bnQgbGVuMSAodm9pZCkKIHsKQEAgLTI3LDI3ICsyNCwxMyBAQCBpbnQgbGVu ICh2b2lkKQogICByZXR1cm4gbGVuOwogfQogCi1pbnQgbGVueCAodm9pZCkK LXsKLSAgc2l6ZV90IGxlbnggPSBzdHJsZW4gKGF4KTsKLSAgcmV0dXJuIGxl bng7Ci19Ci0KLWludCBsZW55ICh2b2lkKQotewotICBzaXplX3QgbGVueSA9 IHN0cmxlbiAoYXkpOwotICByZXR1cm4gbGVueTsKLX0KLQogaW50IGNtcDg4 ICh2b2lkKQogewogICBpbnQgY21wODggPSBtZW1jbXAgKGE4LCAiMTIzNDU2 N1wwIiwgc2l6ZW9mIGE4KTsKICAgcmV0dXJuIGNtcDg4OwogfQogCi0vKiB7 IGRnLWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgInN0cmxlbiIgMCAi Z2ltcGxlIiB7IHhmYWlsICotKi0qIH0gfSB9Ci0gICB7IGRnLWZpbmFsIHsg c2Nhbi10cmVlLWR1bXAtdGltZXMgImxlbjAgPSAwOyIgMSAiZ2ltcGxlIiB7 IHhmYWlsICotKi0qIH0gfSB9Ci0gICB7IGRnLWZpbmFsIHsgc2Nhbi10cmVl LWR1bXAtdGltZXMgImxlbiA9IDE4OyIgMSAiZ2ltcGxlIiB7IHhmYWlsICot Ki0qIH0gfSB9Ci0gICB7IGRnLWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGlt ZXMgImxlbnggPSA4OyIgMSAiZ2ltcGxlIiB7IHhmYWlsICotKi0qIH0gfSB9 Ci0gICB7IGRnLWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgImxlbnkg PSAwOyIgMSAiZ2ltcGxlIiB7IHhmYWlsICotKi0qIH0gfSB9Ci0gICB7IGRn LWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgImNtcDg4ID0gMDsiIDEg ImdpbXBsZSIgeyB4ZmFpbCAqLSotKiB9IH0gfSAqLworLyogeyBkZy1maW5h bCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICJzdHJsZW4iIDAgImdpbXBsZSIg fSB9CisgICB7IGRnLWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgImxl bjAgPSAwOyIgMSAiZ2ltcGxlIiB9IH0KKyAgIHsgZGctZmluYWwgeyBzY2Fu LXRyZWUtZHVtcC10aW1lcyAibGVuID0gMTg7IiAxICJnaW1wbGUiIH0gfQor ICAgeyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICJjbXA4OCA9 IDA7IiAxICJnaW1wbGUiIH0gfSAqLwo= --_002_AM5PR0701MB26577C800216899DCF6647E6E42F0AM5PR0701MB2657_--