150832 2015-11-02 21:33:30 -0800 Rename InlineCallFrame:: getCallerSkippingDeadFrames to something more descriptive 2015-11-03 12:02:58 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff commit-queue oldest_to_newest 1138834 0 msaboff 2015-11-02 21:33:30 -0800 InlineCallFrame::getCallerSkippingDeadFrames() really skips over tail calling frames. It should be renamed to something like getCallerSkippingTailCallers(). 1138986 1 264701 msaboff 2015-11-03 11:12:18 -0800 Created attachment 264701 Patch 1138987 2 264701 ggaren 2015-11-03 11:13:47 -0800 Comment on attachment 264701 Patch r=me 1139007 3 264701 commit-queue 2015-11-03 12:02:55 -0800 Comment on attachment 264701 Patch Clearing flags on attachment: 264701 Committed r191965: <http://trac.webkit.org/changeset/191965> 1139008 4 commit-queue 2015-11-03 12:02:58 -0800 All reviewed patches have been landed. Closing bug. 264701 2015-11-03 11:12:18 -0800 2015-11-03 12:02:55 -0800 Patch 150832.patch text/plain 12583 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkxOTYxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDE1LTExLTAzICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmFtZSBJbmxpbmVDYWxsRnJhbWU6OiBnZXRDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMg dG8gc29tZXRoaW5nIG1vcmUgZGVzY3JpcHRpdmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDgzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZWQgSW5saW5lQ2FsbEZyYW1lOjpnZXRDYWxsZXJT a2lwcGluZ0RlYWRGcmFtZXMoKSB0byBnZXRDYWxsZXJTa2lwcGluZ1RhaWxDYWxscygpLgorICAg ICAgICBEaWQgc2ltaWxhciByZW5hbWluZyB0byBoZWxwZXIgSW5saW5lQ2FsbEZyYW1lOjpjb21w dXRlQ2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHMoKSBhbmQKKyAgICAgICAgSW5saW5lQ2FsbEZyYW1l OjpnZXRDYWxsZXJJbmxpbmVGcmFtZVNraXBwaW5nVGFpbENhbGxzKCkuCisKKyAgICAgICAgKiBi eXRlY29kZS9JbmxpbmVDYWxsRnJhbWUuaDoKKyAgICAgICAgKEpTQzo6SW5saW5lQ2FsbEZyYW1l Ojpjb21wdXRlQ2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHMpOgorICAgICAgICAoSlNDOjpJbmxpbmVD YWxsRnJhbWU6OmdldENhbGxlclNraXBwaW5nVGFpbENhbGxzKToKKyAgICAgICAgKEpTQzo6SW5s aW5lQ2FsbEZyYW1lOjpnZXRDYWxsZXJJbmxpbmVGcmFtZVNraXBwaW5nVGFpbENhbGxzKToKKyAg ICAgICAgKEpTQzo6SW5saW5lQ2FsbEZyYW1lOjpjb21wdXRlQ2FsbGVyU2tpcHBpbmdEZWFkRnJh bWVzKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6SW5saW5lQ2FsbEZyYW1lOjpnZXRDYWxsZXJT a2lwcGluZ0RlYWRGcmFtZXMpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpJbmxpbmVDYWxsRnJh bWU6OmdldENhbGxlcklubGluZUZyYW1lU2tpcHBpbmdEZWFkRnJhbWVzKTogRGVsZXRlZC4KKyAg ICAgICAgKiBkZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5 dGVDb2RlUGFyc2VyOjphbGxJbmxpbmVGcmFtZXNBcmVUYWlsQ2FsbHMpOgorICAgICAgICAoSlND OjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpjdXJyZW50Q29kZU9yaWdpbik6CisgICAgICAgIChKU0M6 OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OmdldFByZWRpY3Rpb25XaXRob3V0T1NSRXhpdCk6CisgICAg ICAgICogZGZnL0RGR0dyYXBoLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpHcmFwaDo6aXNMaXZl SW5CeXRlY29kZSk6CisgICAgICAgICogZGZnL0RGR0dyYXBoLmg6CisgICAgICAgIChKU0M6OkRG Rzo6R3JhcGg6OmZvckFsbExvY2Fsc0xpdmVJbkJ5dGVjb2RlKToKKyAgICAgICAgKiBkZmcvREZH T1NSRXhpdENvbXBpbGVyQ29tbW9uLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpyZWlmeUlubGlu ZWRDYWxsRnJhbWVzKToKKyAgICAgICAgKiBkZmcvREZHUHJlY2lzZUxvY2FsQ2xvYmJlcml6ZS5o OgorICAgICAgICAoSlNDOjpERkc6OlByZWNpc2VMb2NhbENsb2JiZXJpemVBZGFwdG9yOjpyZWFk VG9wKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHA6CisgICAgICAg IChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmVtaXRDYWxsKToKKyAgICAgICAgKiBkZmcvREZH U3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6 OmVtaXRDYWxsKToKKyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwOgorICAgICAg ICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmNvZGVPcmlnaW5EZXNjcmlwdGlvbk9m Q2FsbFNpdGUpOgorICAgICAgICAqIGludGVycHJldGVyL1N0YWNrVmlzaXRvci5jcHA6CisgICAg ICAgIChKU0M6OlN0YWNrVmlzaXRvcjo6Z290b05leHRGcmFtZSk6CisKIDIwMTUtMTEtMDIgIEZp bGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBCMy9BaXIgc2hvdWxkIHVz ZSBidWJibGUgc29ydCBmb3IgdGhlaXIgaW5zZXJ0aW9uIHNldHMsIGJlY2F1c2UgaXQncyBmYXN0 ZXIgdGhhbiBzdGQ6OnN0YWJsZV9zb3J0CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvSW5saW5lQ2FsbEZyYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL0lubGluZUNhbGxGcmFtZS5oCShyZXZpc2lvbiAxOTE5NjApCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvSW5saW5lQ2FsbEZyYW1lLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE0Niw3ICsxNDYsNyBAQCBzdHJ1Y3QgSW5saW5lQ2FsbEZyYW1lIHsKICAgICAgICAg cmV0dXJuIGlzVGFpbChzdGF0aWNfY2FzdDxLaW5kPihraW5kKSk7CiAgICAgfQogCi0gICAgc3Rh dGljIENvZGVPcmlnaW4qIGNvbXB1dGVDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMoSW5saW5lQ2Fs bEZyYW1lKiBpbmxpbmVDYWxsRnJhbWUsIEtpbmQqIGNhbGxlckNhbGxLaW5kID0gbnVsbHB0cikK KyAgICBzdGF0aWMgQ29kZU9yaWdpbiogY29tcHV0ZUNhbGxlclNraXBwaW5nVGFpbENhbGxzKElu bGluZUNhbGxGcmFtZSogaW5saW5lQ2FsbEZyYW1lLCBLaW5kKiBjYWxsZXJDYWxsS2luZCA9IG51 bGxwdHIpCiAgICAgewogICAgICAgICBDb2RlT3JpZ2luKiBjb2RlT3JpZ2luOwogICAgICAgICBi b29sIHRhaWxDYWxsZWU7CkBAIC0xNjcsMTQgKzE2NywxNCBAQCBzdHJ1Y3QgSW5saW5lQ2FsbEZy YW1lIHsKICAgICAgICAgcmV0dXJuIGNvZGVPcmlnaW47CiAgICAgfQogCi0gICAgQ29kZU9yaWdp biogZ2V0Q2FsbGVyU2tpcHBpbmdEZWFkRnJhbWVzKEtpbmQqIGNhbGxlckNhbGxLaW5kID0gbnVs bHB0cikKKyAgICBDb2RlT3JpZ2luKiBnZXRDYWxsZXJTa2lwcGluZ1RhaWxDYWxscyhLaW5kKiBj YWxsZXJDYWxsS2luZCA9IG51bGxwdHIpCiAgICAgewotICAgICAgICByZXR1cm4gY29tcHV0ZUNh bGxlclNraXBwaW5nRGVhZEZyYW1lcyh0aGlzLCBjYWxsZXJDYWxsS2luZCk7CisgICAgICAgIHJl dHVybiBjb21wdXRlQ2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHModGhpcywgY2FsbGVyQ2FsbEtpbmQp OwogICAgIH0KIAotICAgIElubGluZUNhbGxGcmFtZSogZ2V0Q2FsbGVySW5saW5lRnJhbWVTa2lw cGluZ0RlYWRGcmFtZXMoKQorICAgIElubGluZUNhbGxGcmFtZSogZ2V0Q2FsbGVySW5saW5lRnJh bWVTa2lwcGluZ1RhaWxDYWxscygpCiAgICAgewotICAgICAgICBDb2RlT3JpZ2luKiBjYWxsZXIg PSBnZXRDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMoKTsKKyAgICAgICAgQ29kZU9yaWdpbiogY2Fs bGVyID0gZ2V0Q2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHMoKTsKICAgICAgICAgcmV0dXJuIGNhbGxl ciA/IGNhbGxlci0+aW5saW5lQ2FsbEZyYW1lIDogbnVsbHB0cjsKICAgICB9CiAgICAgCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAko cmV2aXNpb24gMTkxOTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29k ZVBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY1Miw3ICs2NTIsNyBAQCBwcml2YXRlOgog CiAgICAgYm9vbCBhbGxJbmxpbmVGcmFtZXNBcmVUYWlsQ2FsbHMoKQogICAgIHsKLSAgICAgICAg cmV0dXJuICFpbmxpbmVDYWxsRnJhbWUoKSB8fCAhaW5saW5lQ2FsbEZyYW1lKCktPmdldENhbGxl clNraXBwaW5nRGVhZEZyYW1lcygpOworICAgICAgICByZXR1cm4gIWlubGluZUNhbGxGcmFtZSgp IHx8ICFpbmxpbmVDYWxsRnJhbWUoKS0+Z2V0Q2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHMoKTsKICAg ICB9CiAKICAgICBDb2RlT3JpZ2luIGN1cnJlbnRDb2RlT3JpZ2luKCkKQEAgLTgxNSw3ICs4MTUs NyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICAgICAgcHJlZGljdGlvbiA9IFNwZWNG dWxsVG9wOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgICAgICAgICAgQ29kZU9yaWdpbiogY29kZU9yaWdpbiA9IGlubGlu ZUNhbGxGcmFtZSgpLT5nZXRDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMoKTsKKyAgICAgICAgICAg ICAgICAgICAgQ29kZU9yaWdpbiogY29kZU9yaWdpbiA9IGlubGluZUNhbGxGcmFtZSgpLT5nZXRD YWxsZXJTa2lwcGluZ1RhaWxDYWxscygpOwogICAgICAgICAgICAgICAgICAgICBpZiAoIWNvZGVP cmlnaW4pIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHByZWRpY3Rpb24gPSBTcGVjRnVsbFRv cDsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdHcmFwaC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdHcmFwaC5jcHAJKHJldmlzaW9uIDE5MTk2MCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHR3JhcGguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAwLDcgKzEwMDAs NyBAQCBib29sIEdyYXBoOjppc0xpdmVJbkJ5dGVjb2RlKFZpcnR1YWxSZWdpCiAgICAgICAgICAg ICAmJiBzdGF0aWNfY2FzdDxzaXplX3Q+KHJlZy50b0FyZ3VtZW50KCkpIDwgaW5saW5lQ2FsbEZy YW1lLT5hcmd1bWVudHMuc2l6ZSgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg IAotICAgICAgICBjb2RlT3JpZ2luUHRyID0gaW5saW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lw cGluZ0RlYWRGcmFtZXMoKTsKKyAgICAgICAgY29kZU9yaWdpblB0ciA9IGlubGluZUNhbGxGcmFt ZS0+Z2V0Q2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHMoKTsKIAogICAgICAgICAvLyBUaGUgZmlyc3Qg aW5saW5lIGNhbGwgZnJhbWUgY291bGQgYmUgYW4gaW5saW5lIHRhaWwgY2FsbAogICAgICAgICBp ZiAoIWNvZGVPcmlnaW5QdHIpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dy YXBoLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5o CShyZXZpc2lvbiAxOTE5NjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBo LmgJKHdvcmtpbmcgY29weSkKQEAgLTc2Miw3ICs3NjIsNyBAQCBwdWJsaWM6CiAgICAgICAgICAg ICBmb3IgKFZpcnR1YWxSZWdpc3RlciByZWcgPSBleGNsdXNpb25TdGFydDsgcmVnIDwgZXhjbHVz aW9uRW5kOyByZWcgKz0gMSkKICAgICAgICAgICAgICAgICBmdW5jdG9yKHJlZyk7CiAgICAgICAg ICAgICAKLSAgICAgICAgICAgIGNvZGVPcmlnaW5QdHIgPSBpbmxpbmVDYWxsRnJhbWUtPmdldENh bGxlclNraXBwaW5nRGVhZEZyYW1lcygpOworICAgICAgICAgICAgY29kZU9yaWdpblB0ciA9IGlu bGluZUNhbGxGcmFtZS0+Z2V0Q2FsbGVyU2tpcHBpbmdUYWlsQ2FsbHMoKTsKIAogICAgICAgICAg ICAgLy8gVGhlIGZpcnN0IGlubGluZSBjYWxsIGZyYW1lIGNvdWxkIGJlIGFuIGlubGluZSB0YWls IGNhbGwKICAgICAgICAgICAgIGlmICghY29kZU9yaWdpblB0cikKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyQ29tbW9uLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxlckNvbW1vbi5jcHAJ KHJldmlzaW9uIDE5MTk2MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhp dENvbXBpbGVyQ29tbW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQzLDExICsxNDMsMTEgQEAg dm9pZCByZWlmeUlubGluZWRDYWxsRnJhbWVzKENDYWxsSGVscGVycwogICAgIGppdC5zdG9yZVB0 cihBc3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoaml0LmJhc2VsaW5lQ29kZUJsb2NrKCkp LCBBc3NlbWJseUhlbHBlcnM6OmFkZHJlc3NGb3IoKFZpcnR1YWxSZWdpc3RlcilKU1N0YWNrOjpD b2RlQmxvY2spKTsKIAogICAgIGNvbnN0IENvZGVPcmlnaW4qIGNvZGVPcmlnaW47Ci0gICAgZm9y IChjb2RlT3JpZ2luID0gJmV4aXQubV9jb2RlT3JpZ2luOyBjb2RlT3JpZ2luICYmIGNvZGVPcmln aW4tPmlubGluZUNhbGxGcmFtZTsgY29kZU9yaWdpbiA9IGNvZGVPcmlnaW4tPmlubGluZUNhbGxG cmFtZS0+Z2V0Q2FsbGVyU2tpcHBpbmdEZWFkRnJhbWVzKCkpIHsKKyAgICBmb3IgKGNvZGVPcmln aW4gPSAmZXhpdC5tX2NvZGVPcmlnaW47IGNvZGVPcmlnaW4gJiYgY29kZU9yaWdpbi0+aW5saW5l Q2FsbEZyYW1lOyBjb2RlT3JpZ2luID0gY29kZU9yaWdpbi0+aW5saW5lQ2FsbEZyYW1lLT5nZXRD YWxsZXJTa2lwcGluZ1RhaWxDYWxscygpKSB7CiAgICAgICAgIElubGluZUNhbGxGcmFtZSogaW5s aW5lQ2FsbEZyYW1lID0gY29kZU9yaWdpbi0+aW5saW5lQ2FsbEZyYW1lOwogICAgICAgICBDb2Rl QmxvY2sqIGJhc2VsaW5lQ29kZUJsb2NrID0gaml0LmJhc2VsaW5lQ29kZUJsb2NrRm9yKCpjb2Rl T3JpZ2luKTsKICAgICAgICAgSW5saW5lQ2FsbEZyYW1lOjpLaW5kIHRydWVDYWxsZXJDYWxsS2lu ZDsKLSAgICAgICAgQ29kZU9yaWdpbiogdHJ1ZUNhbGxlciA9IGlubGluZUNhbGxGcmFtZS0+Z2V0 Q2FsbGVyU2tpcHBpbmdEZWFkRnJhbWVzKCZ0cnVlQ2FsbGVyQ2FsbEtpbmQpOworICAgICAgICBD b2RlT3JpZ2luKiB0cnVlQ2FsbGVyID0gaW5saW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lwcGlu Z1RhaWxDYWxscygmdHJ1ZUNhbGxlckNhbGxLaW5kKTsKICAgICAgICAgR1BSUmVnIGNhbGxlckZy YW1lR1BSID0gR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXI7CiAKICAgICAgICAgaWYgKCF0cnVl Q2FsbGVyKSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWNpc2VMb2Nh bENsb2JiZXJpemUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1ByZWNpc2VMb2NhbENsb2JiZXJpemUuaAkocmV2aXNpb24gMTkxOTYwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVjaXNlTG9jYWxDbG9iYmVyaXplLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE0MCw3ICsxNDAsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIG1fcmVhZChW aXJ0dWFsUmVnaXN0ZXIoaSkpOwogICAgICAgICAKICAgICAgICAgICAgIC8vIFJlYWQgYWxsIG9m IHRoZSBpbmxpbmUgYXJndW1lbnRzIGFuZCBjYWxsIGZyYW1lIGhlYWRlcnMgdGhhdCB3ZSBkaWRu J3QgYWxyZWFkeSBjYXB0dXJlLgotICAgICAgICAgICAgZm9yIChJbmxpbmVDYWxsRnJhbWUqIGlu bGluZUNhbGxGcmFtZSA9IG1fbm9kZS0+b3JpZ2luLnNlbWFudGljLmlubGluZUNhbGxGcmFtZTsg aW5saW5lQ2FsbEZyYW1lOyBpbmxpbmVDYWxsRnJhbWUgPSBpbmxpbmVDYWxsRnJhbWUtPmdldENh bGxlcklubGluZUZyYW1lU2tpcHBpbmdEZWFkRnJhbWVzKCkpIHsKKyAgICAgICAgICAgIGZvciAo SW5saW5lQ2FsbEZyYW1lKiBpbmxpbmVDYWxsRnJhbWUgPSBtX25vZGUtPm9yaWdpbi5zZW1hbnRp Yy5pbmxpbmVDYWxsRnJhbWU7IGlubGluZUNhbGxGcmFtZTsgaW5saW5lQ2FsbEZyYW1lID0gaW5s aW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJJbmxpbmVGcmFtZVNraXBwaW5nVGFpbENhbGxzKCkpIHsK ICAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSBpbmxpbmVDYWxsRnJhbWUtPmFyZ3Vt ZW50cy5zaXplKCk7IGktLSA+IDE7KQogICAgICAgICAgICAgICAgICAgICBtX3JlYWQoVmlydHVh bFJlZ2lzdGVyKGlubGluZUNhbGxGcmFtZS0+c3RhY2tPZmZzZXQgKyB2aXJ0dWFsUmVnaXN0ZXJG b3JBcmd1bWVudChpKS5vZmZzZXQoKSkpOwogICAgICAgICAgICAgICAgIGlmIChpbmxpbmVDYWxs RnJhbWUtPmlzQ2xvc3VyZUNhbGwpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHJldmlzaW9uIDE5MTk2MCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTg1NSwxMCArODU1LDEwIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmVt aXRDYWxsKE5vZGUqIG5vZGUKICAgICBKSVRDb21waWxlcjo6SnVtcExpc3Qgc2xvd1BhdGg7CiAK ICAgICBDb2RlT3JpZ2luIHN0YXRpY09yaWdpbiA9IG5vZGUtPm9yaWdpbi5zZW1hbnRpYzsKLSAg ICBBU1NFUlQoIWlzVGFpbCB8fCAhc3RhdGljT3JpZ2luLmlubGluZUNhbGxGcmFtZSB8fCAhc3Rh dGljT3JpZ2luLmlubGluZUNhbGxGcmFtZS0+Z2V0Q2FsbGVyU2tpcHBpbmdEZWFkRnJhbWVzKCkp OwotICAgIEFTU0VSVCghaXNFbXVsYXRlZFRhaWwgfHwgKHN0YXRpY09yaWdpbi5pbmxpbmVDYWxs RnJhbWUgJiYgc3RhdGljT3JpZ2luLmlubGluZUNhbGxGcmFtZS0+Z2V0Q2FsbGVyU2tpcHBpbmdE ZWFkRnJhbWVzKCkpKTsKKyAgICBBU1NFUlQoIWlzVGFpbCB8fCAhc3RhdGljT3JpZ2luLmlubGlu ZUNhbGxGcmFtZSB8fCAhc3RhdGljT3JpZ2luLmlubGluZUNhbGxGcmFtZS0+Z2V0Q2FsbGVyU2tp cHBpbmdUYWlsQ2FsbHMoKSk7CisgICAgQVNTRVJUKCFpc0VtdWxhdGVkVGFpbCB8fCAoc3RhdGlj T3JpZ2luLmlubGluZUNhbGxGcmFtZSAmJiBzdGF0aWNPcmlnaW4uaW5saW5lQ2FsbEZyYW1lLT5n ZXRDYWxsZXJTa2lwcGluZ1RhaWxDYWxscygpKSk7CiAgICAgQ29kZU9yaWdpbiBkeW5hbWljT3Jp Z2luID0KLSAgICAgICAgaXNFbXVsYXRlZFRhaWwgPyAqc3RhdGljT3JpZ2luLmlubGluZUNhbGxG cmFtZS0+Z2V0Q2FsbGVyU2tpcHBpbmdEZWFkRnJhbWVzKCkgOiBzdGF0aWNPcmlnaW47CisgICAg ICAgIGlzRW11bGF0ZWRUYWlsID8gKnN0YXRpY09yaWdpbi5pbmxpbmVDYWxsRnJhbWUtPmdldENh bGxlclNraXBwaW5nVGFpbENhbGxzKCkgOiBzdGF0aWNPcmlnaW47CiAgICAgQ2FsbFNpdGVJbmRl eCBjYWxsU2l0ZSA9IG1faml0LnJlY29yZENhbGxTaXRlQW5kR2VuZXJhdGVFeGNlcHRpb25IYW5k bGluZ09TUkV4aXRJZk5lZWRlZChkeW5hbWljT3JpZ2luLCBtX3N0cmVhbS0+c2l6ZSgpKTsKICAg ICBtX2ppdC5lbWl0U3RvcmVDYWxsU2l0ZUluZGV4KGNhbGxTaXRlKTsKICAgICAKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAko cmV2aXNpb24gMTkxOTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxh dGl2ZUpJVDY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODIwLDEwICs4MjAsMTAgQEAgdm9pZCBT cGVjdWxhdGl2ZUpJVDo6ZW1pdENhbGwoTm9kZSogbm9kZQogICAgIH0KIAogICAgIENvZGVPcmln aW4gc3RhdGljT3JpZ2luID0gbm9kZS0+b3JpZ2luLnNlbWFudGljOwotICAgIEFTU0VSVCghaXNU YWlsIHx8ICFzdGF0aWNPcmlnaW4uaW5saW5lQ2FsbEZyYW1lIHx8ICFzdGF0aWNPcmlnaW4uaW5s aW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMoKSk7Ci0gICAgQVNTRVJU KCFpc0VtdWxhdGVkVGFpbCB8fCAoc3RhdGljT3JpZ2luLmlubGluZUNhbGxGcmFtZSAmJiBzdGF0 aWNPcmlnaW4uaW5saW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMoKSkp OworICAgIEFTU0VSVCghaXNUYWlsIHx8ICFzdGF0aWNPcmlnaW4uaW5saW5lQ2FsbEZyYW1lIHx8 ICFzdGF0aWNPcmlnaW4uaW5saW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lwcGluZ1RhaWxDYWxs cygpKTsKKyAgICBBU1NFUlQoIWlzRW11bGF0ZWRUYWlsIHx8IChzdGF0aWNPcmlnaW4uaW5saW5l Q2FsbEZyYW1lICYmIHN0YXRpY09yaWdpbi5pbmxpbmVDYWxsRnJhbWUtPmdldENhbGxlclNraXBw aW5nVGFpbENhbGxzKCkpKTsKICAgICBDb2RlT3JpZ2luIGR5bmFtaWNPcmlnaW4gPQotICAgIGlz RW11bGF0ZWRUYWlsID8gKnN0YXRpY09yaWdpbi5pbmxpbmVDYWxsRnJhbWUtPmdldENhbGxlclNr aXBwaW5nRGVhZEZyYW1lcygpIDogc3RhdGljT3JpZ2luOworICAgIGlzRW11bGF0ZWRUYWlsID8g KnN0YXRpY09yaWdpbi5pbmxpbmVDYWxsRnJhbWUtPmdldENhbGxlclNraXBwaW5nVGFpbENhbGxz KCkgOiBzdGF0aWNPcmlnaW47CiAKICAgICBDYWxsU2l0ZUluZGV4IGNhbGxTaXRlID0gbV9qaXQu cmVjb3JkQ2FsbFNpdGVBbmRHZW5lcmF0ZUV4Y2VwdGlvbkhhbmRsaW5nT1NSRXhpdElmTmVlZGVk KGR5bmFtaWNPcmlnaW4sIG1fc3RyZWFtLT5zaXplKCkpOwogICAgIG1faml0LmVtaXRTdG9yZUNh bGxTaXRlSW5kZXgoY2FsbFNpdGUpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExMb3dlckRGR1RvTExWTS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAJKHJldmlzaW9uIDE5MTk2MCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04NzQ0LDcgKzg3NDQsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgLy8gdG8gYmF6IGFuZCBi YXogaXMgaW5saW5lZCBpbiBiYXIuIEFuZCB0aGVuIGJheiBtYWtlcyBhIHRhaWwtY2FsbCB0byBq YXosCiAgICAgICAgICAgICAvLyBhbmQgamF6IGlzIGlubGluZWQgaW4gYmF6LiBXZSB3YW50IHRo ZSBjYWxsZnJhbWUgZm9yIGpheiB0byBhcHBlYXIgdG8gCiAgICAgICAgICAgICAvLyBoYXZlIGNh bGxlciBiZSBiYXIuCi0gICAgICAgICAgICBjb2RlT3JpZ2luID0gKmNvZGVPcmlnaW4uaW5saW5l Q2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lwcGluZ0RlYWRGcmFtZXMoKTsKKyAgICAgICAgICAgIGNv ZGVPcmlnaW4gPSAqY29kZU9yaWdpbi5pbmxpbmVDYWxsRnJhbWUtPmdldENhbGxlclNraXBwaW5n VGFpbENhbGxzKCk7CiAgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gY29kZU9yaWdpbjsKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9TdGFja1Zpc2l0b3IuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9TdGFja1Zpc2l0 b3IuY3BwCShyZXZpc2lvbiAxOTE5NjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJw cmV0ZXIvU3RhY2tWaXNpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTksNyArNTksNyBAQCB2 b2lkIFN0YWNrVmlzaXRvcjo6Z290b05leHRGcmFtZSgpCiAjaWYgRU5BQkxFKERGR19KSVQpCiAg ICAgaWYgKG1fZnJhbWUuaXNJbmxpbmVkRnJhbWUoKSkgewogICAgICAgICBJbmxpbmVDYWxsRnJh bWUqIGlubGluZUNhbGxGcmFtZSA9IG1fZnJhbWUuaW5saW5lQ2FsbEZyYW1lKCk7Ci0gICAgICAg IENvZGVPcmlnaW4qIGNhbGxlckNvZGVPcmlnaW4gPSBpbmxpbmVDYWxsRnJhbWUtPmdldENhbGxl clNraXBwaW5nRGVhZEZyYW1lcygpOworICAgICAgICBDb2RlT3JpZ2luKiBjYWxsZXJDb2RlT3Jp Z2luID0gaW5saW5lQ2FsbEZyYW1lLT5nZXRDYWxsZXJTa2lwcGluZ1RhaWxDYWxscygpOwogICAg ICAgICBpZiAoIWNhbGxlckNvZGVPcmlnaW4pIHsKICAgICAgICAgICAgIHdoaWxlIChpbmxpbmVD YWxsRnJhbWUpIHsKICAgICAgICAgICAgICAgICByZWFkSW5saW5lZEZyYW1lKG1fZnJhbWUuY2Fs bEZyYW1lKCksICZpbmxpbmVDYWxsRnJhbWUtPmRpcmVjdENhbGxlcik7Cg==