195444 2019-03-07 17:49:10 -0800 [JSC] Remove merging must handle values into proven types in CFA 2019-03-07 19:11:18 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1513840 0 ysuzuki 2019-03-07 17:49:10 -0800 ... 1513847 1 ysuzuki 2019-03-07 18:05:15 -0800 I've changed the ChangeLog part since OSR entry validates the value with AbstractValue. We should not consume must handle value as a constant AbstractValue in CFA since we do not have strong assumption that must handle values should be the same constants when kicking off concurrent compilation and actually performing OSR entry. 1513856 2 363969 ysuzuki 2019-03-07 18:30:16 -0800 Created attachment 363969 Patch for landing 1513858 3 ysuzuki 2019-03-07 18:31:18 -0800 Originally, this patch is included in https://bugs.webkit.org/show_bug.cgi?id=195429, and separated after the review. (https://bugs.webkit.org/show_bug.cgi?id=195429#c4). 1513875 4 ysuzuki 2019-03-07 18:55:01 -0800 Landed in https://trac.webkit.org/changeset/242627/webkit 1513879 5 webkit-bug-importer 2019-03-07 19:11:18 -0800 <rdar://problem/48700174> 363969 2019-03-07 18:30:16 -0800 2019-03-07 18:30:16 -0800 Patch for landing bug-195444-20190307183016.patch text/plain 8585 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NDdhODBhNWJiNWYxNTc0NmE5NTE0YmU4ZmM4NzkyZGRjMzJlOTZlLi4xOTRlZDE5MmMyNjFiZjgz ZmU5MjhlNGQ1MTBlMzgxNDlmMWYwM2QwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MiBAQAorMjAxOS0wMy0wNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJlbW92ZSBtZXJnaW5nIG11c3QgaGFuZGxlIHZhbHVlcyBpbnRv IHByb3ZlbiB0eXBlcyBpbiBDRkEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NTQ0NAorCisgICAgICAgIFJldmlld2VkIGJ5IFNhYW0gQmFyYXRpLgor CisgICAgICAgIFByZXZpb3VzbHksIHdlIGFyZSBtZXJnaW5nIG11c3QgaGFuZGxlIHZhbHVlcyBh cyBhIHByb3ZlbiBjb25zdGFudCBpbiBDRkEuIFRoaXMgaXMgT0sgYXMgbG9uZyBhcyB0aGlzIHBy b3ZlbiBBYnN0cmFjdFZhbHVlIGlzIGJsdXJyZWQgYnkgbWVyZ2luZyB0aGUgb3RoZXIgbGVnaXQg QWJzdHJhY3RWYWx1ZXMKKyAgICAgICAgZnJvbSB0aGUgc3VjY2Vzc29ycy4gQnV0IGxldCdzIGNv bnNpZGVyIHRoZSBmb2xsb3dpbmcgY29kZSwgdGhpcyBpcyBhY3R1YWxseSBnZW5lcmF0ZWQgREZH IGdyYXBoIGZyb20gdGhlIGF0dGFjaGVkIHRlc3QgaW4gcjI0MjYyNi4KKworICAgICAgICAgICAg QmxvY2sgIzIgKGxvb3AgaGVhZGVyKSBzdWNjICMzLCAjNAorICAgICAgICAgICAgLi4uCisgICAg ICAgICAgICAxOiBGb3JjZU9TUkV4aXQKKyAgICAgICAgICAgIC4uLgorICAgICAgICAgICAgMjog SlNDb25zdGFudCgwKQorICAgICAgICAgICAgMzogU2V0TG9jYWwoQDIsIGxvYzYpCisgICAgICAg ICAgICAuLi4KKyAgICAgICAgICAgIDQ6IEJyYW5jaCgjMywgIzQpCisKKyAgICAgICAgICAgIEJs b2NrICMzIChUaGlzIGlzIE9TUiBlbnRyeSB0YXJnZXQpIHByZWQgIzIsICMzLCBtdXN0IGhhbmRs ZSB2YWx1ZSBmb3IgbG9jNiA9PiBKU0NvbnN0YW50KEludDMyLCAzMSkKKyAgICAgICAgICAgIC4u LgorICAgICAgICAgICAgNTogR2V0TG9jYWwobG9jNikKKyAgICAgICAgICAgIDY6IFN0cmluZ0Zy b21DaGFyQ29kZShANSkKKyAgICAgICAgICAgIC4uLgorCisgICAgICAgIEJsb2NrICMzIGlzIE9T UiBlbnRyeSB0YXJnZXQuIFNvIHdlIGhhdmUgbXVzdCBoYW5kbGUgdmFsdWUgZm9yIGxvYzYgYW5k IGl0IGlzIEludDMyIGNvbnN0YW50IDMxLiBUaGVuIHdlIG1lcmdlIHRoaXMgY29uc3RhbnQgYXMg YSBwcm92ZW4gdmFsdWUgaW4gIzMncyBsb2M2IEFic3RyYWN0VmFsdWUuCisgICAgICAgIElmIHRo ZSB2YWx1ZSBmcm9tICMyIGJsdXJzIHRoZSB2YWx1ZSwgaXQgaXMgT0suIEhvd2V2ZXIsICMyIGhh cyBGb3JjZU9TUkV4aXQuIFNvIG11c3QgaGFuZGxlIHZhbHVlIHN1ZGRlbmx5IGJlY29tZXMgdGhl IG9ubHkgc291cmNlIG9mIGxvYzYgaW4gIzMuIFRoZW4gd2UgdXNlIHRoaXMgY29uc3RhbnQKKyAg ICAgICAgYXMgYSBwcm92ZW4gdmFsdWUuIEJ1dCB0aGlzIGlzIG5vdCBleHBlY3RlZCBiZWhhdmlv ciBzaW5jZSBtdXN0IGhhbmRsZSB2YWx1ZSBpcyBqdXN0IGEgc25hcHNob3Qgb2YgdGhlIGxvY2Fs cyB3aGVuIHdlIGtpY2sgb2ZmIHRoZSBjb25jdXJyZW50IGNvbXBpbGF0aW9uLiBJbiB0aGUgYWJv dmUgZXhhbXBsZSwKKyAgICAgICAgd2UgYXNzdW1lIHRoYXQgbG9vcCBpbmRleCBpcyBhbiBjb25z dGFudCAzMSwgYnV0IGl0IGlzIHdyb25nLCBhbmQgT1NSIGVudHJ5IGZhaWxzLiBCZWNhdXNlIHRo ZXJlIGlzIG5vIHN0cm9uZyBhc3N1bXB0aW9uIHRoYXQgdGhlIG11c3QgaGFuZGxlIHZhbHVlIGlz IHRoZSBwcm92ZW4gdHlwZSBvciB2YWx1ZSwKKyAgICAgICAgd2Ugc2hvdWxkIG5vdCBtZXJnZSBp dCBpbiBDRkEuCisKKyAgICAgICAgU2luY2UgKDEpIHRoaXMgaXMganVzdCBhbiBvcHRpbWl6YXRp b24sICgyKSB0eXBlIGluZm9ybWF0aW9uIGlzIGFscmVhZHkgcHJvcGFnYXRlZCBpbiBwcmVkaWN0 aW9uIGluamVjdGlvbiBwaGFzZSwgYW5kICgzKSB0aGUgbXVzdCBoYW5kbGUgdmFsdWUgZG9lcyBu b3Qgc2hvdyB0aGUgcGVyZm9ybWFuY2UKKyAgICAgICAgcHJvZ3Jlc3Npb24gaW4gcjIxMTQ2MSBh bmQgd2Ugbm8gbG9uZ2VyIHNlZSB0eXBlIG1pc3ByZWRpY3Rpb24gaW4gbWFyc2FnbGlhLW9zci1l bnRyeS5qcywgdGhpcyBwYXRjaCBzaW1wbHkgcmVtb3ZlcyBtdXN0IGhhbmRsZSB2YWx1ZSB0eXBl IHdpZGVuaW5nIGluIENGQS4KKworICAgICAgICAqIGRmZy9ERkdDRkFQaGFzZS5jcHA6CisgICAg ICAgIChKU0M6OkRGRzo6Q0ZBUGhhc2U6OnJ1bik6CisgICAgICAgIChKU0M6OkRGRzo6Q0ZBUGhh c2U6OnBlcmZvcm1CbG9ja0NGQSk6CisgICAgICAgIChKU0M6OkRGRzo6Q0ZBUGhhc2U6OmluamVj dE9TUik6IERlbGV0ZWQuCisKIDIwMTktMDMtMDcgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFw cGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBTdHJpbmdGcm9tQ2hhckNvZGUgZmFzdCBwYXRoIHNo b3VsZCBhY2NlcHQgMHhmZiBpbiBERkcgYW5kIEZUTApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdDRkFQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0NGQVBoYXNlLmNwcAppbmRleCBmNmY5NTA2OWFhYTg1NzExMWIyNGQ1ZTE2ODc1M2RmMmM0 YjE3MTU4Li5hMGE5MDFkMGNjMzNmNzJkMzNkNjE1ZThmOTYzYzg1MzZhMmQ5MWVhIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NGQVBoYXNlLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NGQVBoYXNlLmNwcApAQCAtNzYsNjMgKzc2LDEyIEBA IGNsYXNzIENGQVBoYXNlIDogcHVibGljIFBoYXNlIHsKICAgICAgICAgCiAgICAgICAgIG1fc3Rh dGUuaW5pdGlhbGl6ZSgpOwogICAgICAgICAKLSAgICAgICAgaWYgKG1fZ3JhcGgubV9mb3JtICE9 IFNTQSkgewotICAgICAgICAgICAgaWYgKG1fdmVyYm9zZSkKLSAgICAgICAgICAgICAgICBkYXRh TG9nKCIgICBXaWRlbmluZyBzdGF0ZSBhdCBPU1IgZW50cnkgYmxvY2suXG4iKTsKLSAgICAgICAg ICAgIAotICAgICAgICAgICAgLy8gV2lkZW4gdGhlIGFic3RyYWN0IHZhbHVlcyBhdCB0aGUgYmxv Y2sgdGhhdCBzZXJ2ZXMgYXMgdGhlIG11c3QtaGFuZGxlIE9TUiBlbnRyeS4KLSAgICAgICAgICAg IGZvciAoQmxvY2tJbmRleCBibG9ja0luZGV4ID0gbV9ncmFwaC5udW1CbG9ja3MoKTsgYmxvY2tJ bmRleC0tOykgewotICAgICAgICAgICAgICAgIEJhc2ljQmxvY2sqIGJsb2NrID0gbV9ncmFwaC5i bG9jayhibG9ja0luZGV4KTsKLSAgICAgICAgICAgICAgICBpZiAoIWJsb2NrKQotICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBp ZiAoIWJsb2NrLT5pc09TUlRhcmdldCkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0g ICAgICAgICAgICAgICAgaWYgKGJsb2NrLT5ieXRlY29kZUJlZ2luICE9IG1fZ3JhcGgubV9wbGFu Lm9zckVudHJ5Qnl0ZWNvZGVJbmRleCgpKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICAvLyBXZSByZWNvcmQgdGhhdCB0aGUg YmxvY2sgbmVlZHMgc29tZSBPU1Igc3R1ZmYsIGJ1dCB3ZSBkb24ndCBkbyB0aGF0IHlldC4gV2Ug d2FudCB0bwotICAgICAgICAgICAgICAgIC8vIGhhbmRsZSBPU1IgZW50cnkgZGF0YSBhdCB0aGUg cmlnaHQgdGltZSBpbiBvcmRlciB0byBnZXQgdGhlIGJlc3QgY29tcGlsZSB0aW1lcy4gSWYgd2UK LSAgICAgICAgICAgICAgICAvLyBzaW1wbHkgaW5qZWN0ZWQgT1NSIGRhdGEgcmlnaHQgbm93LCB0 aGVuIHdlJ2QgcG90ZW50aWFsbHkgY2F1c2UgYSBsb29wIGJvZHkgdG8gYmUKLSAgICAgICAgICAg ICAgICAvLyBpbnRlcnByZXRlZCB3aXRoIGp1c3QgdGhlIGNvbnN0YW50cyB3ZSBmZWVkIGl0LCB3 aGljaCBpcyBtb3JlIGV4cGVuc2l2ZSB0aGFuIGlmIHdlCi0gICAgICAgICAgICAgICAgLy8gaW50 ZXJwcmV0ZWQgaXQgd2l0aCBub24tY29uc3RhbnQgdmFsdWVzLiBJZiB3ZSBhbHdheXMgaW5qZWN0 ZWQgdGhpcyBkYXRhIGFmdGVyIHRoZQotICAgICAgICAgICAgICAgIC8vIG1haW4gcGFzcyBvZiBD RkEgcmFuLCB0aGVuIHdlIHdvdWxkIHBvdGVudGlhbGx5IHNwZW5kIGEgYnVuY2ggb2YgdGltZSBy ZXJ1bm5pbmcgQ0ZBCi0gICAgICAgICAgICAgICAgLy8gYWZ0ZXIgY29udmVyZ2VuY2UuIFNvLCB3 ZSB0cnkgdmVyeSBoYXJkIHRvIGluamVjdCBPU1IgZGF0YSBmb3IgYSBibG9jayB3aGVuIHdlIGZp cnN0Ci0gICAgICAgICAgICAgICAgLy8gbmF0dXJhbGx5IGNvbWUgdG8gc2VlIGl0IC0gc2VlIHRo ZSBtX2Jsb2Nrc1dpdGhPU1IgY2hlY2sgaW4gcGVyZm9ybUJsb2NrQ0ZBKCkuIFRoaXMKLSAgICAg ICAgICAgICAgICAvLyB3YXksIHdlOgotICAgICAgICAgICAgICAgIC8vCi0gICAgICAgICAgICAg ICAgLy8gLSBSZWR1Y2UgdGhlIGxpa2VsaWhvb2Qgb2YgaW50ZXJwcmV0aW5nIHRoZSBibG9jayB3 aXRoIGNvbnN0YW50cywgc2luY2Ugd2Ugd2lsbCBpbmplY3QKLSAgICAgICAgICAgICAgICAvLyAg IHRoZSBPU1IgZW50cnkgY29uc3RhbnRzIG9uIHRvcCBvZiB3aGF0ZXZlciBhYnN0cmFjdCB2YWx1 ZXMgd2UgZ290IGZvciB0aGF0IGJsb2NrIG9uCi0gICAgICAgICAgICAgICAgLy8gICB0aGUgZmly c3QgcGFzcy4gVGhlIG1peCBvZiB0aG9zZSB0d28gdGhpbmdzIGlzIGxpa2VseSB0byBub3QgYmUg Y29uc3RhbnQuCi0gICAgICAgICAgICAgICAgLy8KLSAgICAgICAgICAgICAgICAvLyAtIFJlZHVj ZSB0aGUgdG90YWwgbnVtYmVyIG9mIENGQSByZWV4ZWN1dGlvbnMgc2luY2Ugd2UgaW5qZWN0IHRo ZSBPU1IgZGF0YSBhcyBwYXJ0IG9mCi0gICAgICAgICAgICAgICAgLy8gICB0aGUgbm9ybWFsIGZs b3cgb2YgQ0ZBIGluc3RlYWQgb2YgaGF2aW5nIHRvIGRvIGEgc2Vjb25kIGZpeHBvaW50LiBXZSBt YXkgc3RpbGwgaGF2ZQotICAgICAgICAgICAgICAgIC8vICAgdG8gZG8gYSBzZWNvbmQgZml4cG9p bnQgaWYgd2UgZG9uJ3QgZXZlbiByZWFjaCB0aGUgT1NSIGVudHJ5IGJsb2NrIGR1cmluZyB0aGUg bWFpbgotICAgICAgICAgICAgICAgIC8vICAgcnVuIG9mIENGQSwgYnV0IGluIHRoYXQgY2FzZSBh dCBsZWFzdCB3ZSdyZSBub3QgYmVpbmcgcmVkdW5kYW50LgotICAgICAgICAgICAgICAgIG1fYmxv Y2tzV2l0aE9TUi5hZGQoYmxvY2spOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KICAgICAg ICAgZG8gewogICAgICAgICAgICAgbV9jaGFuZ2VkID0gZmFsc2U7CiAgICAgICAgICAgICBwZXJm b3JtRm9yd2FyZENGQSgpOwogICAgICAgICB9IHdoaWxlIChtX2NoYW5nZWQpOwogICAgICAgICAK ICAgICAgICAgaWYgKG1fZ3JhcGgubV9mb3JtICE9IFNTQSkgewotICAgICAgICAgICAgZm9yIChC bG9ja0luZGV4IGJsb2NrSW5kZXggPSBtX2dyYXBoLm51bUJsb2NrcygpOyBibG9ja0luZGV4LS07 KSB7Ci0gICAgICAgICAgICAgICAgQmFzaWNCbG9jayogYmxvY2sgPSBtX2dyYXBoLmJsb2NrKGJs b2NrSW5kZXgpOwotICAgICAgICAgICAgICAgIGlmICghYmxvY2spCi0gICAgICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIGlmIChtX2Js b2Nrc1dpdGhPU1IucmVtb3ZlKGJsb2NrKSkKLSAgICAgICAgICAgICAgICAgICAgbV9jaGFuZ2Vk IHw9IGluamVjdE9TUihibG9jayk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAKLSAgICAg ICAgICAgIHdoaWxlIChtX2NoYW5nZWQpIHsKLSAgICAgICAgICAgICAgICBtX2NoYW5nZWQgPSBm YWxzZTsKLSAgICAgICAgICAgICAgICBwZXJmb3JtRm9yd2FyZENGQSgpOwotICAgICAgICAgICAg fQotICAgICAgICAKICAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSByZWNvcmQgdGhlIGludGVy c2VjdGlvbiBvZiBhbGwgcHJvb2ZzIHRoYXQgd2UgZXZlciBhbGxvd2VkIHRoZQogICAgICAgICAg ICAgLy8gY29tcGlsZXIgdG8gcmVseSB1cG9uLgogICAgICAgICAgICAgZm9yIChCbG9ja0luZGV4 IGJsb2NrSW5kZXggPSBtX2dyYXBoLm51bUJsb2NrcygpOyBibG9ja0luZGV4LS07KSB7CkBAIC0x NTcsNDUgKzEwNiw2IEBAIGNsYXNzIENGQVBoYXNlIDogcHVibGljIFBoYXNlIHsKICAgICB9CiAg ICAgCiBwcml2YXRlOgotICAgIGJvb2wgaW5qZWN0T1NSKEJhc2ljQmxvY2sqIGJsb2NrKQotICAg IHsKLSAgICAgICAgaWYgKG1fdmVyYm9zZSkKLSAgICAgICAgICAgIGRhdGFMb2coIiAgIEZvdW5k IG11c3QtaGFuZGxlIGJsb2NrOiAiLCAqYmxvY2ssICJcbiIpOwotICAgICAgICAKLSAgICAgICAg Ym9vbCBjaGFuZ2VkID0gZmFsc2U7Ci0gICAgICAgIGNvbnN0IE9wZXJhbmRzPE9wdGlvbmFsPEpT VmFsdWU+PiYgbXVzdEhhbmRsZVZhbHVlcyA9IG1fZ3JhcGgubV9wbGFuLm11c3RIYW5kbGVWYWx1 ZXMoKTsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IG11c3RIYW5kbGVWYWx1ZXMuc2l6ZSgpOyBp LS07KSB7Ci0gICAgICAgICAgICBpbnQgb3BlcmFuZCA9IG11c3RIYW5kbGVWYWx1ZXMub3BlcmFu ZEZvckluZGV4KGkpOwotICAgICAgICAgICAgT3B0aW9uYWw8SlNWYWx1ZT4gdmFsdWUgPSBtdXN0 SGFuZGxlVmFsdWVzW2ldOwotICAgICAgICAgICAgaWYgKCF2YWx1ZSkgewotICAgICAgICAgICAg ICAgIGlmIChtX3ZlcmJvc2UpCi0gICAgICAgICAgICAgICAgICAgIGRhdGFMb2coIiAgIE5vdCBs aXZlIGluIGJ5dGVjb2RlOiAiLCBWaXJ0dWFsUmVnaXN0ZXIob3BlcmFuZCksICJcbiIpOwotICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgTm9kZSog bm9kZSA9IGJsb2NrLT52YXJpYWJsZXNBdEhlYWQub3BlcmFuZChvcGVyYW5kKTsKLSAgICAgICAg ICAgIGlmICghbm9kZSkgewotICAgICAgICAgICAgICAgIGlmIChtX3ZlcmJvc2UpCi0gICAgICAg ICAgICAgICAgICAgIGRhdGFMb2coIiAgIE5vdCBsaXZlOiAiLCBWaXJ0dWFsUmVnaXN0ZXIob3Bl cmFuZCksICJcbiIpOwotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQot ICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiAobV92ZXJib3NlKQotICAgICAgICAgICAgICAg IGRhdGFMb2coIiAgIFdpZGVuaW5nICIsIFZpcnR1YWxSZWdpc3RlcihvcGVyYW5kKSwgIiB3aXRo ICIsIHZhbHVlLnZhbHVlKCksICJcbiIpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBBYnN0 cmFjdFZhbHVlJiB0YXJnZXQgPSBibG9jay0+dmFsdWVzQXRIZWFkLm9wZXJhbmQob3BlcmFuZCk7 Ci0gICAgICAgICAgICBjaGFuZ2VkIHw9IHRhcmdldC5tZXJnZU9TUkVudHJ5VmFsdWUobV9ncmFw aCwgdmFsdWUudmFsdWUoKSk7Ci0gICAgICAgICAgICB0YXJnZXQuZml4VHlwZUZvclJlcHJlc2Vu dGF0aW9uKAotICAgICAgICAgICAgICAgIG1fZ3JhcGgsIHJlc3VsdEZvcihub2RlLT52YXJpYWJs ZUFjY2Vzc0RhdGEoKS0+Zmx1c2hGb3JtYXQoKSksIG5vZGUpOwotICAgICAgICB9Ci0gICAgICAg IAotICAgICAgICBpZiAoY2hhbmdlZCB8fCAhYmxvY2stPmNmYUhhc1Zpc2l0ZWQpIHsKLSAgICAg ICAgICAgIGJsb2NrLT5jZmFTaG91bGRSZXZpc2l0ID0gdHJ1ZTsKLSAgICAgICAgICAgIHJldHVy biB0cnVlOwotICAgICAgICB9Ci0gICAgICAgIAotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg fQotICAgIAogICAgIHZvaWQgcGVyZm9ybUJsb2NrQ0ZBKEJhc2ljQmxvY2sqIGJsb2NrKQogICAg IHsKICAgICAgICAgaWYgKCFibG9jaykKQEAgLTIwNSw5ICsxMTUsNiBAQCBjbGFzcyBDRkFQaGFz ZSA6IHB1YmxpYyBQaGFzZSB7CiAgICAgICAgIGlmIChtX3ZlcmJvc2UpCiAgICAgICAgICAgICBk YXRhTG9nKCIgICBCbG9jayAiLCAqYmxvY2ssICI6XG4iKTsKICAgICAgICAgCi0gICAgICAgIGlm IChtX2Jsb2Nrc1dpdGhPU1IucmVtb3ZlKGJsb2NrKSkKLSAgICAgICAgICAgIGluamVjdE9TUihi bG9jayk7Ci0gICAgICAgIAogICAgICAgICBtX3N0YXRlLmJlZ2luQmFzaWNCbG9jayhibG9jayk7 CiAgICAgICAgIGlmIChtX3ZlcmJvc2UpIHsKICAgICAgICAgICAgIGRhdGFMb2coIiAgICAgIGhl YWQgdmFyczogIiwgYmxvY2stPnZhbHVlc0F0SGVhZCwgIlxuIik7CkBAIC0yNjMsNyArMTcwLDYg QEAgY2xhc3MgQ0ZBUGhhc2UgOiBwdWJsaWMgUGhhc2UgewogcHJpdmF0ZToKICAgICBJblBsYWNl QWJzdHJhY3RTdGF0ZSBtX3N0YXRlOwogICAgIEFic3RyYWN0SW50ZXJwcmV0ZXI8SW5QbGFjZUFi c3RyYWN0U3RhdGU+IG1faW50ZXJwcmV0ZXI7Ci0gICAgQmxvY2tTZXQgbV9ibG9ja3NXaXRoT1NS OwogICAgIAogICAgIGJvb2wgbV92ZXJib3NlOwogICAgIAo=