From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81927 invoked by alias); 12 Jul 2016 20:29:33 -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 81915 invoked by uid 89); 12 Jul 2016 20:29:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.6 required=5.0 tests=AWL,BAYES_00,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=no version=3.3.2 spammy=imp, gofrontend, escape, MERGE X-HELO: mail-it0-f41.google.com Received: from mail-it0-f41.google.com (HELO mail-it0-f41.google.com) (209.85.214.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 12 Jul 2016 20:29:22 +0000 Received: by mail-it0-f41.google.com with SMTP id f6so3562293ith.1 for ; Tue, 12 Jul 2016 13:29:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=FF1CAo5RmkoNRU59fc12v1yWEj8bTICgH5JkznX70xs=; b=Hry/IIoXQn/t8M4b+CtBtyqpzEaS23lSrfOuQ/47aW69nMjLQFYtNVAqCaSPVdzkem h8aE6pTvYkiutlRTwol8OwYmHDIxxQgTuBQJ5vc5OsAAEoPBW47qib/U99t95fBTkGNo FvMUtH3ICmoCShrmORb0+yTAihIxJNM5frBKnDg8RsCNVDpWdWqGH9o0rBeNMgoa/opn Qdj39ZDWxaPytm+GcCvd45uUMZ2u+QFA/kFg0/uZp0FFLYtllO1yL805GqghRsEUsBzh JdThMQAOvxclQF14ld5OgZfrp21Lc/83gEhpJ1npmwlXLhaOmEK/P5t0LSwjj0ZiCUO7 88Dw== X-Gm-Message-State: ALyK8tLKdh8qY9txAFxaLPHWtT+1ZHZv3sJWYNUV/nIP3BD8M9PLEGHVh+PeBBB1IdoJBYWmonxInzzEeuhffg== X-Received: by 10.36.252.193 with SMTP id b184mr1272839ith.4.1468355360225; Tue, 12 Jul 2016 13:29:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.79.82.195 with HTTP; Tue, 12 Jul 2016 13:29:19 -0700 (PDT) From: Ian Lance Taylor Date: Tue, 12 Jul 2016 20:29:00 -0000 Message-ID: Subject: Go patch committed: add escape analysis notes to export data To: gcc-patches , "gofrontend-dev@googlegroups.com" Content-Type: multipart/mixed; boundary=94eb2c0b2884a6a6cd0537761fa0 X-SW-Source: 2016-07/txt/msg00683.txt.bz2 --94eb2c0b2884a6a6cd0537761fa0 Content-Type: text/plain; charset=UTF-8 Content-length: 285 This patch by Chris Manghane changes the Go frontend to add escape analysis notes to the export data, and to read them in when importing a package. Escape analysis is still not enabled by default. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian --94eb2c0b2884a6a6cd0537761fa0 Content-Type: text/plain; charset=US-ASCII; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iqjwubya0 Content-length: 7930 SW5kZXg6IGdjYy9nby9nb2Zyb250ZW5kL01FUkdFCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGdjYy9nby9nb2Zyb250ZW5kL01FUkdFCShyZXZpc2lv biAyMzgwNTcpCisrKyBnY2MvZ28vZ29mcm9udGVuZC9NRVJHRQkod29ya2lu ZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLWM4ZmRhZDM4OWNlNmY0MzlhMDJm YjY1NGQyMzEwNTNiNDdmZjRlMDIKKzVlYTVjMDc4ODI5YWU4M2JjY2I1OTg3 NzJmZmY3YzFhMDRlMjNlNjUKIAogVGhlIGZpcnN0IGxpbmUgb2YgdGhpcyBm aWxlIGhvbGRzIHRoZSBnaXQgcmV2aXNpb24gbnVtYmVyIG9mIHRoZSBsYXN0 CiBtZXJnZSBkb25lIGZyb20gdGhlIGdvZnJvbnRlbmQgcmVwb3NpdG9yeS4K SW5kZXg6IGdjYy9nby9nb2Zyb250ZW5kL2V4cG9ydC5jYwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBnY2MvZ28vZ29mcm9udGVuZC9leHBvcnQuY2MJ KHJldmlzaW9uIDIzNjgwNCkKKysrIGdjYy9nby9nb2Zyb250ZW5kL2V4cG9y dC5jYwkod29ya2luZyBjb3B5KQpAQCAtNDM2LDYgKzQzNiwyMSBAQCBFeHBv cnQ6OndyaXRlX3R5cGUoY29uc3QgVHlwZSogdHlwZSkKICAgICB0aGlzLT50 eXBlX3JlZnNfW3R5cGVdID0gaW5kZXg7CiB9CiAKKy8vIEV4cG9ydCBlc2Nh cGUgbm90ZS4KKwordm9pZAorRXhwb3J0Ojp3cml0ZV9lc2NhcGUoc3RkOjpz dHJpbmcqIG5vdGUpCit7CisgIGlmIChub3RlICE9IE5VTEwgJiYgKm5vdGUg IT0gImVzYzoweDAiKQorICAgIHsKKyAgICAgIHRoaXMtPndyaXRlX2Nfc3Ry aW5nKCIgIik7CisgICAgICBjaGFyIGJ1Zls1MF07CisgICAgICBnb19hc3Nl cnQobm90ZS0+ZmluZCgiZXNjOiIpICE9IHN0ZDo6c3RyaW5nOjpucG9zKTsK KyAgICAgIHNucHJpbnRmKGJ1Ziwgc2l6ZW9mIGJ1ZiwgIjwlcz4iLCBub3Rl LT5jX3N0cigpKTsKKyAgICAgIHRoaXMtPndyaXRlX2Nfc3RyaW5nKGJ1Zik7 CisgICAgfQorfQorCiAvLyBBZGQgdGhlIGJ1aWx0aW4gdHlwZXMgdG8gdGhl IGV4cG9ydCB0YWJsZS4KIAogdm9pZApJbmRleDogZ2NjL2dvL2dvZnJvbnRl bmQvZXhwb3J0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZ2NjL2dv L2dvZnJvbnRlbmQvZXhwb3J0LmgJKHJldmlzaW9uIDIzNjgwNCkKKysrIGdj Yy9nby9nb2Zyb250ZW5kL2V4cG9ydC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x NjEsNiArMTYxLDExIEBAIGNsYXNzIEV4cG9ydCA6IHB1YmxpYyBTdHJpbmdf ZHVtcAogICB2b2lkCiAgIHdyaXRlX3R5cGUoY29uc3QgVHlwZSopOwogCisg IC8vIFdyaXRlIHRoZSBlc2NhcGUgbm90ZSB0byB0aGUgZXhwb3J0IHN0cmVh bS4gIElmIE5PVEUgaXMgTlVMTCwgd3JpdGUKKyAgLy8gbm90aGluZy4KKyAg dm9pZAorICB3cml0ZV9lc2NhcGUoc3RkOjpzdHJpbmcqIG5vdGUpOworCiAg cHJpdmF0ZToKICAgRXhwb3J0KGNvbnN0IEV4cG9ydCYpOwogICBFeHBvcnQm IG9wZXJhdG9yPShjb25zdCBFeHBvcnQmKTsKSW5kZXg6IGdjYy9nby9nb2Zy b250ZW5kL2dvZ28uY2MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZ2Nj L2dvL2dvZnJvbnRlbmQvZ29nby5jYwkocmV2aXNpb24gMjM2ODA0KQorKysg Z2NjL2dvL2dvZnJvbnRlbmQvZ29nby5jYwkod29ya2luZyBjb3B5KQpAQCAt NDc5NCw2ICs0Nzk0LDcgQEAgRnVuY3Rpb246OmV4cG9ydF9mdW5jX3dpdGhf dHlwZShFeHBvcnQqCiAgICAgICBleHAtPndyaXRlX2Nfc3RyaW5nKCIoIik7 CiAgICAgICBjb25zdCBUeXBlZF9pZGVudGlmaWVyKiByZWNlaXZlciA9IGZu dHlwZS0+cmVjZWl2ZXIoKTsKICAgICAgIGV4cC0+d3JpdGVfbmFtZShyZWNl aXZlci0+bmFtZSgpKTsKKyAgICAgIGV4cC0+d3JpdGVfZXNjYXBlKHJlY2Vp dmVyLT5ub3RlKCkpOwogICAgICAgZXhwLT53cml0ZV9jX3N0cmluZygiICIp OwogICAgICAgZXhwLT53cml0ZV90eXBlKHJlY2VpdmVyLT50eXBlKCkpOwog ICAgICAgZXhwLT53cml0ZV9jX3N0cmluZygiKSAiKTsKQEAgLTQ4MTcsNiAr NDgxOCw3IEBAIEZ1bmN0aW9uOjpleHBvcnRfZnVuY193aXRoX3R5cGUoRXhw b3J0KgogCSAgZWxzZQogCSAgICBleHAtPndyaXRlX2Nfc3RyaW5nKCIsICIp OwogCSAgZXhwLT53cml0ZV9uYW1lKHAtPm5hbWUoKSk7CisJICBleHAtPndy aXRlX2VzY2FwZShwLT5ub3RlKCkpOwogCSAgZXhwLT53cml0ZV9jX3N0cmlu ZygiICIpOwogCSAgaWYgKCFpc192YXJhcmdzIHx8IHAgKyAxICE9IHBhcmFt ZXRlcnMtPmVuZCgpKQogCSAgICBleHAtPndyaXRlX3R5cGUocC0+dHlwZSgp KTsKQEAgLTQ4NTAsNiArNDg1Miw3IEBAIEZ1bmN0aW9uOjpleHBvcnRfZnVu Y193aXRoX3R5cGUoRXhwb3J0KgogCSAgICAgIGVsc2UKIAkJZXhwLT53cml0 ZV9jX3N0cmluZygiLCAiKTsKIAkgICAgICBleHAtPndyaXRlX25hbWUocC0+ bmFtZSgpKTsKKwkgICAgICBleHAtPndyaXRlX2VzY2FwZShwLT5ub3RlKCkp OwogCSAgICAgIGV4cC0+d3JpdGVfY19zdHJpbmcoIiAiKTsKIAkgICAgICBl eHAtPndyaXRlX3R5cGUocC0+dHlwZSgpKTsKIAkgICAgfQpAQCAtNDg3NSw5 ICs0ODc4LDExIEBAIEZ1bmN0aW9uOjppbXBvcnRfZnVuYyhJbXBvcnQqIGlt cCwgc3RkOjoKICAgICB7CiAgICAgICBpbXAtPnJlcXVpcmVfY19zdHJpbmco IigiKTsKICAgICAgIHN0ZDo6c3RyaW5nIG5hbWUgPSBpbXAtPnJlYWRfbmFt ZSgpOworICAgICAgc3RkOjpzdHJpbmcgZXNjYXBlX25vdGUgPSBpbXAtPnJl YWRfZXNjYXBlKCk7CiAgICAgICBpbXAtPnJlcXVpcmVfY19zdHJpbmcoIiAi KTsKICAgICAgIFR5cGUqIHJ0eXBlID0gaW1wLT5yZWFkX3R5cGUoKTsKICAg ICAgICpwcmVjZWl2ZXIgPSBuZXcgVHlwZWRfaWRlbnRpZmllcihuYW1lLCBy dHlwZSwgaW1wLT5sb2NhdGlvbigpKTsKKyAgICAgICgqcHJlY2VpdmVyKS0+ c2V0X25vdGUoZXNjYXBlX25vdGUpOwogICAgICAgaW1wLT5yZXF1aXJlX2Nf c3RyaW5nKCIpICIpOwogICAgIH0KIApAQCAtNDg5NCw2ICs0ODk5LDcgQEAg RnVuY3Rpb246OmltcG9ydF9mdW5jKEltcG9ydCogaW1wLCBzdGQ6OgogICAg ICAgd2hpbGUgKHRydWUpCiAJewogCSAgc3RkOjpzdHJpbmcgbmFtZSA9IGlt cC0+cmVhZF9uYW1lKCk7CisJICBzdGQ6OnN0cmluZyBlc2NhcGVfbm90ZSA9 IGltcC0+cmVhZF9lc2NhcGUoKTsKIAkgIGltcC0+cmVxdWlyZV9jX3N0cmlu ZygiICIpOwogCiAJICBpZiAoaW1wLT5tYXRjaF9jX3N0cmluZygiLi4uIikp CkBAIC00OTA1LDggKzQ5MTEsOSBAQCBGdW5jdGlvbjo6aW1wb3J0X2Z1bmMo SW1wb3J0KiBpbXAsIHN0ZDo6CiAJICBUeXBlKiBwdHlwZSA9IGltcC0+cmVh ZF90eXBlKCk7CiAJICBpZiAoKmlzX3ZhcmFyZ3MpCiAJICAgIHB0eXBlID0g VHlwZTo6bWFrZV9hcnJheV90eXBlKHB0eXBlLCBOVUxMKTsKLQkgIHBhcmFt ZXRlcnMtPnB1c2hfYmFjayhUeXBlZF9pZGVudGlmaWVyKG5hbWUsIHB0eXBl LAotCQkJCQkJIGltcC0+bG9jYXRpb24oKSkpOworCSAgVHlwZWRfaWRlbnRp ZmllciB0ID0gVHlwZWRfaWRlbnRpZmllcihuYW1lLCBwdHlwZSwgaW1wLT5s b2NhdGlvbigpKTsKKwkgIHQuc2V0X25vdGUoZXNjYXBlX25vdGUpOworCSAg cGFyYW1ldGVycy0+cHVzaF9iYWNrKHQpOwogCSAgaWYgKGltcC0+cGVla19j aGFyKCkgIT0gJywnKQogCSAgICBicmVhazsKIAkgIGdvX2Fzc2VydCghKmlz X3ZhcmFyZ3MpOwpAQCAtNDkzNCwxMCArNDk0MSwxMyBAQCBGdW5jdGlvbjo6 aW1wb3J0X2Z1bmMoSW1wb3J0KiBpbXAsIHN0ZDo6CiAJICB3aGlsZSAodHJ1 ZSkKIAkgICAgewogCSAgICAgIHN0ZDo6c3RyaW5nIG5hbWUgPSBpbXAtPnJl YWRfbmFtZSgpOworCSAgICAgIHN0ZDo6c3RyaW5nIG5vdGUgPSBpbXAtPnJl YWRfZXNjYXBlKCk7CiAJICAgICAgaW1wLT5yZXF1aXJlX2Nfc3RyaW5nKCIg Iik7CiAJICAgICAgVHlwZSogcnR5cGUgPSBpbXAtPnJlYWRfdHlwZSgpOwot CSAgICAgIHJlc3VsdHMtPnB1c2hfYmFjayhUeXBlZF9pZGVudGlmaWVyKG5h bWUsIHJ0eXBlLAotCQkJCQkJICBpbXAtPmxvY2F0aW9uKCkpKTsKKwkgICAg ICBUeXBlZF9pZGVudGlmaWVyIHQgPSBUeXBlZF9pZGVudGlmaWVyKG5hbWUs IHJ0eXBlLAorCQkJCQkJICAgIGltcC0+bG9jYXRpb24oKSk7CisJICAgICAg dC5zZXRfbm90ZShub3RlKTsKKwkgICAgICByZXN1bHRzLT5wdXNoX2JhY2so dCk7CiAJICAgICAgaWYgKGltcC0+cGVla19jaGFyKCkgIT0gJywnKQogCQli cmVhazsKIAkgICAgICBpbXAtPnJlcXVpcmVfY19zdHJpbmcoIiwgIik7Cklu ZGV4OiBnY2MvZ28vZ29mcm9udGVuZC9pbXBvcnQuY2MKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gZ2NjL2dvL2dvZnJvbnRlbmQvaW1wb3J0LmNjCShy ZXZpc2lvbiAyMzY4MDQpCisrKyBnY2MvZ28vZ29mcm9udGVuZC9pbXBvcnQu Y2MJKHdvcmtpbmcgY29weSkKQEAgLTc2Miw2ICs3NjIsNDIgQEAgSW1wb3J0 OjpyZWFkX3R5cGUoKQogICByZXR1cm4gdHlwZTsKIH0KIAorLy8gUmVhZCBh biBlc2NhcGUgbm90ZS4KKworc3RkOjpzdHJpbmcKK0ltcG9ydDo6cmVhZF9l c2NhcGUoKQoreworICBpZiAodGhpcy0+bWF0Y2hfY19zdHJpbmcoIiA8ZXNj OiIpKQorICAgIHsKKyAgICAgIFN0cmVhbSogc3RyZWFtID0gdGhpcy0+c3Ry ZWFtXzsKKyAgICAgIHRoaXMtPnJlcXVpcmVfY19zdHJpbmcoIiA8ZXNjOiIp OworCisgICAgICBzdGQ6OnN0cmluZyBlc2NhcGUgPSAiZXNjOiI7CisgICAg ICBpbnQgYzsKKyAgICAgIHdoaWxlICh0cnVlKQorCXsKKwkgIGMgPSBzdHJl YW0tPmdldF9jaGFyKCk7CisJICBpZiAoYyAhPSAneCcgJiYgIUlTWERJR0lU KGMpKQorCSAgICBicmVhazsKKwkgIGVzY2FwZSArPSBjOworCX0KKworICAg ICAgaWYgKGMgIT0gJz4nKQorCXsKKwkgIGVycm9yX2F0KHRoaXMtPmxvY2F0 aW9uKCksCisJCSAgICJlcnJvciBpbiBpbXBvcnQgZGF0YSBhdCAlZDogZXhw ZWN0ICU8ICU+IG9yICU8PiU+LCBnb3QgJWMiLAorCQkgICBzdHJlYW0tPnBv cygpLCBjKTsKKwkgIHN0cmVhbS0+c2V0X3Nhd19lcnJvcigpOworCSAgc3Ry ZWFtLT5hZHZhbmNlKDEpOworCSAgZXNjYXBlID0gRXNjYXBlX25vdGU6Om1h a2VfdGFnKE5vZGU6OkVTQ0FQRV9VTktOT1dOKTsKKwl9CisgICAgICByZXR1 cm4gZXNjYXBlOworICAgIH0KKyAgZWxzZQorICAgIHJldHVybiBFc2NhcGVf bm90ZTo6bWFrZV90YWcoTm9kZTo6RVNDQVBFX1VOS05PV04pOworfQorCisK IC8vIFJlZ2lzdGVyIHRoZSBidWlsdGluIHR5cGVzLgogCiB2b2lkCkluZGV4 OiBnY2MvZ28vZ29mcm9udGVuZC9pbXBvcnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBnY2MvZ28vZ29mcm9udGVuZC9pbXBvcnQuaAkocmV2aXNp b24gMjM2ODA0KQorKysgZ2NjL2dvL2dvZnJvbnRlbmQvaW1wb3J0LmgJKHdv cmtpbmcgY29weSkKQEAgLTE5Nyw2ICsxOTcsMTAgQEAgY2xhc3MgSW1wb3J0 CiAgIFR5cGUqCiAgIHJlYWRfdHlwZSgpOwogCisgIC8vIFJlYWQgYW4gZXNj YXBlIG5vdGUuCisgIHN0ZDo6c3RyaW5nCisgIHJlYWRfZXNjYXBlKCk7CisK ICBwcml2YXRlOgogICBzdGF0aWMgU3RyZWFtKgogICB0cnlfcGFja2FnZV9p bl9kaXJlY3RvcnkoY29uc3Qgc3RkOjpzdHJpbmcmLCBMb2NhdGlvbik7Cg== --94eb2c0b2884a6a6cd0537761fa0--