190740 2018-10-18 16:40:31 -0700 vmCall should check if we may exit before emitting an OSR exit due to exceptions 2018-10-19 13:04:04 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue ews-watchlist fpizlo ggaren gskachkov keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1470735 0 saam 2018-10-18 16:40:31 -0700 Otherwise, we may be in a state where we don't have a valid exit state. So if we exitted at that point, we wouldn't know how to recover certain values. validateFTLOSRExitLiveness catches these issues. The solution is to not emit an exit due to an exception being thrown if the node we're compiling isn't allowed to throw. This should also be a tiny bit of a speedup/code size reduction. 1470736 1 saam 2018-10-18 16:41:11 -0700 <rdar://problem/45220139> 1470739 2 352746 saam 2018-10-18 16:51:15 -0700 Created attachment 352746 patch 1470741 3 ews-watchlist 2018-10-18 16:52:51 -0700 Attachment 352746 did not pass style-queue: ERROR: Source/JavaScriptCore/ChangeLog:13: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1470742 4 352747 saam 2018-10-18 16:54:38 -0700 Created attachment 352747 patch 1470748 5 352747 mark.lam 2018-10-18 17:03:08 -0700 Comment on attachment 352747 patch View in context: https://bugs.webkit.org/attachment.cgi?id=352747&action=review r=me > Source/JavaScriptCore/ChangeLog:21 > + emitting an exception check. A node node being able to exit implies I think you meant to say "A node not being able" > Source/JavaScriptCore/ChangeLog:22 > + that it can't exit for exceptions (hence, it can't throw an exception). I suggest saying "it also can't". 1470948 6 352814 saam 2018-10-19 12:15:49 -0700 Created attachment 352814 patch for landing 1470965 7 352814 commit-queue 2018-10-19 13:04:02 -0700 Comment on attachment 352814 patch for landing Clearing flags on attachment: 352814 Committed r237297: <https://trac.webkit.org/changeset/237297> 1470966 8 commit-queue 2018-10-19 13:04:04 -0700 All reviewed patches have been landed. Closing bug. 352746 2018-10-18 16:51:15 -0700 2018-10-18 16:54:38 -0700 patch c-backup.diff text/plain 4315 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzcyNzQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE4LTEwLTE4ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIHZtQ2FsbCBzaG91bGQgY2hlY2sgaWYgd2UgZXhpdCBiZWZvcmUgZW1p dHRpbmcgYW4gT1NSIGV4aXQgZHVlIHRvIGV4Y2VwdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDc0MAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDUyMjAxMzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBzdHJlc3MvZG9udC1lbWl0LW9zci1leGl0cy1mb3ItZXZlcnktY2FsbC1mdGwuanM6 IEFkZGVkLgorICAgICAgICAoZm9vKToKKwogMjAxOC0xMC0xOCAgWXVzdWtlIFN1enVraSAgPHl1 c3VrZXN1enVraUBzbG93c3RhcnQub3JnPgogCiAgICAgICAgIFtKU0NdIEpTQyBzaG91bGQgaGF2 ZSAicGFyc2VGdW5jdGlvbiIgdG8gb3B0aW1pemUgRnVuY3Rpb24gY29uc3RydWN0b3IKSW5kZXg6 IEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1pdC1vc3ItZXhpdHMtZm9yLWV2ZXJ5LWNhbGwtZnRsLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1pdC1vc3ItZXhpdHMtZm9yLWV2 ZXJ5LWNhbGwtZnRsLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1p dC1vc3ItZXhpdHMtZm9yLWV2ZXJ5LWNhbGwtZnRsLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAg KzEsMTUgQEAKKy8vQCBydW5EZWZhdWx0KCItLXVzZUNvbmN1cnJlbnRKSVQ9MCIsICItLXZhbGlk YXRlRlRMT1NSRXhpdExpdmVuZXNzPTEiKQorCitmdW5jdGlvbiBmb28obywgcCkgeworICAgIHAg PSBudWxsOworICAgIHRyeSB7CisgICAgICAgIG8uZiA9IG51bGw7CisgICAgICAgIHAgPSBudWxs OworICAgIH0gY2F0Y2ggKGUpIHsKKyAgICB9Cit9Citub0lubGluZShmb28pOworCitmb3IgKHZh ciBpID0gMDsgaSA8IDEwMDAwMDA7ICsraSkgeworICAgIGZvbyh7fSk7Cit9CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNzI2MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyOSBAQAorMjAxOC0xMC0x OCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICB2bUNhbGwgc2hv dWxkIGNoZWNrIGlmIHdlIGV4aXQgYmVmb3JlIGVtaXR0aW5nIGFuIE9TUiBleGl0IGR1ZSB0byBl eGNlcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTA3NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MjIwMTM5PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBidWcgd2Ugd2VyZSBzZWVp bmcgaXMgdGhlIE1vdkhpbnQgcmVtb3ZhbCBwaGFzZSB3b3VsZAorICAgICAgICBlbGltaW5hdGUg YSBzdXBlcmZsdW91cyBNb3ZIaW50LiBUaGlzIGxlZnQgYSBjZXJ0YWluIHJhbmdlCisgICAgICAg IG9mIG5vZGVzIGluIGEgc3RhdGUgd2hlcmUgdGhleSB3b3VsZCBub3QgYmUgYWJsZSB0byByZWNv bnN0cnVjdAorICAgICAgICB2YWx1ZXMgZm9yIGFuIE9TUiBleGl0LiBUaGlzIGlzIE9LLCBzaW5j ZSB0aGlzIHBoYXNlIHByb3ZlZCB0aG9zZQorICAgICAgICBub2RlcyBkb24ndAlleGl0LiBIb3dl dmVyLCBzb21lIG9mIHRoZXNlIG5vZGVzIG1heSB1c2UgdGhlIHZtQ2FsbAorICAgICAgICBjb25z dHJ1Y3QgaW4gRlRMTG93ZXIuIHZtQ2FsbCB1c2VkIHRvIHVuY29uZGl0aW9uYWxseSBlbWl0IGFu CisgICAgICAgIGV4Y2VwdGlvbiBjaGVjayBhZnRlciBlYWNoIGNhbGwuIEhvd2V2ZXIsIGlmIHN1 Y2ggYSBjYWxsIGhhcHBlbnMKKyAgICAgICAgaW4gdGhlIHJhbmdlIG9mIG5vZGVzIHdoZXJlIHdl IGNhbid0IGV4aXQsIHdlIHdvdWxkIGVuZCB1cCBnZW5lcmF0aW5nCisgICAgICAgIGFuIGludmFs aWQgZXhpdCAoYW5kIHJ1bm5pbmcgd2l0aCB2YWxpZGF0ZUZUTE9TUkV4aXRMaXZlbmVzcyBmbGFn CisgICAgICAgIHdvdWxkIGZpbmQgdGhpcyBpc3N1ZSkuCisgICAgICAgIAorICAgICAgICBUaGlz IHBhdGNoIG1ha2VzIHZtQ2FsbCBjaGVjayB0byBzZWUgaWYgdGhlIG5vZGUgY2FuIGV4aXQgYmVm b3JlCisgICAgICAgIGVtaXR0aW5nIGFuIGV4Y2VwdGlvbiBjaGVjay4gQSBub2RlIG5vZGUgYmVp bmcgYWJsZSB0byBleGl0IGltcGxpZXMKKyAgICAgICAgdGhhdCBpdCBjYW4ndCBleGl0IGZvciBl eGNlcHRpb25zIChoZW5jZSwgaXQgY2FuJ3QgdGhyb3cgYW4gZXhjZXB0aW9uKS4KKworICAgICAg ICAqIGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93 ZXJERkdUb0IzOjp2bUNhbGwpOgorCiAyMDE4LTEwLTE4ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5r aXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBkZWxldGUgZXhwcmVzc2lvbiBzaG91bGQgbm90 IHRocm93IHdpdGhvdXQgYSByZWZlcmVuY2UKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9m dGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlzaW9uIDIzNzI2MikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDUsNiArNDUsNyBAQAogI2luY2x1ZGUgIkRGR0NhcGFiaWxpdGllcy5oIgogI2luY2x1ZGUgIkRG R0RvbWluYXRvcnMuaCIKICNpbmNsdWRlICJERkdJblBsYWNlQWJzdHJhY3RTdGF0ZS5oIgorI2lu Y2x1ZGUgIkRGR01heUV4aXQuaCIKICNpbmNsdWRlICJERkdPU1JBdmFpbGFiaWxpdHlBbmFseXNp c1BoYXNlLmgiCiAjaW5jbHVkZSAiREZHT1NSRXhpdEZ1enouaCIKICNpbmNsdWRlICJEaXJlY3RB cmd1bWVudHMuaCIKQEAgLTE2MzExLDcgKzE2MzEyLDI3IEBAIHByaXZhdGU6CiAgICAgewogICAg ICAgICBjYWxsUHJlZmxpZ2h0KCk7CiAgICAgICAgIExWYWx1ZSByZXN1bHQgPSBtX291dC5jYWxs KHR5cGUsIGZ1bmN0aW9uLCBzdGQ6OmZvcndhcmQ8QXJncz4oYXJncykuLi4pOwotICAgICAgICBj YWxsQ2hlY2soKTsKKyAgICAgICAgaWYgKG1heUV4aXQobV9ncmFwaCwgbV9ub2RlKSkKKyAgICAg ICAgICAgIGNhbGxDaGVjaygpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIC8vIFdlIGNh bid0IGV4aXQgZHVlIHRvIGFuIGV4Y2VwdGlvbiwgc28gd2UgYWxzbyBjYW4ndCB0aHJvdyBhbiBl eGNlcHRpb24uCisjaWZuZGVmIE5ERUJVRworICAgICAgICAgICAgTEJhc2ljQmxvY2sgY3Jhc2gg PSBtX291dC5uZXdCbG9jaygpOworICAgICAgICAgICAgTEJhc2ljQmxvY2sgY29udGludWF0aW9u ID0gbV9vdXQubmV3QmxvY2soKTsKKworICAgICAgICAgICAgTFZhbHVlIGV4Y2VwdGlvbiA9IG1f b3V0LmxvYWQ2NChtX291dC5hYnNvbHV0ZSh2bSgpLmFkZHJlc3NPZkV4Y2VwdGlvbigpKSk7Cisg ICAgICAgICAgICBMVmFsdWUgaGFkRXhjZXB0aW9uID0gbV9vdXQubm90WmVybzY0KGV4Y2VwdGlv bik7CisKKyAgICAgICAgICAgIG1fb3V0LmJyYW5jaCgKKyAgICAgICAgICAgICAgICBoYWRFeGNl cHRpb24sIHJhcmVseShjcmFzaCksIHVzdWFsbHkoY29udGludWF0aW9uKSk7CisKKyAgICAgICAg ICAgIExCYXNpY0Jsb2NrIGxhc3ROZXh0ID0gbV9vdXQuYXBwZW5kVG8oY3Jhc2gsIGNvbnRpbnVh dGlvbik7CisgICAgICAgICAgICBtX291dC51bnJlYWNoYWJsZSgpOworCisgICAgICAgICAgICBt X291dC5hcHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKKyNlbmRpZgorCisgICAgICAg IH0KICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCg== 352747 2018-10-18 16:54:38 -0700 2018-10-19 12:15:49 -0700 patch c-backup.diff text/plain 4313 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzcyNzQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE4LTEwLTE4ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIHZtQ2FsbCBzaG91bGQgY2hlY2sgaWYgd2UgZXhpdCBiZWZvcmUgZW1p dHRpbmcgYW4gT1NSIGV4aXQgZHVlIHRvIGV4Y2VwdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDc0MAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDUyMjAxMzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBzdHJlc3MvZG9udC1lbWl0LW9zci1leGl0cy1mb3ItZXZlcnktY2FsbC1mdGwuanM6 IEFkZGVkLgorICAgICAgICAoZm9vKToKKwogMjAxOC0xMC0xOCAgWXVzdWtlIFN1enVraSAgPHl1 c3VrZXN1enVraUBzbG93c3RhcnQub3JnPgogCiAgICAgICAgIFtKU0NdIEpTQyBzaG91bGQgaGF2 ZSAicGFyc2VGdW5jdGlvbiIgdG8gb3B0aW1pemUgRnVuY3Rpb24gY29uc3RydWN0b3IKSW5kZXg6 IEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1pdC1vc3ItZXhpdHMtZm9yLWV2ZXJ5LWNhbGwtZnRsLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1pdC1vc3ItZXhpdHMtZm9yLWV2 ZXJ5LWNhbGwtZnRsLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1p dC1vc3ItZXhpdHMtZm9yLWV2ZXJ5LWNhbGwtZnRsLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAg KzEsMTUgQEAKKy8vQCBydW5EZWZhdWx0KCItLXVzZUNvbmN1cnJlbnRKSVQ9MCIsICItLXZhbGlk YXRlRlRMT1NSRXhpdExpdmVuZXNzPTEiKQorCitmdW5jdGlvbiBmb28obywgcCkgeworICAgIHAg PSBudWxsOworICAgIHRyeSB7CisgICAgICAgIG8uZiA9IG51bGw7CisgICAgICAgIHAgPSBudWxs OworICAgIH0gY2F0Y2ggKGUpIHsKKyAgICB9Cit9Citub0lubGluZShmb28pOworCitmb3IgKHZh ciBpID0gMDsgaSA8IDEwMDAwMDA7ICsraSkgeworICAgIGZvbyh7fSk7Cit9CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNzI2MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyOSBAQAorMjAxOC0xMC0x OCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICB2bUNhbGwgc2hv dWxkIGNoZWNrIGlmIHdlIGV4aXQgYmVmb3JlIGVtaXR0aW5nIGFuIE9TUiBleGl0IGR1ZSB0byBl eGNlcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTA3NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MjIwMTM5PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBidWcgd2Ugd2VyZSBzZWVp bmcgaXMgdGhlIE1vdkhpbnQgcmVtb3ZhbCBwaGFzZSB3b3VsZAorICAgICAgICBlbGltaW5hdGUg YSBzdXBlcmZsdW91cyBNb3ZIaW50LiBUaGlzIGxlZnQgYSBjZXJ0YWluIHJhbmdlCisgICAgICAg IG9mIG5vZGVzIGluIGEgc3RhdGUgd2hlcmUgdGhleSB3b3VsZCBub3QgYmUgYWJsZSB0byByZWNv bnN0cnVjdAorICAgICAgICB2YWx1ZXMgZm9yIGFuIE9TUiBleGl0LiBUaGlzIGlzIE9LLCBzaW5j ZSB0aGlzIHBoYXNlIHByb3ZlZCB0aG9zZQorICAgICAgICBub2RlcyBkb24ndCBleGl0LiBIb3dl dmVyLCBzb21lIG9mIHRoZXNlIG5vZGVzIG1heSB1c2UgdGhlIHZtQ2FsbAorICAgICAgICBjb25z dHJ1Y3QgaW4gRlRMTG93ZXIuIHZtQ2FsbCB1c2VkIHRvIHVuY29uZGl0aW9uYWxseSBlbWl0IGFu CisgICAgICAgIGV4Y2VwdGlvbiBjaGVjayBhZnRlciBlYWNoIGNhbGwuIEhvd2V2ZXIsIGlmIHN1 Y2ggYSBjYWxsIGhhcHBlbnMKKyAgICAgICAgaW4gdGhlIHJhbmdlIG9mIG5vZGVzIHdoZXJlIHdl IGNhbid0IGV4aXQsIHdlIHdvdWxkIGVuZCB1cCBnZW5lcmF0aW5nCisgICAgICAgIGFuIGludmFs aWQgZXhpdCAoYW5kIHJ1bm5pbmcgd2l0aCB2YWxpZGF0ZUZUTE9TUkV4aXRMaXZlbmVzcyBmbGFn CisgICAgICAgIHdvdWxkIGZpbmQgdGhpcyBpc3N1ZSkuCisgICAgICAgIAorICAgICAgICBUaGlz IHBhdGNoIG1ha2VzIHZtQ2FsbCBjaGVjayB0byBzZWUgaWYgdGhlIG5vZGUgY2FuIGV4aXQgYmVm b3JlCisgICAgICAgIGVtaXR0aW5nIGFuIGV4Y2VwdGlvbiBjaGVjay4gQSBub2RlIG5vZGUgYmVp bmcgYWJsZSB0byBleGl0IGltcGxpZXMKKyAgICAgICAgdGhhdCBpdCBjYW4ndCBleGl0IGZvciBl eGNlcHRpb25zIChoZW5jZSwgaXQgY2FuJ3QgdGhyb3cgYW4gZXhjZXB0aW9uKS4KKworICAgICAg ICAqIGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93 ZXJERkdUb0IzOjp2bUNhbGwpOgorCiAyMDE4LTEwLTE4ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5r aXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBkZWxldGUgZXhwcmVzc2lvbiBzaG91bGQgbm90 IHRocm93IHdpdGhvdXQgYSByZWZlcmVuY2UKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9m dGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlzaW9uIDIzNzI2MikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDUsNiArNDUsNyBAQAogI2luY2x1ZGUgIkRGR0NhcGFiaWxpdGllcy5oIgogI2luY2x1ZGUgIkRG R0RvbWluYXRvcnMuaCIKICNpbmNsdWRlICJERkdJblBsYWNlQWJzdHJhY3RTdGF0ZS5oIgorI2lu Y2x1ZGUgIkRGR01heUV4aXQuaCIKICNpbmNsdWRlICJERkdPU1JBdmFpbGFiaWxpdHlBbmFseXNp c1BoYXNlLmgiCiAjaW5jbHVkZSAiREZHT1NSRXhpdEZ1enouaCIKICNpbmNsdWRlICJEaXJlY3RB cmd1bWVudHMuaCIKQEAgLTE2MzExLDcgKzE2MzEyLDI2IEBAIHByaXZhdGU6CiAgICAgewogICAg ICAgICBjYWxsUHJlZmxpZ2h0KCk7CiAgICAgICAgIExWYWx1ZSByZXN1bHQgPSBtX291dC5jYWxs KHR5cGUsIGZ1bmN0aW9uLCBzdGQ6OmZvcndhcmQ8QXJncz4oYXJncykuLi4pOwotICAgICAgICBj YWxsQ2hlY2soKTsKKyAgICAgICAgaWYgKG1heUV4aXQobV9ncmFwaCwgbV9ub2RlKSkKKyAgICAg ICAgICAgIGNhbGxDaGVjaygpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIC8vIFdlIGNh bid0IGV4aXQgZHVlIHRvIGFuIGV4Y2VwdGlvbiwgc28gd2UgYWxzbyBjYW4ndCB0aHJvdyBhbiBl eGNlcHRpb24uCisjaWZuZGVmIE5ERUJVRworICAgICAgICAgICAgTEJhc2ljQmxvY2sgY3Jhc2gg PSBtX291dC5uZXdCbG9jaygpOworICAgICAgICAgICAgTEJhc2ljQmxvY2sgY29udGludWF0aW9u ID0gbV9vdXQubmV3QmxvY2soKTsKKworICAgICAgICAgICAgTFZhbHVlIGV4Y2VwdGlvbiA9IG1f b3V0LmxvYWQ2NChtX291dC5hYnNvbHV0ZSh2bSgpLmFkZHJlc3NPZkV4Y2VwdGlvbigpKSk7Cisg ICAgICAgICAgICBMVmFsdWUgaGFkRXhjZXB0aW9uID0gbV9vdXQubm90WmVybzY0KGV4Y2VwdGlv bik7CisKKyAgICAgICAgICAgIG1fb3V0LmJyYW5jaCgKKyAgICAgICAgICAgICAgICBoYWRFeGNl cHRpb24sIHJhcmVseShjcmFzaCksIHVzdWFsbHkoY29udGludWF0aW9uKSk7CisKKyAgICAgICAg ICAgIExCYXNpY0Jsb2NrIGxhc3ROZXh0ID0gbV9vdXQuYXBwZW5kVG8oY3Jhc2gsIGNvbnRpbnVh dGlvbik7CisgICAgICAgICAgICBtX291dC51bnJlYWNoYWJsZSgpOworCisgICAgICAgICAgICBt X291dC5hcHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKKyNlbmRpZgorICAgICAgICB9 CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogICAgIAo= 352814 2018-10-19 12:15:49 -0700 2018-10-19 13:04:02 -0700 patch for landing c-backup.diff text/plain 4327 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzcyNzQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE4LTEwLTE4ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIHZtQ2FsbCBzaG91bGQgY2hlY2sgaWYgd2UgZXhpdCBiZWZvcmUgZW1p dHRpbmcgYW4gT1NSIGV4aXQgZHVlIHRvIGV4Y2VwdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDc0MAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDUyMjAxMzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBMYW0uCisKKyAgICAgICAg KiBzdHJlc3MvZG9udC1lbWl0LW9zci1leGl0cy1mb3ItZXZlcnktY2FsbC1mdGwuanM6IEFkZGVk LgorICAgICAgICAoZm9vKToKKwogMjAxOC0xMC0xOCAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1 enVraUBzbG93c3RhcnQub3JnPgogCiAgICAgICAgIFtKU0NdIEpTQyBzaG91bGQgaGF2ZSAicGFy c2VGdW5jdGlvbiIgdG8gb3B0aW1pemUgRnVuY3Rpb24gY29uc3RydWN0b3IKSW5kZXg6IEpTVGVz dHMvc3RyZXNzL2RvbnQtZW1pdC1vc3ItZXhpdHMtZm9yLWV2ZXJ5LWNhbGwtZnRsLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1pdC1vc3ItZXhpdHMtZm9yLWV2ZXJ5LWNh bGwtZnRsLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2RvbnQtZW1pdC1vc3It ZXhpdHMtZm9yLWV2ZXJ5LWNhbGwtZnRsLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTUg QEAKKy8vQCBydW5EZWZhdWx0KCItLXVzZUNvbmN1cnJlbnRKSVQ9MCIsICItLXZhbGlkYXRlRlRM T1NSRXhpdExpdmVuZXNzPTEiKQorCitmdW5jdGlvbiBmb28obywgcCkgeworICAgIHAgPSBudWxs OworICAgIHRyeSB7CisgICAgICAgIG8uZiA9IG51bGw7CisgICAgICAgIHAgPSBudWxsOworICAg IH0gY2F0Y2ggKGUpIHsKKyAgICB9Cit9Citub0lubGluZShmb28pOworCitmb3IgKHZhciBpID0g MDsgaSA8IDEwMDAwMDA7ICsraSkgeworICAgIGZvbyh7fSk7Cit9CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNzI2MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzMCBAQAorMjAxOC0xMC0xOCAgU2Fh bSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICB2bUNhbGwgc2hvdWxkIGNo ZWNrIGlmIHdlIGV4aXQgYmVmb3JlIGVtaXR0aW5nIGFuIE9TUiBleGl0IGR1ZSB0byBleGNlcHRp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA3 NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MjIwMTM5PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE1hcmsgTGFtLgorCisgICAgICAgIFRoZSBidWcgd2Ugd2VyZSBzZWVpbmcgaXMgdGhlIE1v dkhpbnQgcmVtb3ZhbCBwaGFzZSB3b3VsZAorICAgICAgICBlbGltaW5hdGUgYSBzdXBlcmZsdW91 cyBNb3ZIaW50LiBUaGlzIGxlZnQgYSBjZXJ0YWluIHJhbmdlCisgICAgICAgIG9mIG5vZGVzIGlu IGEgc3RhdGUgd2hlcmUgdGhleSB3b3VsZCBub3QgYmUgYWJsZSB0byByZWNvbnN0cnVjdAorICAg ICAgICB2YWx1ZXMgZm9yIGFuIE9TUiBleGl0LiBUaGlzIGlzIE9LLCBzaW5jZSB0aGlzIHBoYXNl IHByb3ZlZCB0aG9zZQorICAgICAgICBub2RlcyBkb24ndCBleGl0LiBIb3dldmVyLCBzb21lIG9m IHRoZXNlIG5vZGVzIG1heSB1c2UgdGhlIHZtQ2FsbAorICAgICAgICBjb25zdHJ1Y3QgaW4gRlRM TG93ZXIuIHZtQ2FsbCB1c2VkIHRvIHVuY29uZGl0aW9uYWxseSBlbWl0IGFuCisgICAgICAgIGV4 Y2VwdGlvbiBjaGVjayBhZnRlciBlYWNoIGNhbGwuIEhvd2V2ZXIsIGlmIHN1Y2ggYSBjYWxsIGhh cHBlbnMKKyAgICAgICAgaW4gdGhlIHJhbmdlIG9mIG5vZGVzIHdoZXJlIHdlIGNhbid0IGV4aXQs IHdlIHdvdWxkIGVuZCB1cCBnZW5lcmF0aW5nCisgICAgICAgIGFuIGludmFsaWQgZXhpdCAoYW5k IHJ1bm5pbmcgd2l0aCB2YWxpZGF0ZUZUTE9TUkV4aXRMaXZlbmVzcyBmbGFnCisgICAgICAgIHdv dWxkIGZpbmQgdGhpcyBpc3N1ZSkuCisgICAgICAgIAorICAgICAgICBUaGlzIHBhdGNoIG1ha2Vz IHZtQ2FsbCBjaGVjayB0byBzZWUgaWYgdGhlIG5vZGUgY2FuIGV4aXQgYmVmb3JlCisgICAgICAg IGVtaXR0aW5nIGFuIGV4Y2VwdGlvbiBjaGVjay4gQSBub2RlIG5vdCBiZWluZyBhYmxlIHRvIGV4 aXQgaW1wbGllcworICAgICAgICB0aGF0IGl0IGNhbid0IGV4aXQgZm9yIGV4Y2VwdGlvbnMsIHRo ZXJlZm9yZSwgYnkgZGVmaW5pdGlvbiwgaXQgY2FuJ3QKKyAgICAgICAgdGhyb3cgYW4gZXhjZXB0 aW9uLgorCisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OnZtQ2FsbCk6CisKIDIwMTgtMTAtMTggIFJvc3MgS2ly c2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIGRlbGV0ZSBleHByZXNz aW9uIHNob3VsZCBub3QgdGhyb3cgd2l0aG91dCBhIHJlZmVyZW5jZQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkocmV2aXNpb24gMjM3MjYy KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiREZHQ2FwYWJpbGl0aWVzLmgi CiAjaW5jbHVkZSAiREZHRG9taW5hdG9ycy5oIgogI2luY2x1ZGUgIkRGR0luUGxhY2VBYnN0cmFj dFN0YXRlLmgiCisjaW5jbHVkZSAiREZHTWF5RXhpdC5oIgogI2luY2x1ZGUgIkRGR09TUkF2YWls YWJpbGl0eUFuYWx5c2lzUGhhc2UuaCIKICNpbmNsdWRlICJERkdPU1JFeGl0RnV6ei5oIgogI2lu Y2x1ZGUgIkRpcmVjdEFyZ3VtZW50cy5oIgpAQCAtMTYzMTEsNyArMTYzMTIsMjYgQEAgcHJpdmF0 ZToKICAgICB7CiAgICAgICAgIGNhbGxQcmVmbGlnaHQoKTsKICAgICAgICAgTFZhbHVlIHJlc3Vs dCA9IG1fb3V0LmNhbGwodHlwZSwgZnVuY3Rpb24sIHN0ZDo6Zm9yd2FyZDxBcmdzPihhcmdzKS4u Lik7Ci0gICAgICAgIGNhbGxDaGVjaygpOworICAgICAgICBpZiAobWF5RXhpdChtX2dyYXBoLCBt X25vZGUpKQorICAgICAgICAgICAgY2FsbENoZWNrKCk7CisgICAgICAgIGVsc2UgeworICAgICAg ICAgICAgLy8gV2UgY2FuJ3QgZXhpdCBkdWUgdG8gYW4gZXhjZXB0aW9uLCBzbyB3ZSBhbHNvIGNh bid0IHRocm93IGFuIGV4Y2VwdGlvbi4KKyNpZm5kZWYgTkRFQlVHCisgICAgICAgICAgICBMQmFz aWNCbG9jayBjcmFzaCA9IG1fb3V0Lm5ld0Jsb2NrKCk7CisgICAgICAgICAgICBMQmFzaWNCbG9j ayBjb250aW51YXRpb24gPSBtX291dC5uZXdCbG9jaygpOworCisgICAgICAgICAgICBMVmFsdWUg ZXhjZXB0aW9uID0gbV9vdXQubG9hZDY0KG1fb3V0LmFic29sdXRlKHZtKCkuYWRkcmVzc09mRXhj ZXB0aW9uKCkpKTsKKyAgICAgICAgICAgIExWYWx1ZSBoYWRFeGNlcHRpb24gPSBtX291dC5ub3Ra ZXJvNjQoZXhjZXB0aW9uKTsKKworICAgICAgICAgICAgbV9vdXQuYnJhbmNoKAorICAgICAgICAg ICAgICAgIGhhZEV4Y2VwdGlvbiwgcmFyZWx5KGNyYXNoKSwgdXN1YWxseShjb250aW51YXRpb24p KTsKKworICAgICAgICAgICAgTEJhc2ljQmxvY2sgbGFzdE5leHQgPSBtX291dC5hcHBlbmRUbyhj cmFzaCwgY29udGludWF0aW9uKTsKKyAgICAgICAgICAgIG1fb3V0LnVucmVhY2hhYmxlKCk7CisK KyAgICAgICAgICAgIG1fb3V0LmFwcGVuZFRvKGNvbnRpbnVhdGlvbiwgbGFzdE5leHQpOworI2Vu ZGlmCisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCg==