From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14402 invoked by alias); 8 Sep 2012 21:42:26 -0000 Received: (qmail 14388 invoked by uid 22791); 8 Sep 2012 21:42:25 -0000 X-SWARE-Spam-Status: No, hits=-5.5 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,RP_MATCHES_RCVD,TW_IB,TW_TM X-Spam-Check-By: sourceware.org Received: from mail-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 08 Sep 2012 21:42:11 +0000 Received: by pbcwy7 with SMTP id wy7so1158609pbc.20 for ; Sat, 08 Sep 2012 14:42:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-system-of-record:x-gm-message-state; bh=60xuzkt/NNCWOGFbBdGVUmrX/iLPgh1BnCDmNSgt1/8=; b=Ce9GWum4cjGloupzkko7jCgg+xMkQhGu2O5seeoE3cTc+6HoiKtGNPF/3mqD96cB93 I0k/W5EL/3VjNUIDRsg5CR2oVjoSBB5faCydHfoQvCEzlAWH4n9PIbj9iforYSmx/vKE rMPGFVvfjJ+QaXuJlEXsZimC4pT+SgXIr+p7dUcwGJxWTyyUwCLLjwPeyCf/xabWOSH4 x1DD20+j7S0UydGaBdjOe+G3/9i/cjqi5hzCaD3xf9CPvR6cLl7lXp/TfMmimW5Z/Pmw bhOExWSdju9a5pdjRjBM8ighasOWV4BwkfWoja0xmVccNMjpKbJy8maN45Cjn8UoQqEO s8AA== Received: by 10.68.134.97 with SMTP id pj1mr17572309pbb.55.1347140530805; Sat, 08 Sep 2012 14:42:10 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.134.97 with SMTP id pj1mr17572277pbb.55.1347140530552; Sat, 08 Sep 2012 14:42:10 -0700 (PDT) Received: by 10.68.211.170 with HTTP; Sat, 8 Sep 2012 14:42:10 -0700 (PDT) In-Reply-To: <1346839095.9368.1.camel@springer.wildebeest.org> References: <50243480.7090803@redhat.com> <50254A50.8070208@redhat.com> <50255B35.9020705@redhat.com> <50258712.4070002@redhat.com> <502E6774.8050609@redhat.com> <503F7876.7030606@redhat.com> <503F84A9.8010504@redhat.com> <503F95D8.5010506@redhat.com> <50463661.1020303@redhat.com> <1346839095.9368.1.camel@springer.wildebeest.org> Date: Sat, 08 Sep 2012 21:42:00 -0000 Message-ID: Subject: Re: [PATCH] Set correct source location for deallocator calls From: Dehao Chen To: Mark Wielaard Cc: Bryce McKinlay , Andrew Haley , Richard Henderson , Jason Merrill , Richard Guenther , gcc-patches@gcc.gnu.org, David Li , java@gcc.gnu.org Content-Type: multipart/mixed; boundary=047d7b111a31c93eb104c93798f9 X-System-Of-Record: true X-Gm-Message-State: ALoCoQl0DKxilZlHkVDIzmwSSZM4d1QEfhK6v+HzGjUiPy55p4zrmFLJNHPYvmteGZbmGKXlGjqrCM/l2hEdHPhxyMv0MRuHs2BJ63UmQ4BLtMsF04jRSDhkFGXkHAO3QfQXcqTSR81K9kbhBisqMNKWoFoL06FVF4jDDd4ff2ArYyGxSnD6ETCvvrufia2ZotJlGUDDDQab Mailing-List: contact java-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-owner@gcc.gnu.org X-SW-Source: 2012-09/txt/msg00013.txt.bz2 --047d7b111a31c93eb104c93798f9 Content-Type: text/plain; charset=ISO-8859-1 Content-length: 1017 Hi, I've added a libjava unittest which verifies that this patch will not break Java debug info. I've also incorporated Richard's review in the previous mail. Attached is the new patch, which passed bootstrap and all gcc/libjava testsuites on x86. Is it ok for trunk? Thanks, Dehao gcc/ChangeLog: 2012-09-08 Dehao Chen * tree-eh.c (goto_queue_node): New field. (record_in_goto_queue): New parameter. (record_in_goto_queue_label): New parameter. (lower_try_finally_dup_block): New parameter. (maybe_record_in_goto_queue): Update source location. (lower_try_finally_copy): Likewise. (honor_protect_cleanup_actions): Likewise. * gimplify.c (gimplify_expr): Reset the location to unknown. gcc/testsuite/ChangeLog: 2012-09-08 Dehao Chen * g++.dg/debug/dwarf2/deallocator.C: New test. libjava/ChangeLog: 2012-09-08 Dehao Chen * testsuite/libjava.lang/sourcelocation.java: New cases. * testsuite/libjava.lang/sourcelocation.out: New cases. --047d7b111a31c93eb104c93798f9 Content-Type: text/plain; charset=US-ASCII; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h6v7yvxs0 Content-length: 11761 SW5kZXg6IGxpYmphdmEvdGVzdHN1aXRlL2xpYmphdmEubGFuZy9zb3VyY2Vs b2NhdGlvbi5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYmph dmEvdGVzdHN1aXRlL2xpYmphdmEubGFuZy9zb3VyY2Vsb2NhdGlvbi5qYXZh CShyZXZpc2lvbiAwKQorKysgbGliamF2YS90ZXN0c3VpdGUvbGliamF2YS5s YW5nL3NvdXJjZWxvY2F0aW9uLmphdmEJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMTggQEAKKy8qIFRoaXMgdGVzdCBzaG91bGQgdGVzdCB0aGUgc291cmNl IGxvY2F0aW9uIGF0dHJpYnV0aW9uLgorICAgV2UgcHJpbnQgdGhlIGxpbmUg bnVtYmVyIG9mIGRpZmZlcmVudCBwYXJ0cyBvZiB0aGUgcHJvZ3JhbSB0byBt YWtlIHN1cmUKKyAgIHRoYXQgdGhlIHNvdXJjZSBjb2RlIGF0dHJpYnV0aW9u IGlzIGNvcnJlY3QuCisgICBUbyBtYWtlIHRoaXMgdGVzdCBwYXNzLCBvbmUg bmVlZCB0byBoYXZlIHVwLXRvLWRhdGUgYWRkcjJsaW5lIGluc3RhbGxlZAor ICAgdG8gcGFyc2UgdGhlIGR3YXJmNCBkYXRhIGZvcm1hdC4KKyovCitwdWJs aWMgY2xhc3Mgc291cmNlbG9jYXRpb24geworICBwdWJsaWMgc3RhdGljIHZv aWQgbWFpbihTdHJpbmcgYXJnc1tdKSB7CisgICAgdHJ5IHsKKyAgICAgIFN5 c3RlbS5vdXQucHJpbnRsbihuZXcgRXhjZXB0aW9uKCkuZ2V0U3RhY2tUcmFj ZSgpWzBdLmdldExpbmVOdW1iZXIoKSk7CisgICAgICB0aHJvdyBuZXcgRXhj ZXB0aW9uKCk7CisgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAg IFN5c3RlbS5vdXQucHJpbnRsbihuZXcgRXhjZXB0aW9uKCkuZ2V0U3RhY2tU cmFjZSgpWzBdLmdldExpbmVOdW1iZXIoKSk7CisgICAgfSBmaW5hbGx5IHsK KyAgICAgIFN5c3RlbS5vdXQucHJpbnRsbihuZXcgRXhjZXB0aW9uKCkuZ2V0 U3RhY2tUcmFjZSgpWzBdLmdldExpbmVOdW1iZXIoKSk7CisgICAgfQorICB9 Cit9CkluZGV4OiBsaWJqYXZhL3Rlc3RzdWl0ZS9saWJqYXZhLmxhbmcvc291 cmNlbG9jYXRpb24ub3V0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxp YmphdmEvdGVzdHN1aXRlL2xpYmphdmEubGFuZy9zb3VyY2Vsb2NhdGlvbi5v dXQJKHJldmlzaW9uIDApCisrKyBsaWJqYXZhL3Rlc3RzdWl0ZS9saWJqYXZh Lmxhbmcvc291cmNlbG9jYXRpb24ub3V0CShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDMgQEAKKzEwCisxMworMTUKSW5kZXg6IGxpYmphdmEvdGVzdHN1aXRl L2xpYmphdmEubGFuZy9zb3VyY2Vsb2NhdGlvbi5qYXIKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQpDYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBi aW5hcnkgdHlwZS4Kc3ZuOm1pbWUtdHlwZSA9IGFwcGxpY2F0aW9uL29jdGV0 LXN0cmVhbQoKUHJvcGVydHkgY2hhbmdlcyBvbjogbGliamF2YS90ZXN0c3Vp dGUvbGliamF2YS5sYW5nL3NvdXJjZWxvY2F0aW9uLmphcgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiAgICsgYXBwbGlj YXRpb24vb2N0ZXQtc3RyZWFtCgpJbmRleDogZ2NjL3Rlc3RzdWl0ZS9nKysu ZGcvZGVidWcvZHdhcmYyL2RlYWxsb2NhdG9yLkMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvZGVidWcvZHdhcmYy L2RlYWxsb2NhdG9yLkMJKHJldmlzaW9uIDApCisrKyBnY2MvdGVzdHN1aXRl L2crKy5kZy9kZWJ1Zy9kd2FyZjIvZGVhbGxvY2F0b3IuQwkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwzMyBAQAorLy8gVGVzdCB0aGF0IGRlYnVnIGluZm8g Z2VuZXJhdGVkIGZvciBhdXRvLWluc2VydGVkIGRlYWxsb2NhdG9yIGlzCisv LyBjb3JyZWN0bHkgYXR0cmlidXRlZC4KKy8vIFRoaXMgcGF0Y2ggc2NhbnMg Zm9yIHRoZSBsaW5lbm8gZGlyZWN0bHkgZnJvbSBhc3NlbWJseSwgd2hpY2gg bWF5CisvLyBkaWZmZXIgYmV0d2VlbiBkaWZmZXJlbnQgYXJjaGl0ZWN0dXJl cy4gQmVjYXVzZSBpdCBtYWlubHkgdGVzdHMKKy8vIEZFIGdlbmVyYXRlZCBk ZWJ1ZyBpbmZvLCB3aXRob3V0IGxvc2luZyBnZW5lcmFsaXR5LCBvbmx5IHg4 NgorLy8gYXNzZW1ibHkgaXMgc2Nhbm5lZCBpbiB0aGlzIHRlc3QuCisvLyB7 IGRnLWRvIGNvbXBpbGUgeyB0YXJnZXQgeyBpPzg2LSotKiB4ODZfNjQtKi0q IH0gfSB9CisvLyB7IGRnLW9wdGlvbnMgIi1PMiAtZm5vLWV4Y2VwdGlvbnMg LWcgLWRBIiB9CisKK3N0cnVjdCB0IHsKKyAgdCAoKTsKKyAgfnQgKCk7Cisg IHZvaWQgZm9vKCk7CisgIHZvaWQgYmFyKCk7Cit9OworCitpbnQgYmFyKCk7 CisKK3ZvaWQgZm9vKGludCBpKQoreworICBmb3IgKGludCBqID0gMDsgaiA8 IDEwOyBqKyspCisgICAgeworICAgICAgdCB0ZXN0OworICAgICAgdGVzdC5m b28oKTsKKyAgICAgIGlmIChpICsgaikKKwl7CisJICB0ZXN0LmJhcigpOwor CSAgcmV0dXJuOworCX0KKyAgICB9CisgIHJldHVybjsKK30KKy8vIHsgZGct ZmluYWwgeyBzY2FuLWFzc2VtYmxlciAiZGVhbGxvY2F0b3IuQzoyOCIgfSB9 CkluZGV4OiBnY2MvdHJlZS1laC5jCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIGdjYy90cmVlLWVoLmMJKHJldmlzaW9uIDE5MTA4MykKKysrIGdjYy90 cmVlLWVoLmMJKHdvcmtpbmcgY29weSkKQEAgLTMyMSw2ICszMjEsNyBAQCBz dGF0aWMgYml0bWFwIGVoX3JlZ2lvbl9tYXlfY29udGFpbl90aHJvd19tYXA7 CiBzdHJ1Y3QgZ290b19xdWV1ZV9ub2RlCiB7CiAgIHRyZWVtcGxlIHN0bXQ7 CisgIGxvY2F0aW9uX3QgbG9jYXRpb247CiAgIGdpbXBsZV9zZXEgcmVwbF9z dG10OwogICBnaW1wbGUgY29udF9zdG10OwogICBpbnQgaW5kZXg7CkBAIC01 NjAsNyArNTYxLDggQEAgc3RhdGljIHZvaWQKIHJlY29yZF9pbl9nb3RvX3F1 ZXVlIChzdHJ1Y3QgbGVoX3RmX3N0YXRlICp0ZiwKICAgICAgICAgICAgICAg ICAgICAgICB0cmVlbXBsZSBuZXdfc3RtdCwKICAgICAgICAgICAgICAgICAg ICAgICBpbnQgaW5kZXgsCi0gICAgICAgICAgICAgICAgICAgICAgYm9vbCBp c19sYWJlbCkKKyAgICAgICAgICAgICAgICAgICAgICBib29sIGlzX2xhYmVs LAorCQkgICAgICBsb2NhdGlvbl90IGxvY2F0aW9uKQogewogICBzaXplX3Qg YWN0aXZlLCBzaXplOwogICBzdHJ1Y3QgZ290b19xdWV1ZV9ub2RlICpxOwpA QCAtNTgzLDYgKzU4NSw3IEBAIHJlY29yZF9pbl9nb3RvX3F1ZXVlIChzdHJ1 Y3QgbGVoX3RmX3N0YXRlICp0ZiwKICAgbWVtc2V0IChxLCAwLCBzaXplb2Yg KCpxKSk7CiAgIHEtPnN0bXQgPSBuZXdfc3RtdDsKICAgcS0+aW5kZXggPSBp bmRleDsKKyAgcS0+bG9jYXRpb24gPSBsb2NhdGlvbjsKICAgcS0+aXNfbGFi ZWwgPSBpc19sYWJlbDsKIH0KIApAQCAtNTkwLDcgKzU5Myw4IEBAIHJlY29y ZF9pbl9nb3RvX3F1ZXVlIChzdHJ1Y3QgbGVoX3RmX3N0YXRlICp0ZiwKICAg IFRGIGlzIG5vdCBudWxsLiAgKi8KIAogc3RhdGljIHZvaWQKLXJlY29yZF9p bl9nb3RvX3F1ZXVlX2xhYmVsIChzdHJ1Y3QgbGVoX3RmX3N0YXRlICp0Ziwg dHJlZW1wbGUgc3RtdCwgdHJlZSBsYWJlbCkKK3JlY29yZF9pbl9nb3RvX3F1 ZXVlX2xhYmVsIChzdHJ1Y3QgbGVoX3RmX3N0YXRlICp0ZiwgdHJlZW1wbGUg c3RtdCwgdHJlZSBsYWJlbCwKKwkJCSAgICBsb2NhdGlvbl90IGxvY2F0aW9u KQogewogICBpbnQgaW5kZXg7CiAgIHRyZWVtcGxlIHRlbXAsIG5ld19zdG10 OwpAQCAtNjI5LDcgKzYzMyw3IEBAIHN0YXRpYyB2b2lkCiAgICAgIHNpbmNl IHdpdGggYSBHSU1QTEVfQ09ORCB3ZSBoYXZlIGFuIGVhc3kgYWNjZXNzIHRv IHRoZSB0aGVuL2Vsc2UKICAgICAgbGFiZWxzLiAqLwogICBuZXdfc3RtdCA9 IHN0bXQ7Ci0gIHJlY29yZF9pbl9nb3RvX3F1ZXVlICh0ZiwgbmV3X3N0bXQs IGluZGV4LCB0cnVlKTsKKyAgcmVjb3JkX2luX2dvdG9fcXVldWUgKHRmLCBu ZXdfc3RtdCwgaW5kZXgsIHRydWUsIGxvY2F0aW9uKTsKIH0KIAogLyogRm9y IGFueSBHSU1QTEVfR09UTyBvciBHSU1QTEVfUkVUVVJOLCBkZWNpZGUgd2hl dGhlciBpdCBsZWF2ZXMgYSB0cnlfZmluYWxseQpAQCAtNjQ5LDE5ICs2NTMs MjIgQEAgbWF5YmVfcmVjb3JkX2luX2dvdG9fcXVldWUgKHN0cnVjdCBsZWhf c3RhdGUgKnN0YXQKICAgICB7CiAgICAgY2FzZSBHSU1QTEVfQ09ORDoKICAg ICAgIG5ld19zdG10LnRwID0gZ2ltcGxlX29wX3B0ciAoc3RtdCwgMik7Ci0g ICAgICByZWNvcmRfaW5fZ290b19xdWV1ZV9sYWJlbCAodGYsIG5ld19zdG10 LCBnaW1wbGVfY29uZF90cnVlX2xhYmVsIChzdG10KSk7CisgICAgICByZWNv cmRfaW5fZ290b19xdWV1ZV9sYWJlbCAodGYsIG5ld19zdG10LCBnaW1wbGVf Y29uZF90cnVlX2xhYmVsIChzdG10KSwKKwkJCQkgIEVYUFJfTE9DQVRJT04g KCpuZXdfc3RtdC50cCkpOwogICAgICAgbmV3X3N0bXQudHAgPSBnaW1wbGVf b3BfcHRyIChzdG10LCAzKTsKLSAgICAgIHJlY29yZF9pbl9nb3RvX3F1ZXVl X2xhYmVsICh0ZiwgbmV3X3N0bXQsIGdpbXBsZV9jb25kX2ZhbHNlX2xhYmVs IChzdG10KSk7CisgICAgICByZWNvcmRfaW5fZ290b19xdWV1ZV9sYWJlbCAo dGYsIG5ld19zdG10LCBnaW1wbGVfY29uZF9mYWxzZV9sYWJlbCAoc3RtdCks CisJCQkJICBFWFBSX0xPQ0FUSU9OICgqbmV3X3N0bXQudHApKTsKICAgICAg IGJyZWFrOwogICAgIGNhc2UgR0lNUExFX0dPVE86CiAgICAgICBuZXdfc3Rt dC5nID0gc3RtdDsKLSAgICAgIHJlY29yZF9pbl9nb3RvX3F1ZXVlX2xhYmVs ICh0ZiwgbmV3X3N0bXQsIGdpbXBsZV9nb3RvX2Rlc3QgKHN0bXQpKTsKKyAg ICAgIHJlY29yZF9pbl9nb3RvX3F1ZXVlX2xhYmVsICh0ZiwgbmV3X3N0bXQs IGdpbXBsZV9nb3RvX2Rlc3QgKHN0bXQpLAorCQkJCSAgZ2ltcGxlX2xvY2F0 aW9uIChzdG10KSk7CiAgICAgICBicmVhazsKIAogICAgIGNhc2UgR0lNUExF X1JFVFVSTjoKICAgICAgIHRmLT5tYXlfcmV0dXJuID0gdHJ1ZTsKICAgICAg IG5ld19zdG10LmcgPSBzdG10OwotICAgICAgcmVjb3JkX2luX2dvdG9fcXVl dWUgKHRmLCBuZXdfc3RtdCwgLTEsIGZhbHNlKTsKKyAgICAgIHJlY29yZF9p bl9nb3RvX3F1ZXVlICh0ZiwgbmV3X3N0bXQsIC0xLCBmYWxzZSwgZ2ltcGxl X2xvY2F0aW9uIChzdG10KSk7CiAgICAgICBicmVhazsKIAogICAgIGRlZmF1 bHQ6CkBAIC04NjYsMTMgKzg3MywxOSBAQCBmcm9iX2ludG9fYnJhbmNoX2Fy b3VuZCAoZ2ltcGxlIHRwLCBlaF9yZWdpb24gcmVnaQogICAgTWFrZSBzdXJl IHRvIHJlY29yZCBhbGwgbmV3IGxhYmVscyBmb3VuZC4gICovCiAKIHN0YXRp YyBnaW1wbGVfc2VxCi1sb3dlcl90cnlfZmluYWxseV9kdXBfYmxvY2sgKGdp bXBsZV9zZXEgc2VxLCBzdHJ1Y3QgbGVoX3N0YXRlICpvdXRlcl9zdGF0ZSkK K2xvd2VyX3RyeV9maW5hbGx5X2R1cF9ibG9jayAoZ2ltcGxlX3NlcSBzZXEs IHN0cnVjdCBsZWhfc3RhdGUgKm91dGVyX3N0YXRlLAorCQkJICAgICBsb2Nh dGlvbl90IGxvYykKIHsKICAgZ2ltcGxlIHJlZ2lvbiA9IE5VTEw7CiAgIGdp bXBsZV9zZXEgbmV3X3NlcTsKKyAgZ2ltcGxlX3N0bXRfaXRlcmF0b3IgZ3Np OwogCiAgIG5ld19zZXEgPSBjb3B5X2dpbXBsZV9zZXFfYW5kX3JlcGxhY2Vf bG9jYWxzIChzZXEpOwogCisgIGZvciAoZ3NpID0gZ3NpX3N0YXJ0IChuZXdf c2VxKTsgIWdzaV9lbmRfcCAoZ3NpKTsgZ3NpX25leHQgKCZnc2kpKQorICAg IGlmIChnaW1wbGVfbG9jYXRpb24gKGdzaV9zdG10IChnc2kpKSA9PSBVTktO T1dOX0xPQ0FUSU9OKQorICAgICAgZ2ltcGxlX3NldF9sb2NhdGlvbiAoZ3Np X3N0bXQgKGdzaSksIGxvYyk7CisKICAgaWYgKG91dGVyX3N0YXRlLT50ZikK ICAgICByZWdpb24gPSBvdXRlcl9zdGF0ZS0+dGYtPnRyeV9maW5hbGx5X2V4 cHI7CiAgIGNvbGxlY3RfZmluYWxseV90cmVlXzEgKG5ld19zZXEsIHJlZ2lv bik7CkBAIC05NjcsNyArOTgwLDggQEAgaG9ub3JfcHJvdGVjdF9jbGVhbnVw X2FjdGlvbnMgKHN0cnVjdCBsZWhfc3RhdGUgKm8KICAgICAgIGdpbXBsZV90 cnlfc2V0X2NsZWFudXAgKHRmLT50b3BfcCwgZ2ltcGxlX2VoX2Vsc2Vfbl9i b2R5IChlaF9lbHNlKSk7CiAgICAgfQogICBlbHNlIGlmICh0aGlzX3N0YXRl KQotICAgIGZpbmFsbHkgPSBsb3dlcl90cnlfZmluYWxseV9kdXBfYmxvY2sg KGZpbmFsbHksIG91dGVyX3N0YXRlKTsKKyAgICBmaW5hbGx5ID0gbG93ZXJf dHJ5X2ZpbmFsbHlfZHVwX2Jsb2NrIChmaW5hbGx5LCBvdXRlcl9zdGF0ZSwK KwkJCQkJICAgVU5LTk9XTl9MT0NBVElPTik7CiAgIGZpbmFsbHlfbWF5X2Zh bGx0aHJ1ID0gZ2ltcGxlX3NlcV9tYXlfZmFsbHRocnUgKGZpbmFsbHkpOwog CiAgIC8qIElmIHRoaXMgY2xlYW51cCBjb25zaXN0cyBvZiBhIFRSWV9DQVRD SF9FWFBSIHdpdGggVFJZX0NBVENIX0lTX0NMRUFOVVAKQEAgLTExODQsNyAr MTE5OCw3IEBAIGxvd2VyX3RyeV9maW5hbGx5X2NvcHkgKHN0cnVjdCBsZWhf c3RhdGUgKnN0YXRlLCBzCiAKICAgaWYgKHRmLT5tYXlfZmFsbHRocnUpCiAg ICAgewotICAgICAgc2VxID0gbG93ZXJfdHJ5X2ZpbmFsbHlfZHVwX2Jsb2Nr IChmaW5hbGx5LCBzdGF0ZSk7CisgICAgICBzZXEgPSBsb3dlcl90cnlfZmlu YWxseV9kdXBfYmxvY2sgKGZpbmFsbHksIHN0YXRlLCB0Zl9sb2MpOwogICAg ICAgbG93ZXJfZWhfY29uc3RydWN0c18xIChzdGF0ZSwgJnNlcSk7CiAgICAg ICBnaW1wbGVfc2VxX2FkZF9zZXEgKCZuZXdfc3RtdCwgc2VxKTsKIApAQCAt MTIwMCw3ICsxMjE0LDcgQEAgbG93ZXJfdHJ5X2ZpbmFsbHlfY29weSAoc3Ry dWN0IGxlaF9zdGF0ZSAqc3RhdGUsIHMKICAgICAgIGlmIChlaF9lbHNlKQog CXNlcSA9IGdpbXBsZV9laF9lbHNlX2VfYm9keSAoZWhfZWxzZSk7CiAgICAg ICBlbHNlCi0Jc2VxID0gbG93ZXJfdHJ5X2ZpbmFsbHlfZHVwX2Jsb2NrIChm aW5hbGx5LCBzdGF0ZSk7CisJc2VxID0gbG93ZXJfdHJ5X2ZpbmFsbHlfZHVw X2Jsb2NrIChmaW5hbGx5LCBzdGF0ZSwgdGZfbG9jKTsKICAgICAgIGxvd2Vy X2VoX2NvbnN0cnVjdHNfMSAoc3RhdGUsICZzZXEpOwogCiAgICAgICBlbWl0 X3Bvc3RfbGFuZGluZ19wYWQgKCZlaF9zZXEsIHRmLT5yZWdpb24pOwpAQCAt MTI1MCw3ICsxMjY0LDcgQEAgbG93ZXJfdHJ5X2ZpbmFsbHlfY29weSAoc3Ry dWN0IGxlaF9zdGF0ZSAqc3RhdGUsIHMKIAkgIHggPSBnaW1wbGVfYnVpbGRf bGFiZWwgKGxhYik7CiAgICAgICAgICAgZ2ltcGxlX3NlcV9hZGRfc3RtdCAo Jm5ld19zdG10LCB4KTsKIAotCSAgc2VxID0gbG93ZXJfdHJ5X2ZpbmFsbHlf ZHVwX2Jsb2NrIChmaW5hbGx5LCBzdGF0ZSk7CisJICBzZXEgPSBsb3dlcl90 cnlfZmluYWxseV9kdXBfYmxvY2sgKGZpbmFsbHksIHN0YXRlLCBxLT5sb2Nh dGlvbik7CiAJICBsb3dlcl9laF9jb25zdHJ1Y3RzXzEgKHN0YXRlLCAmc2Vx KTsKICAgICAgICAgICBnaW1wbGVfc2VxX2FkZF9zZXEgKCZuZXdfc3RtdCwg c2VxKTsKIApJbmRleDogZ2NjL2dpbXBsaWZ5LmMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gZ2NjL2dpbXBsaWZ5LmMJKHJldmlzaW9uIDE5MTA4MykK KysrIGdjYy9naW1wbGlmeS5jCSh3b3JraW5nIGNvcHkpCkBAIC03NDI5LDYg Kzc0MjksMTUgQEAgZ2ltcGxpZnlfZXhwciAodHJlZSAqZXhwcl9wLCBnaW1w bGVfc2VxICpwcmVfcCwgZ2kKIAkgICAgZ2ltcGxlX3NlcSBldmFsLCBjbGVh bnVwOwogCSAgICBnaW1wbGUgdHJ5XzsKIAorCSAgICAvKiBDYWxscyB0byBk ZXN0cnVjdG9ycyBhcmUgZ2VuZXJhdGVkIGF1dG9tYXRpY2FsbHkgaW4gRklO QUxMWS9DQVRDSAorCSAgICAgICBibG9jay4gVGhleSBzaG91bGQgaGF2ZSBs b2NhdGlvbiBhcyBVTktOT1dOX0xPQ0FUSU9OLiBIb3dldmVyLAorCSAgICAg ICBnaW1wbGlmeV9jYWxsX2V4cHIgd2lsbCByZXNldCB0aGVzZSBjYWxsIHN0 bXRzIHRvIGlucHV0X2xvY2F0aW9uCisJICAgICAgIGlmIGl0IGZpbmRzIHN0 bXQncyBsb2NhdGlvbiBpcyB1bmtub3duLiBUbyBwcmV2ZW50IHJlc2V0dGlu ZyBmb3IKKwkgICAgICAgZGVzdHJ1Y3RvcnMsIHdlIHNldCB0aGUgaW5wdXRf bG9jYXRpb24gdG8gdW5rbm93bi4KKwkgICAgICAgTm90ZSB0aGF0IHRoaXMg b25seSBhZmZlY3RzIHRoZSBkZXN0cnVjdG9yIGNhbGxzIGluIEZJTkFMTFkv Q0FUQ0gKKwkgICAgICAgYmxvY2ssIGFuZCB3aWxsIGF1dG9tYXRpY2FsbHkg cmVzZXQgdG8gaXRzIG9yaWdpbmFsIHZhbHVlIGJ5IHRoZQorCSAgICAgICBl bmQgb2YgZ2ltcGxpZnlfZXhwci4gICovCisJICAgIGlucHV0X2xvY2F0aW9u ID0gVU5LTk9XTl9MT0NBVElPTjsKIAkgICAgZXZhbCA9IGNsZWFudXAgPSBO VUxMOwogCSAgICBnaW1wbGlmeV9hbmRfYWRkIChUUkVFX09QRVJBTkQgKCpl eHByX3AsIDApLCAmZXZhbCk7CiAJICAgIGdpbXBsaWZ5X2FuZF9hZGQgKFRS RUVfT1BFUkFORCAoKmV4cHJfcCwgMSksICZjbGVhbnVwKTsK --047d7b111a31c93eb104c93798f9--