158036 2016-05-24 12:18:48 -0700 We can cache lookups to JSScope::abstractResolve inside CodeBlock::finishCreation 2016-05-31 15:03:00 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified REOPENED P2 Normal --- 158238 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1195957 0 saam 2016-05-24 12:18:48 -0700 ... 1195993 1 279697 saam 2016-05-24 13:22:26 -0700 Created attachment 279697 patch 1195996 2 279697 ggaren 2016-05-24 13:28:56 -0700 Comment on attachment 279697 patch View in context: https://bugs.webkit.org/attachment.cgi?id=279697&action=review r=me > Source/JavaScriptCore/bytecode/CodeBlock.cpp:1871 > + bool isEmptyValue() const { return m_depth == std::numeric_limits<size_t>::max(); } We usually call this isNull(). Can we use nullptr in m_impl as null instead? That's a clearer null value. 1195999 3 279697 saam 2016-05-24 13:30:57 -0700 Comment on attachment 279697 patch View in context: https://bugs.webkit.org/attachment.cgi?id=279697&action=review >> Source/JavaScriptCore/bytecode/CodeBlock.cpp:1871 >> + bool isEmptyValue() const { return m_depth == std::numeric_limits<size_t>::max(); } > > We usually call this isNull(). > > Can we use nullptr in m_impl as null instead? That's a clearer null value. Will do. 1196005 4 279699 saam 2016-05-24 13:40:52 -0700 Created attachment 279699 patch for landing 1196048 5 279699 commit-queue 2016-05-24 15:27:12 -0700 Comment on attachment 279699 patch for landing Clearing flags on attachment: 279699 Committed r201359: <http://trac.webkit.org/changeset/201359> 1196049 6 commit-queue 2016-05-24 15:27:16 -0700 All reviewed patches have been landed. Closing bug. 1197971 7 commit-queue 2016-05-31 15:03:00 -0700 Re-opened since this is blocked by bug 158238 279697 2016-05-24 13:22:26 -0700 2016-05-24 13:40:52 -0700 patch a-backup.diff text/plain 7580 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxMzQ2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE2LTA1LTI0ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFdlIGNhbiBjYWNoZSBsb29rdXBzIHRvIEpTU2NvcGU6OmFic3RyYWN0UmVzb2x2ZSBpbnNpZGUg Q29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU4MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIGEgMSBpdGVtIGNhY2hlIGZv ciBKU1Njb3BlOjphYnN0cmFjdFJlc29sdmUuIEkgYWxzbyB0cmllZAorICAgICAgICBpbXBsZW1l bnRpbmcgdGhlIGNhY2hlIGFzIGEgSGFzaE1hcCwgYnV0IGl0IHNlZW1lZCBlaXRoZXIgbGVzcyBw cm9maXRhYmxlIG9uIHNvbWUKKyAgICAgICAgYmVuY2htYXJrcyBvciBqdXN0IGFzIHByb2ZpdGFi bGUgb24gb3RoZXJzLiBUaGVyZWZvcmUsIGl0J3MgY2xlYW5lciB0byBqdXN0CisgICAgICAgIHVz ZSBhIDEgaXRlbSBjYWNoZS4KKworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6Cisg ICAgICAgIChKU0M6OkNvZGVCbG9jazo6Q29kZUJsb2NrKToKKyAgICAgICAgKEpTQzo6QWJzdHJh Y3RSZXNvbHZlS2V5OjpBYnN0cmFjdFJlc29sdmVLZXkpOgorICAgICAgICAoSlNDOjpBYnN0cmFj dFJlc29sdmVLZXk6Om9wZXJhdG9yPT0pOgorICAgICAgICAoSlNDOjpBYnN0cmFjdFJlc29sdmVL ZXk6OmlzRW1wdHlWYWx1ZSk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6ZmluaXNoQ3JlYXRp b24pOgorICAgICAgICAqIHJ1bnRpbWUvR2V0UHV0SW5mby5oOgorICAgICAgICAoSlNDOjpuZWVk c1ZhckluamVjdGlvbkNoZWNrcyk6CisgICAgICAgIChKU0M6OlJlc29sdmVPcDo6UmVzb2x2ZU9w KToKKwogMjAxNi0wNS0yNCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAg ICAgIFVucmV2aXdlZCwgYWRkIGEgY29tbWVudCB0byBkZXNjcmliZSB0aGUgdGVzdCdzIGZhaWx1 cmUgbW9kZS4gU3VnZ2VzdGVkIGJ5IG1sYW0uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQ29kZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkocmV2aXNpb24gMjAxMjkwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4 NDYsNiArMTg0NiwzNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhWTSogdm0sIFN0cnVjdHVyZSog CiAgICAgc2V0TnVtUGFyYW1ldGVycyhvdGhlci5udW1QYXJhbWV0ZXJzKCkpOwogfQogCitzdHJ1 Y3QgQWJzdHJhY3RSZXNvbHZlS2V5IHsKKyAgICBBYnN0cmFjdFJlc29sdmVLZXkoKQorICAgICAg ICA6IG1fZGVwdGgoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSkKKyAgICB7IH0K KyAgICBBYnN0cmFjdFJlc29sdmVLZXkoc2l6ZV90IGRlcHRoLCBjb25zdCBJZGVudGlmaWVyJiBp ZGVudCwgR2V0T3JQdXQgZ2V0T3JQdXQsIFJlc29sdmVUeXBlIHJlc29sdmVUeXBlLCBJbml0aWFs aXphdGlvbk1vZGUgaW5pdGlhbGl6YXRpb25Nb2RlKQorICAgICAgICA6IG1fZGVwdGgoZGVwdGgp CisgICAgICAgICwgbV9pbXBsKGlkZW50LmltcGwoKSkKKyAgICAgICAgLCBtX2dldE9yUHV0KGdl dE9yUHV0KQorICAgICAgICAsIG1fcmVzb2x2ZVR5cGUocmVzb2x2ZVR5cGUpCisgICAgICAgICwg bV9pbml0aWFsaXphdGlvbk1vZGUoaW5pdGlhbGl6YXRpb25Nb2RlKQorICAgIHsgfQorCisKKyAg ICBib29sIG9wZXJhdG9yPT0oY29uc3QgQWJzdHJhY3RSZXNvbHZlS2V5JiBvdGhlcikgY29uc3QK KyAgICB7IAorICAgICAgICByZXR1cm4gbV9pbXBsID09IG90aGVyLm1faW1wbAorICAgICAgICAg ICAgJiYgbV9kZXB0aCA9PSBvdGhlci5tX2RlcHRoCisgICAgICAgICAgICAmJiBtX2dldE9yUHV0 ID09IG90aGVyLm1fZ2V0T3JQdXQKKyAgICAgICAgICAgICYmIG1fcmVzb2x2ZVR5cGUgPT0gb3Ro ZXIubV9yZXNvbHZlVHlwZQorICAgICAgICAgICAgJiYgbV9pbml0aWFsaXphdGlvbk1vZGUgPT0g b3RoZXIubV9pbml0aWFsaXphdGlvbk1vZGU7CisgICAgfQorCisgICAgYm9vbCBpc0VtcHR5VmFs dWUoKSBjb25zdCB7IHJldHVybiBtX2RlcHRoID09IHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90 Pjo6bWF4KCk7IH0KKworICAgIHNpemVfdCBtX2RlcHRoOworICAgIFVuaXF1ZWRTdHJpbmdJbXBs KiBtX2ltcGw7CisgICAgR2V0T3JQdXQgbV9nZXRPclB1dDsKKyAgICBSZXNvbHZlVHlwZSBtX3Jl c29sdmVUeXBlOworICAgIEluaXRpYWxpemF0aW9uTW9kZSBtX2luaXRpYWxpemF0aW9uTW9kZTsK K307CisKIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIENvcHlQYXJzZWRC bG9ja1RhZywgQ29kZUJsb2NrJiBvdGhlcikKIHsKICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2 bSk7CkBAIC0yMDE0LDYgKzIwNDUsMTkgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9u KFZNJiB2bSwgUwogICAgIHNldENhbGxlZVNhdmVSZWdpc3RlcnMoUmVnaXN0ZXJTZXQ6OmxsaW50 QmFzZWxpbmVDYWxsZWVTYXZlUmVnaXN0ZXJzKCkpOwogI2VuZGlmCiAKKyAgICBBYnN0cmFjdFJl c29sdmVLZXkgbGFzdFJlc29sdmVLZXk7CisgICAgUmVzb2x2ZU9wIGxhc3RDYWNoZWRPcDsKKyAg ICBhdXRvIGNhY2hlZEFic3RyYWN0UmVzb2x2ZSA9IFsmXSAoc2l6ZV90IGxvY2FsU2NvcGVEZXB0 aCwgY29uc3QgSWRlbnRpZmllciYgaWRlbnQsIEdldE9yUHV0IGdldE9yUHV0LCBSZXNvbHZlVHlw ZSByZXNvbHZlVHlwZSwgSW5pdGlhbGl6YXRpb25Nb2RlIGluaXRpYWxpemF0aW9uTW9kZSkgLT4g Y29uc3QgUmVzb2x2ZU9wJiB7CisgICAgICAgIEFic3RyYWN0UmVzb2x2ZUtleSBrZXkobG9jYWxT Y29wZURlcHRoLCBpZGVudCwgZ2V0T3JQdXQsIHJlc29sdmVUeXBlLCBpbml0aWFsaXphdGlvbk1v ZGUpOworICAgICAgICBpZiAoa2V5ID09IGxhc3RSZXNvbHZlS2V5KSB7CisgICAgICAgICAgICBB U1NFUlQoIWxhc3RSZXNvbHZlS2V5LmlzRW1wdHlWYWx1ZSgpKTsKKyAgICAgICAgICAgIHJldHVy biBsYXN0Q2FjaGVkT3A7CisgICAgICAgIH0KKyAgICAgICAgbGFzdENhY2hlZE9wID0gSlNTY29w ZTo6YWJzdHJhY3RSZXNvbHZlKG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIGxvY2FsU2Nv cGVEZXB0aCwgc2NvcGUsIGlkZW50LCBnZXRPclB1dCwgcmVzb2x2ZVR5cGUsIGluaXRpYWxpemF0 aW9uTW9kZSk7CisgICAgICAgIGxhc3RSZXNvbHZlS2V5ID0ga2V5OworICAgICAgICByZXR1cm4g bGFzdENhY2hlZE9wOworICAgIH07CisKICAgICAvLyBDb3B5IGFuZCB0cmFuc2xhdGUgdGhlIFVu bGlua2VkSW5zdHJ1Y3Rpb25zCiAgICAgdW5zaWduZWQgaW5zdHJ1Y3Rpb25Db3VudCA9IHVubGlu a2VkQ29kZUJsb2NrLT5pbnN0cnVjdGlvbnMoKS5jb3VudCgpOwogICAgIFVubGlua2VkSW5zdHJ1 Y3Rpb25TdHJlYW06OlJlYWRlciBpbnN0cnVjdGlvblJlYWRlcih1bmxpbmtlZENvZGVCbG9jay0+ aW5zdHJ1Y3Rpb25zKCkpOwpAQCAtMjEyNSw3ICsyMTY5LDcgQEAgdm9pZCBDb2RlQmxvY2s6OmZp bmlzaENyZWF0aW9uKFZNJiB2bSwgUwogICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQodHlwZSAh PSBMb2NhbENsb3N1cmVWYXIpOwogICAgICAgICAgICAgaW50IGxvY2FsU2NvcGVEZXB0aCA9IHBj WzVdLnUub3BlcmFuZDsKIAotICAgICAgICAgICAgUmVzb2x2ZU9wIG9wID0gSlNTY29wZTo6YWJz dHJhY3RSZXNvbHZlKG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIGxvY2FsU2NvcGVEZXB0 aCwgc2NvcGUsIGlkZW50LCBHZXQsIHR5cGUsIEluaXRpYWxpemF0aW9uTW9kZTo6Tm90SW5pdGlh bGl6YXRpb24pOworICAgICAgICAgICAgY29uc3QgUmVzb2x2ZU9wJiBvcCA9IGNhY2hlZEFic3Ry YWN0UmVzb2x2ZShsb2NhbFNjb3BlRGVwdGgsIGlkZW50LCBHZXQsIHR5cGUsIEluaXRpYWxpemF0 aW9uTW9kZTo6Tm90SW5pdGlhbGl6YXRpb24pOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zW2kg KyA0XS51Lm9wZXJhbmQgPSBvcC50eXBlOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zW2kgKyA1 XS51Lm9wZXJhbmQgPSBvcC5kZXB0aDsKICAgICAgICAgICAgIGlmIChvcC5sZXhpY2FsRW52aXJv bm1lbnQpIHsKQEAgLTIxNjIsNyArMjIwNiw3IEBAIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVh dGlvbihWTSYgdm0sIFMKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgY29uc3QgSWRlbnRp ZmllciYgaWRlbnQgPSBpZGVudGlmaWVyKHBjWzNdLnUub3BlcmFuZCk7Ci0gICAgICAgICAgICBS ZXNvbHZlT3Agb3AgPSBKU1Njb3BlOjphYnN0cmFjdFJlc29sdmUobV9nbG9iYWxPYmplY3QtPmds b2JhbEV4ZWMoKSwgbG9jYWxTY29wZURlcHRoLCBzY29wZSwgaWRlbnQsIEdldCwgZ2V0UHV0SW5m by5yZXNvbHZlVHlwZSgpLCBJbml0aWFsaXphdGlvbk1vZGU6Ok5vdEluaXRpYWxpemF0aW9uKTsK KyAgICAgICAgICAgIGNvbnN0IFJlc29sdmVPcCYgb3AgPSBjYWNoZWRBYnN0cmFjdFJlc29sdmUo bG9jYWxTY29wZURlcHRoLCBpZGVudCwgR2V0LCBnZXRQdXRJbmZvLnJlc29sdmVUeXBlKCksIElu aXRpYWxpemF0aW9uTW9kZTo6Tm90SW5pdGlhbGl6YXRpb24pOwogCiAgICAgICAgICAgICBpbnN0 cnVjdGlvbnNbaSArIDRdLnUub3BlcmFuZCA9IEdldFB1dEluZm8oZ2V0UHV0SW5mby5yZXNvbHZl TW9kZSgpLCBvcC50eXBlLCBnZXRQdXRJbmZvLmluaXRpYWxpemF0aW9uTW9kZSgpKS5vcGVyYW5k KCk7CiAgICAgICAgICAgICBpZiAob3AudHlwZSA9PSBNb2R1bGVWYXIpCkBAIC0yMTk3LDcgKzIy NDEsNyBAQCB2b2lkIENvZGVCbG9jazo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBTCiAgICAgICAg ICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCA9IGlkZW50aWZpZXIocGNbMl0udS5vcGVyYW5k KTsKICAgICAgICAgICAgIGludCBsb2NhbFNjb3BlRGVwdGggPSBwY1s1XS51Lm9wZXJhbmQ7CiAg ICAgICAgICAgICBpbnN0cnVjdGlvbnNbaSArIDVdLnUucG9pbnRlciA9IG51bGxwdHI7Ci0gICAg ICAgICAgICBSZXNvbHZlT3Agb3AgPSBKU1Njb3BlOjphYnN0cmFjdFJlc29sdmUobV9nbG9iYWxP YmplY3QtPmdsb2JhbEV4ZWMoKSwgbG9jYWxTY29wZURlcHRoLCBzY29wZSwgaWRlbnQsIFB1dCwg Z2V0UHV0SW5mby5yZXNvbHZlVHlwZSgpLCBnZXRQdXRJbmZvLmluaXRpYWxpemF0aW9uTW9kZSgp KTsKKyAgICAgICAgICAgIGNvbnN0IFJlc29sdmVPcCYgb3AgPSBjYWNoZWRBYnN0cmFjdFJlc29s dmUobG9jYWxTY29wZURlcHRoLCBpZGVudCwgUHV0LCBnZXRQdXRJbmZvLnJlc29sdmVUeXBlKCks IGdldFB1dEluZm8uaW5pdGlhbGl6YXRpb25Nb2RlKCkpOwogCiAgICAgICAgICAgICBpbnN0cnVj dGlvbnNbaSArIDRdLnUub3BlcmFuZCA9IEdldFB1dEluZm8oZ2V0UHV0SW5mby5yZXNvbHZlTW9k ZSgpLCBvcC50eXBlLCBnZXRQdXRJbmZvLmluaXRpYWxpemF0aW9uTW9kZSgpKS5vcGVyYW5kKCk7 CiAgICAgICAgICAgICBpZiAob3AudHlwZSA9PSBHbG9iYWxWYXIgfHwgb3AudHlwZSA9PSBHbG9i YWxWYXJXaXRoVmFySW5qZWN0aW9uQ2hlY2tzIHx8IG9wLnR5cGUgPT0gR2xvYmFsTGV4aWNhbFZh ciB8fCBvcC50eXBlID09IEdsb2JhbExleGljYWxWYXJXaXRoVmFySW5qZWN0aW9uQ2hlY2tzKQpA QCAtMjIzMSw3ICsyMjc1LDcgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2 bSwgUwogICAgICAgICAgICAgICAgIFJlc29sdmVUeXBlIHR5cGUgPSBzdGF0aWNfY2FzdDxSZXNv bHZlVHlwZT4ocGNbNV0udS5vcGVyYW5kKTsKICAgICAgICAgICAgICAgICAvLyBFdmVuIHRob3Vn aCB0eXBlIHByb2ZpbGluZyBtYXkgYmUgcHJvZmlsaW5nIGVpdGhlciBhIEdldCBvciBhIFB1dCwg d2UgY2FuIGFsd2F5cyBjbGFpbSBhIEdldCBiZWNhdXNlCiAgICAgICAgICAgICAgICAgLy8gd2Un cmUgYWJzdHJhY3RseSAicmVhZCJpbmcgZnJvbSBhIEpTU2NvcGUuCi0gICAgICAgICAgICAgICAg UmVzb2x2ZU9wIG9wID0gSlNTY29wZTo6YWJzdHJhY3RSZXNvbHZlKG1fZ2xvYmFsT2JqZWN0LT5n bG9iYWxFeGVjKCksIGxvY2FsU2NvcGVEZXB0aCwgc2NvcGUsIGlkZW50LCBHZXQsIHR5cGUsIElu aXRpYWxpemF0aW9uTW9kZTo6Tm90SW5pdGlhbGl6YXRpb24pOworICAgICAgICAgICAgICAgIGNv bnN0IFJlc29sdmVPcCYgb3AgPSBjYWNoZWRBYnN0cmFjdFJlc29sdmUobG9jYWxTY29wZURlcHRo LCBpZGVudCwgR2V0LCB0eXBlLCBJbml0aWFsaXphdGlvbk1vZGU6Ok5vdEluaXRpYWxpemF0aW9u KTsKIAogICAgICAgICAgICAgICAgIGlmIChvcC50eXBlID09IENsb3N1cmVWYXIgfHwgb3AudHlw ZSA9PSBNb2R1bGVWYXIpCiAgICAgICAgICAgICAgICAgICAgIHN5bWJvbFRhYmxlID0gb3AubGV4 aWNhbEVudmlyb25tZW50LT5zeW1ib2xUYWJsZSgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvR2V0UHV0SW5mby5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0dldFB1dEluZm8uaAkocmV2aXNpb24gMjAxMjkwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvR2V0UHV0SW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzks NiArMTc5LDE0IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBuZWVkc1ZhckluamVjdGlvbkNoZWMKIH0K IAogc3RydWN0IFJlc29sdmVPcCB7CisgICAgUmVzb2x2ZU9wKCkKKyAgICAgICAgOiBkZXB0aCgw KQorICAgICAgICAsIHN0cnVjdHVyZShudWxscHRyKQorICAgICAgICAsIGxleGljYWxFbnZpcm9u bWVudChudWxscHRyKQorICAgICAgICAsIHdhdGNocG9pbnRTZXQobnVsbHB0cikKKyAgICAgICAg LCBpbXBvcnRlZE5hbWUobnVsbHB0cikKKyAgICB7IH0KKwogICAgIFJlc29sdmVPcChSZXNvbHZl VHlwZSB0eXBlLCBzaXplX3QgZGVwdGgsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBKU0xleGljYWxF bnZpcm9ubWVudCogbGV4aWNhbEVudmlyb25tZW50LCBXYXRjaHBvaW50U2V0KiB3YXRjaHBvaW50 U2V0LCB1aW50cHRyX3Qgb3BlcmFuZCwgVW5pcXVlZFN0cmluZ0ltcGwqIGltcG9ydGVkTmFtZSA9 IG51bGxwdHIpCiAgICAgICAgIDogdHlwZSh0eXBlKQogICAgICAgICAsIGRlcHRoKGRlcHRoKQo= 279699 2016-05-24 13:40:52 -0700 2016-05-24 15:27:12 -0700 patch for landing a-backup.diff text/plain 7502 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAxMzQ2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE2LTA1LTI0ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFdlIGNhbiBjYWNoZSBsb29rdXBzIHRvIEpTU2NvcGU6OmFic3RyYWN0UmVzb2x2ZSBpbnNpZGUg Q29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU4MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkg R2FyZW4uCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIGEgMSBpdGVtIGNhY2hlIGZv ciBKU1Njb3BlOjphYnN0cmFjdFJlc29sdmUuIEkgYWxzbyB0cmllZAorICAgICAgICBpbXBsZW1l bnRpbmcgdGhlIGNhY2hlIGFzIGEgSGFzaE1hcCwgYnV0IGl0IHNlZW1lZCBlaXRoZXIgbGVzcyBw cm9maXRhYmxlIG9uIHNvbWUKKyAgICAgICAgYmVuY2htYXJrcyBvciBqdXN0IGFzIHByb2ZpdGFi bGUgb24gb3RoZXJzLiBUaGVyZWZvcmUsIGl0J3MgY2xlYW5lciB0byBqdXN0CisgICAgICAgIHVz ZSBhIDEgaXRlbSBjYWNoZS4KKworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6Cisg ICAgICAgIChKU0M6OkNvZGVCbG9jazo6Q29kZUJsb2NrKToKKyAgICAgICAgKEpTQzo6QWJzdHJh Y3RSZXNvbHZlS2V5OjpBYnN0cmFjdFJlc29sdmVLZXkpOgorICAgICAgICAoSlNDOjpBYnN0cmFj dFJlc29sdmVLZXk6Om9wZXJhdG9yPT0pOgorICAgICAgICAoSlNDOjpBYnN0cmFjdFJlc29sdmVL ZXk6OmlzRW1wdHlWYWx1ZSk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6ZmluaXNoQ3JlYXRp b24pOgorICAgICAgICAqIHJ1bnRpbWUvR2V0UHV0SW5mby5oOgorICAgICAgICAoSlNDOjpuZWVk c1ZhckluamVjdGlvbkNoZWNrcyk6CisgICAgICAgIChKU0M6OlJlc29sdmVPcDo6UmVzb2x2ZU9w KToKKwogMjAxNi0wNS0yNCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAg ICAgIFVucmV2aXdlZCwgYWRkIGEgY29tbWVudCB0byBkZXNjcmliZSB0aGUgdGVzdCdzIGZhaWx1 cmUgbW9kZS4gU3VnZ2VzdGVkIGJ5IG1sYW0uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQ29kZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkocmV2aXNpb24gMjAxMjkwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4 NDYsNiArMTg0NiwzNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhWTSogdm0sIFN0cnVjdHVyZSog CiAgICAgc2V0TnVtUGFyYW1ldGVycyhvdGhlci5udW1QYXJhbWV0ZXJzKCkpOwogfQogCitzdHJ1 Y3QgQWJzdHJhY3RSZXNvbHZlS2V5IHsKKyAgICBBYnN0cmFjdFJlc29sdmVLZXkoKQorICAgICAg ICA6IG1faW1wbChudWxscHRyKQorICAgIHsgfQorICAgIEFic3RyYWN0UmVzb2x2ZUtleShzaXpl X3QgZGVwdGgsIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBHZXRPclB1dCBnZXRPclB1dCwgUmVz b2x2ZVR5cGUgcmVzb2x2ZVR5cGUsIEluaXRpYWxpemF0aW9uTW9kZSBpbml0aWFsaXphdGlvbk1v ZGUpCisgICAgICAgIDogbV9kZXB0aChkZXB0aCkKKyAgICAgICAgLCBtX2ltcGwoaWRlbnQuaW1w bCgpKQorICAgICAgICAsIG1fZ2V0T3JQdXQoZ2V0T3JQdXQpCisgICAgICAgICwgbV9yZXNvbHZl VHlwZShyZXNvbHZlVHlwZSkKKyAgICAgICAgLCBtX2luaXRpYWxpemF0aW9uTW9kZShpbml0aWFs aXphdGlvbk1vZGUpCisgICAgeyB9CisKKworICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBBYnN0 cmFjdFJlc29sdmVLZXkmIG90aGVyKSBjb25zdAorICAgIHsgCisgICAgICAgIHJldHVybiBtX2lt cGwgPT0gb3RoZXIubV9pbXBsCisgICAgICAgICAgICAmJiBtX2RlcHRoID09IG90aGVyLm1fZGVw dGgKKyAgICAgICAgICAgICYmIG1fZ2V0T3JQdXQgPT0gb3RoZXIubV9nZXRPclB1dAorICAgICAg ICAgICAgJiYgbV9yZXNvbHZlVHlwZSA9PSBvdGhlci5tX3Jlc29sdmVUeXBlCisgICAgICAgICAg ICAmJiBtX2luaXRpYWxpemF0aW9uTW9kZSA9PSBvdGhlci5tX2luaXRpYWxpemF0aW9uTW9kZTsK KyAgICB9CisKKyAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuICFtX2ltcGw7IH0KKwor ICAgIHNpemVfdCBtX2RlcHRoOworICAgIFVuaXF1ZWRTdHJpbmdJbXBsKiBtX2ltcGw7CisgICAg R2V0T3JQdXQgbV9nZXRPclB1dDsKKyAgICBSZXNvbHZlVHlwZSBtX3Jlc29sdmVUeXBlOworICAg IEluaXRpYWxpemF0aW9uTW9kZSBtX2luaXRpYWxpemF0aW9uTW9kZTsKK307CisKIHZvaWQgQ29k ZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIENvcHlQYXJzZWRCbG9ja1RhZywgQ29kZUJs b2NrJiBvdGhlcikKIHsKICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2bSk7CkBAIC0yMDE0LDYg KzIwNDUsMTkgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgUwogICAg IHNldENhbGxlZVNhdmVSZWdpc3RlcnMoUmVnaXN0ZXJTZXQ6OmxsaW50QmFzZWxpbmVDYWxsZWVT YXZlUmVnaXN0ZXJzKCkpOwogI2VuZGlmCiAKKyAgICBBYnN0cmFjdFJlc29sdmVLZXkgbGFzdFJl c29sdmVLZXk7CisgICAgUmVzb2x2ZU9wIGxhc3RDYWNoZWRPcDsKKyAgICBhdXRvIGNhY2hlZEFi c3RyYWN0UmVzb2x2ZSA9IFsmXSAoc2l6ZV90IGxvY2FsU2NvcGVEZXB0aCwgY29uc3QgSWRlbnRp ZmllciYgaWRlbnQsIEdldE9yUHV0IGdldE9yUHV0LCBSZXNvbHZlVHlwZSByZXNvbHZlVHlwZSwg SW5pdGlhbGl6YXRpb25Nb2RlIGluaXRpYWxpemF0aW9uTW9kZSkgLT4gY29uc3QgUmVzb2x2ZU9w JiB7CisgICAgICAgIEFic3RyYWN0UmVzb2x2ZUtleSBrZXkobG9jYWxTY29wZURlcHRoLCBpZGVu dCwgZ2V0T3JQdXQsIHJlc29sdmVUeXBlLCBpbml0aWFsaXphdGlvbk1vZGUpOworICAgICAgICBp ZiAoa2V5ID09IGxhc3RSZXNvbHZlS2V5KSB7CisgICAgICAgICAgICBBU1NFUlQoIWxhc3RSZXNv bHZlS2V5LmlzTnVsbCgpKTsKKyAgICAgICAgICAgIHJldHVybiBsYXN0Q2FjaGVkT3A7CisgICAg ICAgIH0KKyAgICAgICAgbGFzdENhY2hlZE9wID0gSlNTY29wZTo6YWJzdHJhY3RSZXNvbHZlKG1f Z2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIGxvY2FsU2NvcGVEZXB0aCwgc2NvcGUsIGlkZW50 LCBnZXRPclB1dCwgcmVzb2x2ZVR5cGUsIGluaXRpYWxpemF0aW9uTW9kZSk7CisgICAgICAgIGxh c3RSZXNvbHZlS2V5ID0ga2V5OworICAgICAgICByZXR1cm4gbGFzdENhY2hlZE9wOworICAgIH07 CisKICAgICAvLyBDb3B5IGFuZCB0cmFuc2xhdGUgdGhlIFVubGlua2VkSW5zdHJ1Y3Rpb25zCiAg ICAgdW5zaWduZWQgaW5zdHJ1Y3Rpb25Db3VudCA9IHVubGlua2VkQ29kZUJsb2NrLT5pbnN0cnVj dGlvbnMoKS5jb3VudCgpOwogICAgIFVubGlua2VkSW5zdHJ1Y3Rpb25TdHJlYW06OlJlYWRlciBp bnN0cnVjdGlvblJlYWRlcih1bmxpbmtlZENvZGVCbG9jay0+aW5zdHJ1Y3Rpb25zKCkpOwpAQCAt MjEyNSw3ICsyMTY5LDcgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwg UwogICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQodHlwZSAhPSBMb2NhbENsb3N1cmVWYXIpOwog ICAgICAgICAgICAgaW50IGxvY2FsU2NvcGVEZXB0aCA9IHBjWzVdLnUub3BlcmFuZDsKIAotICAg ICAgICAgICAgUmVzb2x2ZU9wIG9wID0gSlNTY29wZTo6YWJzdHJhY3RSZXNvbHZlKG1fZ2xvYmFs T2JqZWN0LT5nbG9iYWxFeGVjKCksIGxvY2FsU2NvcGVEZXB0aCwgc2NvcGUsIGlkZW50LCBHZXQs IHR5cGUsIEluaXRpYWxpemF0aW9uTW9kZTo6Tm90SW5pdGlhbGl6YXRpb24pOworICAgICAgICAg ICAgY29uc3QgUmVzb2x2ZU9wJiBvcCA9IGNhY2hlZEFic3RyYWN0UmVzb2x2ZShsb2NhbFNjb3Bl RGVwdGgsIGlkZW50LCBHZXQsIHR5cGUsIEluaXRpYWxpemF0aW9uTW9kZTo6Tm90SW5pdGlhbGl6 YXRpb24pOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zW2kgKyA0XS51Lm9wZXJhbmQgPSBvcC50 eXBlOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zW2kgKyA1XS51Lm9wZXJhbmQgPSBvcC5kZXB0 aDsKICAgICAgICAgICAgIGlmIChvcC5sZXhpY2FsRW52aXJvbm1lbnQpIHsKQEAgLTIxNjIsNyAr MjIwNiw3IEBAIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAg ICAgICAgIH0KIAogICAgICAgICAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnQgPSBpZGVudGlm aWVyKHBjWzNdLnUub3BlcmFuZCk7Ci0gICAgICAgICAgICBSZXNvbHZlT3Agb3AgPSBKU1Njb3Bl OjphYnN0cmFjdFJlc29sdmUobV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwgbG9jYWxTY29w ZURlcHRoLCBzY29wZSwgaWRlbnQsIEdldCwgZ2V0UHV0SW5mby5yZXNvbHZlVHlwZSgpLCBJbml0 aWFsaXphdGlvbk1vZGU6Ok5vdEluaXRpYWxpemF0aW9uKTsKKyAgICAgICAgICAgIGNvbnN0IFJl c29sdmVPcCYgb3AgPSBjYWNoZWRBYnN0cmFjdFJlc29sdmUobG9jYWxTY29wZURlcHRoLCBpZGVu dCwgR2V0LCBnZXRQdXRJbmZvLnJlc29sdmVUeXBlKCksIEluaXRpYWxpemF0aW9uTW9kZTo6Tm90 SW5pdGlhbGl6YXRpb24pOwogCiAgICAgICAgICAgICBpbnN0cnVjdGlvbnNbaSArIDRdLnUub3Bl cmFuZCA9IEdldFB1dEluZm8oZ2V0UHV0SW5mby5yZXNvbHZlTW9kZSgpLCBvcC50eXBlLCBnZXRQ dXRJbmZvLmluaXRpYWxpemF0aW9uTW9kZSgpKS5vcGVyYW5kKCk7CiAgICAgICAgICAgICBpZiAo b3AudHlwZSA9PSBNb2R1bGVWYXIpCkBAIC0yMTk3LDcgKzIyNDEsNyBAQCB2b2lkIENvZGVCbG9j azo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBTCiAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVy JiBpZGVudCA9IGlkZW50aWZpZXIocGNbMl0udS5vcGVyYW5kKTsKICAgICAgICAgICAgIGludCBs b2NhbFNjb3BlRGVwdGggPSBwY1s1XS51Lm9wZXJhbmQ7CiAgICAgICAgICAgICBpbnN0cnVjdGlv bnNbaSArIDVdLnUucG9pbnRlciA9IG51bGxwdHI7Ci0gICAgICAgICAgICBSZXNvbHZlT3Agb3Ag PSBKU1Njb3BlOjphYnN0cmFjdFJlc29sdmUobV9nbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKSwg bG9jYWxTY29wZURlcHRoLCBzY29wZSwgaWRlbnQsIFB1dCwgZ2V0UHV0SW5mby5yZXNvbHZlVHlw ZSgpLCBnZXRQdXRJbmZvLmluaXRpYWxpemF0aW9uTW9kZSgpKTsKKyAgICAgICAgICAgIGNvbnN0 IFJlc29sdmVPcCYgb3AgPSBjYWNoZWRBYnN0cmFjdFJlc29sdmUobG9jYWxTY29wZURlcHRoLCBp ZGVudCwgUHV0LCBnZXRQdXRJbmZvLnJlc29sdmVUeXBlKCksIGdldFB1dEluZm8uaW5pdGlhbGl6 YXRpb25Nb2RlKCkpOwogCiAgICAgICAgICAgICBpbnN0cnVjdGlvbnNbaSArIDRdLnUub3BlcmFu ZCA9IEdldFB1dEluZm8oZ2V0UHV0SW5mby5yZXNvbHZlTW9kZSgpLCBvcC50eXBlLCBnZXRQdXRJ bmZvLmluaXRpYWxpemF0aW9uTW9kZSgpKS5vcGVyYW5kKCk7CiAgICAgICAgICAgICBpZiAob3Au dHlwZSA9PSBHbG9iYWxWYXIgfHwgb3AudHlwZSA9PSBHbG9iYWxWYXJXaXRoVmFySW5qZWN0aW9u Q2hlY2tzIHx8IG9wLnR5cGUgPT0gR2xvYmFsTGV4aWNhbFZhciB8fCBvcC50eXBlID09IEdsb2Jh bExleGljYWxWYXJXaXRoVmFySW5qZWN0aW9uQ2hlY2tzKQpAQCAtMjIzMSw3ICsyMjc1LDcgQEAg dm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgUwogICAgICAgICAgICAgICAg IFJlc29sdmVUeXBlIHR5cGUgPSBzdGF0aWNfY2FzdDxSZXNvbHZlVHlwZT4ocGNbNV0udS5vcGVy YW5kKTsKICAgICAgICAgICAgICAgICAvLyBFdmVuIHRob3VnaCB0eXBlIHByb2ZpbGluZyBtYXkg YmUgcHJvZmlsaW5nIGVpdGhlciBhIEdldCBvciBhIFB1dCwgd2UgY2FuIGFsd2F5cyBjbGFpbSBh IEdldCBiZWNhdXNlCiAgICAgICAgICAgICAgICAgLy8gd2UncmUgYWJzdHJhY3RseSAicmVhZCJp bmcgZnJvbSBhIEpTU2NvcGUuCi0gICAgICAgICAgICAgICAgUmVzb2x2ZU9wIG9wID0gSlNTY29w ZTo6YWJzdHJhY3RSZXNvbHZlKG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIGxvY2FsU2Nv cGVEZXB0aCwgc2NvcGUsIGlkZW50LCBHZXQsIHR5cGUsIEluaXRpYWxpemF0aW9uTW9kZTo6Tm90 SW5pdGlhbGl6YXRpb24pOworICAgICAgICAgICAgICAgIGNvbnN0IFJlc29sdmVPcCYgb3AgPSBj YWNoZWRBYnN0cmFjdFJlc29sdmUobG9jYWxTY29wZURlcHRoLCBpZGVudCwgR2V0LCB0eXBlLCBJ bml0aWFsaXphdGlvbk1vZGU6Ok5vdEluaXRpYWxpemF0aW9uKTsKIAogICAgICAgICAgICAgICAg IGlmIChvcC50eXBlID09IENsb3N1cmVWYXIgfHwgb3AudHlwZSA9PSBNb2R1bGVWYXIpCiAgICAg ICAgICAgICAgICAgICAgIHN5bWJvbFRhYmxlID0gb3AubGV4aWNhbEVudmlyb25tZW50LT5zeW1i b2xUYWJsZSgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2V0UHV0SW5m by5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dldFB1dElu Zm8uaAkocmV2aXNpb24gMjAxMjkwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv R2V0UHV0SW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzksNiArMTc5LDE0IEBAIEFMV0FZU19J TkxJTkUgYm9vbCBuZWVkc1ZhckluamVjdGlvbkNoZWMKIH0KIAogc3RydWN0IFJlc29sdmVPcCB7 CisgICAgUmVzb2x2ZU9wKCkKKyAgICAgICAgOiBkZXB0aCgwKQorICAgICAgICAsIHN0cnVjdHVy ZShudWxscHRyKQorICAgICAgICAsIGxleGljYWxFbnZpcm9ubWVudChudWxscHRyKQorICAgICAg ICAsIHdhdGNocG9pbnRTZXQobnVsbHB0cikKKyAgICAgICAgLCBpbXBvcnRlZE5hbWUobnVsbHB0 cikKKyAgICB7IH0KKwogICAgIFJlc29sdmVPcChSZXNvbHZlVHlwZSB0eXBlLCBzaXplX3QgZGVw dGgsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBKU0xleGljYWxFbnZpcm9ubWVudCogbGV4aWNhbEVu dmlyb25tZW50LCBXYXRjaHBvaW50U2V0KiB3YXRjaHBvaW50U2V0LCB1aW50cHRyX3Qgb3BlcmFu ZCwgVW5pcXVlZFN0cmluZ0ltcGwqIGltcG9ydGVkTmFtZSA9IG51bGxwdHIpCiAgICAgICAgIDog dHlwZSh0eXBlKQogICAgICAgICAsIGRlcHRoKGRlcHRoKQo=