115088 2013-04-23 22:41:29 -0700 Filled out more cases of branch folding in the DFG 2013-04-24 08:47:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 880328 0 ggaren 2013-04-23 22:41:29 -0700 Filled out more cases of branch folding in the DFG 880339 1 199390 ggaren 2013-04-23 23:26:34 -0700 Created attachment 199390 Patch 880642 2 ggaren 2013-04-24 08:47:43 -0700 Committed r149041: <http://trac.webkit.org/changeset/149041> 199390 2013-04-23 23:26:34 -0700 2013-04-24 00:10:58 -0700 Patch bug-115088-20130423232557.patch text/plain 13945 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ5MDE2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDEzLTA0LTIzICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgRmlsbGVkIG91dCBtb3JlIGNhc2VzIG9mIGJyYW5jaCBmb2xkaW5nIGluIHRoZSBERkcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTA4OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBv biB0aGUgYmVuY2htYXJrcyB3ZSB0cmFjaywgYnV0IGEgM1ggc3BlZWR1cCBvbiBhCisgICAgICAg IG1pY3JvYmVuY2htYXJrIHRoYXQgdXNlcyB0aGVzZSB0ZWNobmlxdWVzLgorCisgICAgICAgICog ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBh cnNlcjo6cGFyc2VCbG9jayk6ICghLz0pPSBhbmQgKCEvPSk9PSBjYW4gY29uc3RhbnQKKyAgICAg ICAgZm9sZCBhbGwgdHlwZXMsIG5vdCBqdXN0IG51bWJlcnMsIGJlY2F1c2UgdHJ1ZSBjb25zdGFu dHMgaGF2ZSBubworICAgICAgICBzaWRlIGVmZmVjdHMgd2hlbiB0eXBlLWNvbnZlcnRlZCBhdCBy dW50aW1lLgorCisgICAgICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3BwOgorICAgICAgICAoSlND OjpERkc6OkZpeHVwUGhhc2U6OmZpeHVwTm9kZSk6CisgICAgICAgICogZGZnL0RGR05vZGUuaDoK KyAgICAgICAgKEpTQzo6REZHOjpOb2RlOjpzaG91bGRTcGVjdWxhdGVCb29sZWFuKTogQWRkZWQg c3VwcG9ydCBmb3IgZml4aW5nIHVwCisgICAgICAgIGJvb2xlYW4gdXNlcywgbGlrZSB3ZSBkbyBm b3Igb3RoZXIgdHlwZXMgbGlrZSBudW1iZXIuCisKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRp dmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlUGVl cEhvbGVCb29sZWFuQnJhbmNoKToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6 Y29tcGlsZVBlZXBIb2xlQnJhbmNoKToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJ VDo6Y29tcGFyZSk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVT dHJpY3RFcSk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVCb29s ZWFuQ29tcGFyZSk6IFBlZXBob2xlIGZ1c2UKKyAgICAgICAgYm9vbGVhbiBjb21wYXJlIGFuZC9v ciBjb21wYXJlLWJyYW5jaCwgbm93IHRoYXQgd2UgaGF2ZSB0aGUgdHlwZXMgZm9yCisgICAgICAg IHRoZW0uCisKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuaDogVXBkYXRlZCBkZWNs YXJhdGlvbnMuCisKIDIwMTMtMDQtMjMgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4K IAogICAgICAgICBERkcgQ0ZBIGZpbHRlcnMgQ2hlY2tGdW5jdGlvbiBpbiBhIHJlYWxseSB3ZWly ZCB3YXksIGFuZCBhc3N1bWVzIHRoYXQgdGhlIGZ1bmN0aW9uJ3Mgc3RydWN0dXJlIHdvbid0IGNo YW5nZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBh cnNlci5jcHAJKHJldmlzaW9uIDE0OTAxNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NzksNyArNjc5LDkgQEAg cHJpdmF0ZToKICAgICB7CiAgICAgICAgIHJldHVybiBub2RlLT5pc1N0cm9uZ2x5UHJvdmVkQ29u c3RhbnRJbihpbmxpbmVDYWxsRnJhbWUoKSk7CiAgICAgfQotICAgIAorCisgICAgLy8gT3VyIGNv ZGVnZW4gZm9yIGNvbnN0YW50IHN0cmljdCBlcXVhbGl0eSBwZXJmb3JtcyBhIGJpdHdpc2UgY29t cGFyaXNvbiwKKyAgICAvLyBzbyB3ZSBjYW4gb25seSBzZWxlY3QgdmFsdWVzIHRoYXQgaGF2ZSBh IGNvbnNpc3RlbnQgYml0d2lzZSBpZGVudGl0eS4KICAgICBib29sIGlzQ29uc3RhbnRGb3JDb21w YXJlU3RyaWN0RXEoTm9kZSogbm9kZSkKICAgICB7CiAgICAgICAgIGlmICghbm9kZS0+aXNDb25z dGFudCgpKQpAQCAtMjQzMiwxMSArMjQzNCw5IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNl QmxvY2sodW5zaWduZWQKICAgICAgICAgICAgIGlmIChjYW5Gb2xkKG9wMSkgJiYgY2FuRm9sZChv cDIpKSB7CiAgICAgICAgICAgICAgICAgSlNWYWx1ZSBhID0gdmFsdWVPZkpTQ29uc3RhbnQob3Ax KTsKICAgICAgICAgICAgICAgICBKU1ZhbHVlIGIgPSB2YWx1ZU9mSlNDb25zdGFudChvcDIpOwot ICAgICAgICAgICAgICAgIGlmIChhLmlzTnVtYmVyKCkgJiYgYi5pc051bWJlcigpKSB7Ci0gICAg ICAgICAgICAgICAgICAgIHNldChjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLAotICAg ICAgICAgICAgICAgICAgICAgICAgZ2V0SlNDb25zdGFudEZvclZhbHVlKGpzQm9vbGVhbihhLmFz TnVtYmVyKCkgPT0gYi5hc051bWJlcigpKSkpOwotICAgICAgICAgICAgICAgICAgICBORVhUX09Q Q09ERShvcF9lcSk7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHNldChjdXJy ZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kLAorICAgICAgICAgICAgICAgICAgICBnZXRKU0Nv bnN0YW50Rm9yVmFsdWUoanNCb29sZWFuKEpTVmFsdWU6OmVxdWFsKG1fY29kZUJsb2NrLT5nbG9i YWxPYmplY3QoKS0+Z2xvYmFsRXhlYygpLCBhLCBiKSkpKTsKKyAgICAgICAgICAgICAgICBORVhU X09QQ09ERShvcF9lcSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzZXQoY3VycmVudElu c3RydWN0aW9uWzFdLnUub3BlcmFuZCwgYWRkVG9HcmFwaChDb21wYXJlRXEsIG9wMSwgb3AyKSk7 CiAgICAgICAgICAgICBORVhUX09QQ09ERShvcF9lcSk7CkBAIC0yNDU0LDExICsyNDU0LDkgQEAg Ym9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZAogICAgICAgICAgICAgaWYg KGNhbkZvbGQob3AxKSAmJiBjYW5Gb2xkKG9wMikpIHsKICAgICAgICAgICAgICAgICBKU1ZhbHVl IGEgPSB2YWx1ZU9mSlNDb25zdGFudChvcDEpOwogICAgICAgICAgICAgICAgIEpTVmFsdWUgYiA9 IHZhbHVlT2ZKU0NvbnN0YW50KG9wMik7Ci0gICAgICAgICAgICAgICAgaWYgKGEuaXNOdW1iZXIo KSAmJiBiLmlzTnVtYmVyKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0 cnVjdGlvblsxXS51Lm9wZXJhbmQsCi0gICAgICAgICAgICAgICAgICAgICAgICBnZXRKU0NvbnN0 YW50Rm9yVmFsdWUoanNCb29sZWFuKGEuYXNOdW1iZXIoKSA9PSBiLmFzTnVtYmVyKCkpKSk7Ci0g ICAgICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3N0cmljdGVxKTsKLSAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJh bmQsCisgICAgICAgICAgICAgICAgICAgIGdldEpTQ29uc3RhbnRGb3JWYWx1ZShqc0Jvb2xlYW4o SlNWYWx1ZTo6c3RyaWN0RXF1YWwobV9jb2RlQmxvY2stPmdsb2JhbE9iamVjdCgpLT5nbG9iYWxF eGVjKCksIGEsIGIpKSkpOworICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3N0cmljdGVx KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChpc0NvbnN0YW50Rm9yQ29tcGFyZVN0 cmljdEVxKG9wMSkpCiAgICAgICAgICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51 Lm9wZXJhbmQsIGFkZFRvR3JhcGgoQ29tcGFyZVN0cmljdEVxQ29uc3RhbnQsIG9wMiwgb3AxKSk7 CkBAIC0yNDc1LDExICsyNDczLDkgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1 bnNpZ25lZAogICAgICAgICAgICAgaWYgKGNhbkZvbGQob3AxKSAmJiBjYW5Gb2xkKG9wMikpIHsK ICAgICAgICAgICAgICAgICBKU1ZhbHVlIGEgPSB2YWx1ZU9mSlNDb25zdGFudChvcDEpOwogICAg ICAgICAgICAgICAgIEpTVmFsdWUgYiA9IHZhbHVlT2ZKU0NvbnN0YW50KG9wMik7Ci0gICAgICAg ICAgICAgICAgaWYgKGEuaXNOdW1iZXIoKSAmJiBiLmlzTnVtYmVyKCkpIHsKLSAgICAgICAgICAg ICAgICAgICAgc2V0KGN1cnJlbnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsCi0gICAgICAgICAg ICAgICAgICAgICAgICBnZXRKU0NvbnN0YW50Rm9yVmFsdWUoanNCb29sZWFuKGEuYXNOdW1iZXIo KSAhPSBiLmFzTnVtYmVyKCkpKSk7Ci0gICAgICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9w X3N0cmljdGVxKTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgc2V0KGN1cnJl bnRJbnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsCisgICAgICAgICAgICAgICAgICAgIGdldEpTQ29u c3RhbnRGb3JWYWx1ZShqc0Jvb2xlYW4oIUpTVmFsdWU6OmVxdWFsKG1fY29kZUJsb2NrLT5nbG9i YWxPYmplY3QoKS0+Z2xvYmFsRXhlYygpLCBhLCBiKSkpKTsKKyAgICAgICAgICAgICAgICBORVhU X09QQ09ERShvcF9uZXEpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgc2V0KGN1cnJlbnRJ bnN0cnVjdGlvblsxXS51Lm9wZXJhbmQsIGFkZFRvR3JhcGgoTG9naWNhbE5vdCwgYWRkVG9HcmFw aChDb21wYXJlRXEsIG9wMSwgb3AyKSkpOwogICAgICAgICAgICAgTkVYVF9PUENPREUob3BfbmVx KTsKQEAgLTI0OTcsMTEgKzI0OTMsOSBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2Nr KHVuc2lnbmVkCiAgICAgICAgICAgICBpZiAoY2FuRm9sZChvcDEpICYmIGNhbkZvbGQob3AyKSkg ewogICAgICAgICAgICAgICAgIEpTVmFsdWUgYSA9IHZhbHVlT2ZKU0NvbnN0YW50KG9wMSk7CiAg ICAgICAgICAgICAgICAgSlNWYWx1ZSBiID0gdmFsdWVPZkpTQ29uc3RhbnQob3AyKTsKLSAgICAg ICAgICAgICAgICBpZiAoYS5pc051bWJlcigpICYmIGIuaXNOdW1iZXIoKSkgewotICAgICAgICAg ICAgICAgICAgICBzZXQoY3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZCwKLSAgICAgICAg ICAgICAgICAgICAgICAgIGdldEpTQ29uc3RhbnRGb3JWYWx1ZShqc0Jvb2xlYW4oYS5hc051bWJl cigpICE9IGIuYXNOdW1iZXIoKSkpKTsKLSAgICAgICAgICAgICAgICAgICAgTkVYVF9PUENPREUo b3Bfc3RyaWN0ZXEpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBzZXQoY3Vy cmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZCwKKyAgICAgICAgICAgICAgICAgICAgZ2V0SlND b25zdGFudEZvclZhbHVlKGpzQm9vbGVhbighSlNWYWx1ZTo6c3RyaWN0RXF1YWwobV9jb2RlQmxv Y2stPmdsb2JhbE9iamVjdCgpLT5nbG9iYWxFeGVjKCksIGEsIGIpKSkpOworICAgICAgICAgICAg ICAgIE5FWFRfT1BDT0RFKG9wX25zdHJpY3RlcSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBOb2RlKiBpbnZlcnRlZFJlc3VsdDsKICAgICAgICAgICAgIGlmIChpc0NvbnN0YW50Rm9yQ29t cGFyZVN0cmljdEVxKG9wMSkpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Zp eHVwUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Rml4dXBQaGFzZS5jcHAJKHJldmlzaW9uIDE0OTAxNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRml4dXBQaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwNSw2ICszMDUsMTEg QEAgcHJpdmF0ZToKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChub2RlLT5vcCgpICE9 IENvbXBhcmVFcSkKICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGlmIChOb2Rl OjpzaG91bGRTcGVjdWxhdGVCb29sZWFuKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgbm9kZS0+Y2hp bGQyKCkubm9kZSgpKSkgeworICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJv Zml0YWJsZTxCb29sZWFuVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICAgICAgc2V0 VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMigpKTsK KyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChu b2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nKCkgJiYgbm9kZS0+Y2hpbGQyKCkt PnNob3VsZFNwZWN1bGF0ZVN0cmluZygpICYmIEdQUkluZm86Om51bWJlck9mUmVnaXN0ZXJzID49 IDcpIHsKICAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8U3Ry aW5nVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVu Ym94SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQyKCkpOwpAQCAtMzMzLDYgKzMz OCwxMSBAQCBwcml2YXRlOgogICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAgY2FzZSBD b21wYXJlU3RyaWN0RXE6IHsKKyAgICAgICAgICAgIGlmIChOb2RlOjpzaG91bGRTcGVjdWxhdGVC b29sZWFuKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgbm9kZS0+Y2hpbGQyKCkubm9kZSgpKSkgewor ICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxCb29sZWFuVXNl Pihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQ cm9maXRhYmxlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChOb2RlOjpzaG91bGRTcGVjdWxh dGVJbnRlZ2VyKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgbm9kZS0+Y2hpbGQyKCkubm9kZSgpKSkg ewogICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVz ZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElm UHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQyKCkpOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdOb2RlLmgJKHJldmlzaW9uIDE0OTAxNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjMzLDYgKzEyMzMsMTEgQEAg c3RydWN0IE5vZGUgewogICAgICAgICByZXR1cm4gaXNDZWxsU3BlY3VsYXRpb24ocHJlZGljdGlv bigpKTsKICAgICB9CiAgICAgCisgICAgc3RhdGljIGJvb2wgc2hvdWxkU3BlY3VsYXRlQm9vbGVh bihOb2RlKiBvcDEsIE5vZGUqIG9wMikKKyAgICB7CisgICAgICAgIHJldHVybiBvcDEtPnNob3Vs ZFNwZWN1bGF0ZUJvb2xlYW4oKSAmJiBvcDItPnNob3VsZFNwZWN1bGF0ZUJvb2xlYW4oKTsKKyAg ICB9CisgICAgCiAgICAgc3RhdGljIGJvb2wgc2hvdWxkU3BlY3VsYXRlSW50ZWdlcihOb2RlKiBv cDEsIE5vZGUqIG9wMikKICAgICB7CiAgICAgICAgIHJldHVybiBvcDEtPnNob3VsZFNwZWN1bGF0 ZUludGVnZXIoKSAmJiBvcDItPnNob3VsZFNwZWN1bGF0ZUludGVnZXIoKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lv biAxNDkwMTUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklU LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2OSw2ICsxNDY5LDM3IEBAIHZvaWQgU3BlY3VsYXRp dmVKSVQ6OmNvbXBpbGVQZWVwSG9sZU9iamUKICAgICBqdW1wKG5vdFRha2VuKTsKIH0KIAordm9p ZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVBlZXBIb2xlQm9vbGVhbkJyYW5jaChOb2RlKiBub2Rl LCBOb2RlKiBicmFuY2hOb2RlLCBKSVRDb21waWxlcjo6UmVsYXRpb25hbENvbmRpdGlvbiBjb25k aXRpb24pCit7CisgICAgQmxvY2tJbmRleCB0YWtlbiA9IGJyYW5jaE5vZGUtPnRha2VuQmxvY2tJ bmRleCgpOworICAgIEJsb2NrSW5kZXggbm90VGFrZW4gPSBicmFuY2hOb2RlLT5ub3RUYWtlbkJs b2NrSW5kZXgoKTsKKworICAgIC8vIFRoZSBicmFuY2ggaW5zdHJ1Y3Rpb24gd2lsbCBicmFuY2gg dG8gdGhlIHRha2VuIGJsb2NrLgorICAgIC8vIElmIHRha2VuIGlzIG5leHQsIHN3aXRjaCB0YWtl biB3aXRoIG5vdFRha2VuICYgaW52ZXJ0IHRoZSBicmFuY2ggY29uZGl0aW9uIHNvIHdlIGNhbiBm YWxsIHRocm91Z2guCisgICAgaWYgKHRha2VuID09IG5leHRCbG9jaygpKSB7CisgICAgICAgIGNv bmRpdGlvbiA9IEpJVENvbXBpbGVyOjppbnZlcnQoY29uZGl0aW9uKTsKKyAgICAgICAgQmxvY2tJ bmRleCB0bXAgPSB0YWtlbjsKKyAgICAgICAgdGFrZW4gPSBub3RUYWtlbjsKKyAgICAgICAgbm90 VGFrZW4gPSB0bXA7CisgICAgfQorCisgICAgaWYgKGlzQm9vbGVhbkNvbnN0YW50KG5vZGUtPmNo aWxkMSgpLm5vZGUoKSkpIHsKKyAgICAgICAgYm9vbCBpbW0gPSB2YWx1ZU9mQm9vbGVhbkNvbnN0 YW50KG5vZGUtPmNoaWxkMSgpLm5vZGUoKSk7CisgICAgICAgIFNwZWN1bGF0ZUJvb2xlYW5PcGVy YW5kIG9wMih0aGlzLCBub2RlLT5jaGlsZDIoKSk7CisgICAgICAgIGJyYW5jaDMyKGNvbmRpdGlv biwgSklUQ29tcGlsZXI6OkltbTMyKEpTVmFsdWU6OmVuY29kZShqc0Jvb2xlYW4oaW1tKSkpLCBv cDIuZ3ByKCksIHRha2VuKTsKKyAgICB9IGVsc2UgaWYgKGlzQm9vbGVhbkNvbnN0YW50KG5vZGUt PmNoaWxkMigpLm5vZGUoKSkpIHsKKyAgICAgICAgU3BlY3VsYXRlQm9vbGVhbk9wZXJhbmQgb3Ax KHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgYm9vbCBpbW0gPSB2YWx1ZU9mQm9vbGVh bkNvbnN0YW50KG5vZGUtPmNoaWxkMigpLm5vZGUoKSk7CisgICAgICAgIGJyYW5jaDMyKGNvbmRp dGlvbiwgb3AxLmdwcigpLCBKSVRDb21waWxlcjo6SW1tMzIoSlNWYWx1ZTo6ZW5jb2RlKGpzQm9v bGVhbihpbW0pKSksIHRha2VuKTsKKyAgICB9IGVsc2UgeworICAgICAgICBTcGVjdWxhdGVCb29s ZWFuT3BlcmFuZCBvcDEodGhpcywgbm9kZS0+Y2hpbGQxKCkpOworICAgICAgICBTcGVjdWxhdGVC b29sZWFuT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQyKCkpOworICAgICAgICBicmFuY2gz Mihjb25kaXRpb24sIG9wMS5ncHIoKSwgb3AyLmdwcigpLCB0YWtlbik7CisgICAgfQorCisgICAg anVtcChub3RUYWtlbik7Cit9CisKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVQZWVwSG9s ZUludGVnZXJCcmFuY2goTm9kZSogbm9kZSwgTm9kZSogYnJhbmNoTm9kZSwgSklUQ29tcGlsZXI6 OlJlbGF0aW9uYWxDb25kaXRpb24gY29uZGl0aW9uKQogewogICAgIEJsb2NrSW5kZXggdGFrZW4g PSBicmFuY2hOb2RlLT50YWtlbkJsb2NrSW5kZXgoKTsKQEAgLTE1MjEsNyArMTU1Miw5IEBAIGJv b2wgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVQZWVwSG9sZUJyYW4KICAgICAgICAgICAgICAgICAv LyBVc2Ugbm9uLXBlZXBob2xlIGNvbXBhcmlzb24sIGZvciBub3cuCiAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKG5vZGUtPmlzQmlu YXJ5VXNlS2luZChPYmplY3RVc2UpKQorICAgICAgICAgICAgaWYgKG5vZGUtPmlzQmluYXJ5VXNl S2luZChCb29sZWFuVXNlKSkKKyAgICAgICAgICAgICAgICBjb21waWxlUGVlcEhvbGVCb29sZWFu QnJhbmNoKG5vZGUsIGJyYW5jaE5vZGUsIGNvbmRpdGlvbik7CisgICAgICAgICAgICBlbHNlIGlm IChub2RlLT5pc0JpbmFyeVVzZUtpbmQoT2JqZWN0VXNlKSkKICAgICAgICAgICAgICAgICBjb21w aWxlUGVlcEhvbGVPYmplY3RFcXVhbGl0eShub2RlLCBicmFuY2hOb2RlKTsKICAgICAgICAgICAg IGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLnVzZUtpbmQoKSA9PSBPYmplY3RVc2UgJiYgbm9kZS0+ Y2hpbGQyKCkudXNlS2luZCgpID09IE9iamVjdE9yT3RoZXJVc2UpCiAgICAgICAgICAgICAgICAg Y29tcGlsZVBlZXBIb2xlT2JqZWN0VG9PYmplY3RPck90aGVyRXF1YWxpdHkobm9kZS0+Y2hpbGQx KCksIG5vZGUtPmNoaWxkMigpLCBicmFuY2hOb2RlKTsKQEAgLTM0OTksNiArMzUzMiwxMSBAQCBi b29sIFNwZWN1bGF0aXZlSklUOjpjb21wYXJlKE5vZGUqIG5vZGUsCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgCisgICAgICAgIGlmIChub2RlLT5pc0JpbmFy eVVzZUtpbmQoQm9vbGVhblVzZSkpIHsKKyAgICAgICAgICAgIGNvbXBpbGVCb29sZWFuQ29tcGFy ZShub2RlLCBjb25kaXRpb24pOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9 CisKICAgICAgICAgaWYgKG5vZGUtPmlzQmluYXJ5VXNlS2luZChPYmplY3RVc2UpKSB7CiAgICAg ICAgICAgICBjb21waWxlT2JqZWN0RXF1YWxpdHkobm9kZSk7CiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CkBAIC0zNTk4LDYgKzM2MzYsMjEgQEAgYm9vbCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGls ZVN0cmljdEVxRm9yQwogYm9vbCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVN0cmljdEVxKE5vZGUq IG5vZGUpCiB7CiAgICAgc3dpdGNoIChub2RlLT5iaW5hcnlVc2VLaW5kKCkpIHsKKyAgICBjYXNl IEJvb2xlYW5Vc2U6IHsKKyAgICAgICAgdW5zaWduZWQgYnJhbmNoSW5kZXhJbkJsb2NrID0gZGV0 ZWN0UGVlcEhvbGVCcmFuY2goKTsKKyAgICAgICAgaWYgKGJyYW5jaEluZGV4SW5CbG9jayAhPSBV SU5UX01BWCkgeworICAgICAgICAgICAgTm9kZSogYnJhbmNoTm9kZSA9IG1faml0LmdyYXBoKCku bV9ibG9ja3NbbV9ibG9ja10tPmF0KGJyYW5jaEluZGV4SW5CbG9jayk7CisgICAgICAgICAgICBj b21waWxlUGVlcEhvbGVCb29sZWFuQnJhbmNoKG5vZGUsIGJyYW5jaE5vZGUsIE1hY3JvQXNzZW1i bGVyOjpFcXVhbCk7CisgICAgICAgICAgICB1c2Uobm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAg ICAgdXNlKG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgIG1faW5kZXhJbkJsb2NrID0gYnJh bmNoSW5kZXhJbkJsb2NrOworICAgICAgICAgICAgbV9jdXJyZW50Tm9kZSA9IGJyYW5jaE5vZGU7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICBjb21waWxlQm9v bGVhbkNvbXBhcmUobm9kZSwgTWFjcm9Bc3NlbWJsZXI6OkVxdWFsKTsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0KKwogICAgIGNhc2UgSW50MzJVc2U6IHsKICAgICAgICAgdW5zaWduZWQg YnJhbmNoSW5kZXhJbkJsb2NrID0gZGV0ZWN0UGVlcEhvbGVCcmFuY2goKTsKICAgICAgICAgaWYg KGJyYW5jaEluZGV4SW5CbG9jayAhPSBVSU5UX01BWCkgewpAQCAtMzY1OCw2ICszNzExLDIzIEBA IGJvb2wgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVTdHJpY3RFcShOb2QKICAgICB9CiB9CiAKK3Zv aWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVCb29sZWFuQ29tcGFyZShOb2RlKiBub2RlLCBNYWNy b0Fzc2VtYmxlcjo6UmVsYXRpb25hbENvbmRpdGlvbiBjb25kaXRpb24pCit7CisgICAgU3BlY3Vs YXRlQm9vbGVhbk9wZXJhbmQgb3AxKHRoaXMsIG5vZGUtPmNoaWxkMSgpKTsKKyAgICBTcGVjdWxh dGVCb29sZWFuT3BlcmFuZCBvcDIodGhpcywgbm9kZS0+Y2hpbGQyKCkpOworICAgIEdQUlRlbXBv cmFyeSByZXN1bHQodGhpcyk7CisgICAgCisgICAgbV9qaXQuY29tcGFyZTMyKGNvbmRpdGlvbiwg b3AxLmdwcigpLCBvcDIuZ3ByKCksIHJlc3VsdC5ncHIoKSk7CisgICAgCisgICAgLy8gSWYgd2Ug YWRkIGEgRGF0YUZvcm1hdEJvb2wsIHdlIHNob3VsZCB1c2UgaXQgaGVyZS4KKyNpZiBVU0UoSlNW QUxVRTMyXzY0KQorICAgIGJvb2xlYW5SZXN1bHQocmVzdWx0LmdwcigpLCBub2RlKTsKKyNlbHNl CisgICAgbV9qaXQub3IzMihUcnVzdGVkSW1tMzIoVmFsdWVGYWxzZSksIHJlc3VsdC5ncHIoKSk7 CisgICAganNWYWx1ZVJlc3VsdChyZXN1bHQuZ3ByKCksIG1fY3VycmVudE5vZGUsIERhdGFGb3Jt YXRKU0Jvb2xlYW4pOworI2VuZGlmCit9CisKIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVT dHJpbmdFcXVhbGl0eShOb2RlKiBub2RlKQogewogICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGxl ZnQodGhpcywgbm9kZS0+Y2hpbGQxKCkpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkocmV2aXNpb24gMTQ5MDE1KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x OTA4LDYgKzE5MDgsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBjb21wYXJlKE5vZGUqLCBNYWNyb0Fz c2VtYmxlcjo6UmVsYXRpb25hbENvbmRpdGlvbiwgTWFjcm9Bc3NlbWJsZXI6OkRvdWJsZUNvbmRp dGlvbiwgU19ERkdPcGVyYXRpb25fRUpKKTsKICAgICBib29sIGNvbXBpbGVQZWVwSG9sZUJyYW5j aChOb2RlKiwgTWFjcm9Bc3NlbWJsZXI6OlJlbGF0aW9uYWxDb25kaXRpb24sIE1hY3JvQXNzZW1i bGVyOjpEb3VibGVDb25kaXRpb24sIFNfREZHT3BlcmF0aW9uX0VKSik7CiAgICAgdm9pZCBjb21w aWxlUGVlcEhvbGVJbnRlZ2VyQnJhbmNoKE5vZGUqLCBOb2RlKiBicmFuY2hOb2RlLCBKSVRDb21w aWxlcjo6UmVsYXRpb25hbENvbmRpdGlvbik7CisgICAgdm9pZCBjb21waWxlUGVlcEhvbGVCb29s ZWFuQnJhbmNoKE5vZGUqLCBOb2RlKiBicmFuY2hOb2RlLCBKSVRDb21waWxlcjo6UmVsYXRpb25h bENvbmRpdGlvbik7CiAgICAgdm9pZCBjb21waWxlUGVlcEhvbGVEb3VibGVCcmFuY2goTm9kZSos IE5vZGUqIGJyYW5jaE5vZGUsIEpJVENvbXBpbGVyOjpEb3VibGVDb25kaXRpb24pOwogICAgIHZv aWQgY29tcGlsZVBlZXBIb2xlT2JqZWN0RXF1YWxpdHkoTm9kZSosIE5vZGUqIGJyYW5jaE5vZGUp OwogICAgIHZvaWQgY29tcGlsZVBlZXBIb2xlT2JqZWN0VG9PYmplY3RPck90aGVyRXF1YWxpdHko RWRnZSBsZWZ0Q2hpbGQsIEVkZ2UgcmlnaHRDaGlsZCwgTm9kZSogYnJhbmNoTm9kZSk7CkBAIC0x OTI0LDYgKzE5MjUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjb21waWxlTmV3U3RyaW5nT2JqZWN0 KE5vZGUqKTsKICAgICAKICAgICB2b2lkIGNvbXBpbGVJbnRlZ2VyQ29tcGFyZShOb2RlKiwgTWFj cm9Bc3NlbWJsZXI6OlJlbGF0aW9uYWxDb25kaXRpb24pOworICAgIHZvaWQgY29tcGlsZUJvb2xl YW5Db21wYXJlKE5vZGUqLCBNYWNyb0Fzc2VtYmxlcjo6UmVsYXRpb25hbENvbmRpdGlvbik7CiAg ICAgdm9pZCBjb21waWxlRG91YmxlQ29tcGFyZShOb2RlKiwgTWFjcm9Bc3NlbWJsZXI6OkRvdWJs ZUNvbmRpdGlvbik7CiAgICAgCiAgICAgYm9vbCBjb21waWxlU3RyaWN0RXFGb3JDb25zdGFudChO b2RlKiwgRWRnZSB2YWx1ZSwgSlNWYWx1ZSBjb25zdGFudCk7Cg==