164750 2016-11-14 17:08:44 -0800 CodeCache should stop pretending to cache builtins 2016-11-15 11:04:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1251258 0 ggaren 2016-11-14 17:08:44 -0800 CodeCache should stop pretending to cache builtins 1251260 1 294778 ggaren 2016-11-14 17:13:04 -0800 Created attachment 294778 Patch 1251275 2 294778 saam 2016-11-14 17:20:35 -0800 Comment on attachment 294778 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=294778&action=review r=me > Source/JavaScriptCore/parser/SourceCodeKey.h:-48 > - (static_cast<unsigned>(builtinMode) << 1) | Maybe it's worth updating the other shifts to be subtracted by 1? 1251483 3 ggaren 2016-11-15 11:04:25 -0800 Committed r208736: <http://trac.webkit.org/changeset/208736> 294778 2016-11-14 17:13:04 -0800 2016-11-14 17:20:35 -0800 Patch bug-164750-20161114170845.patch text/plain 15510 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4NzE3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE2LTExLTE0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQ29kZUNhY2hlIHNob3VsZCBzdG9wIHByZXRlbmRpbmcgdG8gY2FjaGUgYnVpbHRpbnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDc1MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHdlcmUgcGFz c2luZyBKU1BhcnNlckJ1aWx0aW5Nb2RlIHRvIGFsbCBDb2RlQ2FjaGUgZnVuY3Rpb25zLCBidXQg dGhlCisgICAgICAgIHBhc3NlZC1pbiB2YWx1ZSB3YXMgYWx3YXlzIE5vdEJ1aWx0aW4uCisKKyAg ICAgICAgTGV0J3Mgc3RvcCBwYXNzaW5nIGl0LgorCisgICAgICAgICogcGFyc2VyL1NvdXJjZUNv ZGVLZXkuaDoKKyAgICAgICAgKEpTQzo6U291cmNlQ29kZUZsYWdzOjpTb3VyY2VDb2RlRmxhZ3Mp OgorICAgICAgICAoSlNDOjpTb3VyY2VDb2RlS2V5OjpTb3VyY2VDb2RlS2V5KToKKyAgICAgICAg KiBydW50aW1lL0NvZGVDYWNoZS5jcHA6CisgICAgICAgIChKU0M6OkNvZGVDYWNoZTo6Z2V0VW5s aW5rZWRHbG9iYWxDb2RlQmxvY2spOgorICAgICAgICAoSlNDOjpDb2RlQ2FjaGU6OmdldFVubGlu a2VkUHJvZ3JhbUNvZGVCbG9jayk6CisgICAgICAgIChKU0M6OkNvZGVDYWNoZTo6Z2V0VW5saW5r ZWRHbG9iYWxFdmFsQ29kZUJsb2NrKToKKyAgICAgICAgKEpTQzo6Q29kZUNhY2hlOjpnZXRVbmxp bmtlZE1vZHVsZVByb2dyYW1Db2RlQmxvY2spOgorICAgICAgICAoSlNDOjpDb2RlQ2FjaGU6Omdl dFVubGlua2VkR2xvYmFsRnVuY3Rpb25FeGVjdXRhYmxlKToKKyAgICAgICAgKiBydW50aW1lL0Nv ZGVDYWNoZS5oOgorICAgICAgICAoSlNDOjpnZW5lcmF0ZVVubGlua2VkQ29kZUJsb2NrKToKKyAg ICAgICAgKiBydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6SlNHbG9i YWxPYmplY3Q6OmNyZWF0ZVByb2dyYW1Db2RlQmxvY2spOgorICAgICAgICAoSlNDOjpKU0dsb2Jh bE9iamVjdDo6Y3JlYXRlTG9jYWxFdmFsQ29kZUJsb2NrKToKKyAgICAgICAgKEpTQzo6SlNHbG9i YWxPYmplY3Q6OmNyZWF0ZUdsb2JhbEV2YWxDb2RlQmxvY2spOgorICAgICAgICAoSlNDOjpKU0ds b2JhbE9iamVjdDo6Y3JlYXRlTW9kdWxlUHJvZ3JhbUNvZGVCbG9jayk6CisKIDIwMTYtMTEtMTEg IEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBKU0Mgc2hvdWxk IGRpc3Rpbmd1aXNoIGJldHdlZW4gbG9jYWwgYW5kIGdsb2JhbCBldmFsCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcGFyc2VyL1NvdXJjZUNvZGVLZXkuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1NvdXJjZUNvZGVLZXkuaAkocmV2aXNpb24gMjA4NzEw KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Tb3VyY2VDb2RlS2V5LmgJKHdvcmtp bmcgY29weSkKQEAgLTM4LDE0ICszOCwxMyBAQCBjbGFzcyBTb3VyY2VDb2RlRmxhZ3MgewogcHVi bGljOgogICAgIFNvdXJjZUNvZGVGbGFncygpID0gZGVmYXVsdDsKIAotICAgIFNvdXJjZUNvZGVG bGFncyhTb3VyY2VDb2RlVHlwZSBjb2RlVHlwZSwgSlNQYXJzZXJCdWlsdGluTW9kZSBidWlsdGlu TW9kZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUsIEpTUGFyc2VyU2NyaXB0TW9kZSBz Y3JpcHRNb2RlLCBEZXJpdmVkQ29udGV4dFR5cGUgZGVyaXZlZENvbnRleHRUeXBlLCBFdmFsQ29u dGV4dFR5cGUgZXZhbENvbnRleHRUeXBlLCBib29sIGlzQXJyb3dGdW5jdGlvbkNvbnRleHQpCisg ICAgU291cmNlQ29kZUZsYWdzKFNvdXJjZUNvZGVUeXBlIGNvZGVUeXBlLCBKU1BhcnNlclN0cmlj dE1vZGUgc3RyaWN0TW9kZSwgSlNQYXJzZXJTY3JpcHRNb2RlIHNjcmlwdE1vZGUsIERlcml2ZWRD b250ZXh0VHlwZSBkZXJpdmVkQ29udGV4dFR5cGUsIEV2YWxDb250ZXh0VHlwZSBldmFsQ29udGV4 dFR5cGUsIGJvb2wgaXNBcnJvd0Z1bmN0aW9uQ29udGV4dCkKICAgICAgICAgOiBtX2ZsYWdzKAog ICAgICAgICAgICAgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihzY3JpcHRNb2RlKSA8PCA4KSB8CiAg ICAgICAgICAgICAoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGlzQXJyb3dGdW5jdGlvbkNvbnRleHQp IDw8IDcpIHwKICAgICAgICAgICAgIChzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZXZhbENvbnRleHRU eXBlKSA8PCA2KSB8CiAgICAgICAgICAgICAoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGRlcml2ZWRD b250ZXh0VHlwZSkgPDwgNCkgfAogICAgICAgICAgICAgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihj b2RlVHlwZSkgPDwgMikgfAotICAgICAgICAgICAgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihidWls dGluTW9kZSkgPDwgMSkgfAogICAgICAgICAgICAgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihzdHJp Y3RNb2RlKSkKICAgICAgICAgKQogICAgIHsKQEAgLTY2LDEwICs2NSwxMCBAQCBwdWJsaWM6CiAg ICAgewogICAgIH0KIAotICAgIFNvdXJjZUNvZGVLZXkoY29uc3QgU291cmNlQ29kZSYgc291cmNl Q29kZSwgY29uc3QgU3RyaW5nJiBuYW1lLCBTb3VyY2VDb2RlVHlwZSBjb2RlVHlwZSwgSlNQYXJz ZXJCdWlsdGluTW9kZSBidWlsdGluTW9kZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUs IEpTUGFyc2VyU2NyaXB0TW9kZSBzY3JpcHRNb2RlLCBEZXJpdmVkQ29udGV4dFR5cGUgZGVyaXZl ZENvbnRleHRUeXBlLCBFdmFsQ29udGV4dFR5cGUgZXZhbENvbnRleHRUeXBlLCBib29sIGlzQXJy b3dGdW5jdGlvbkNvbnRleHQpCisgICAgU291cmNlQ29kZUtleShjb25zdCBTb3VyY2VDb2RlJiBz b3VyY2VDb2RlLCBjb25zdCBTdHJpbmcmIG5hbWUsIFNvdXJjZUNvZGVUeXBlIGNvZGVUeXBlLCBK U1BhcnNlclN0cmljdE1vZGUgc3RyaWN0TW9kZSwgSlNQYXJzZXJTY3JpcHRNb2RlIHNjcmlwdE1v ZGUsIERlcml2ZWRDb250ZXh0VHlwZSBkZXJpdmVkQ29udGV4dFR5cGUsIEV2YWxDb250ZXh0VHlw ZSBldmFsQ29udGV4dFR5cGUsIGJvb2wgaXNBcnJvd0Z1bmN0aW9uQ29udGV4dCkKICAgICAgICAg OiBtX3NvdXJjZUNvZGUoc291cmNlQ29kZSkKICAgICAgICAgLCBtX25hbWUobmFtZSkKLSAgICAg ICAgLCBtX2ZsYWdzKGNvZGVUeXBlLCBidWlsdGluTW9kZSwgc3RyaWN0TW9kZSwgc2NyaXB0TW9k ZSwgZGVyaXZlZENvbnRleHRUeXBlLCBldmFsQ29udGV4dFR5cGUsIGlzQXJyb3dGdW5jdGlvbkNv bnRleHQpCisgICAgICAgICwgbV9mbGFncyhjb2RlVHlwZSwgc3RyaWN0TW9kZSwgc2NyaXB0TW9k ZSwgZGVyaXZlZENvbnRleHRUeXBlLCBldmFsQ29udGV4dFR5cGUsIGlzQXJyb3dGdW5jdGlvbkNv bnRleHQpCiAgICAgICAgICwgbV9oYXNoKHNvdXJjZUNvZGUuaGFzaCgpKQogICAgIHsKICAgICB9 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvZGVDYWNoZS5jcHAJKHJl dmlzaW9uIDIwODcxMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvZGVDYWNo ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDExICs0OSwxMSBAQCB2b2lkIENvZGVDYWNoZU1h cDo6cHJ1bmVTbG93Q2FzZSgpCiB9CiAKIHRlbXBsYXRlIDxjbGFzcyBVbmxpbmtlZENvZGVCbG9j a1R5cGUsIGNsYXNzIEV4ZWN1dGFibGVUeXBlPgotVW5saW5rZWRDb2RlQmxvY2tUeXBlKiBDb2Rl Q2FjaGU6OmdldFVubGlua2VkR2xvYmFsQ29kZUJsb2NrKFZNJiB2bSwgRXhlY3V0YWJsZVR5cGUq IGV4ZWN1dGFibGUsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgSlNQYXJzZXJCdWlsdGluTW9k ZSBidWlsdGluTW9kZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUsIEpTUGFyc2VyU2Ny aXB0TW9kZSBzY3JpcHRNb2RlLCBEZWJ1Z2dlck1vZGUgZGVidWdnZXJNb2RlLCBQYXJzZXJFcnJv ciYgZXJyb3IsIEV2YWxDb250ZXh0VHlwZSBldmFsQ29udGV4dFR5cGUpCitVbmxpbmtlZENvZGVC bG9ja1R5cGUqIENvZGVDYWNoZTo6Z2V0VW5saW5rZWRHbG9iYWxDb2RlQmxvY2soVk0mIHZtLCBF eGVjdXRhYmxlVHlwZSogZXhlY3V0YWJsZSwgY29uc3QgU291cmNlQ29kZSYgc291cmNlLCBKU1Bh cnNlclN0cmljdE1vZGUgc3RyaWN0TW9kZSwgSlNQYXJzZXJTY3JpcHRNb2RlIHNjcmlwdE1vZGUs IERlYnVnZ2VyTW9kZSBkZWJ1Z2dlck1vZGUsIFBhcnNlckVycm9yJiBlcnJvciwgRXZhbENvbnRl eHRUeXBlIGV2YWxDb250ZXh0VHlwZSkKIHsKICAgICBEZXJpdmVkQ29udGV4dFR5cGUgZGVyaXZl ZENvbnRleHRUeXBlID0gZXhlY3V0YWJsZS0+ZGVyaXZlZENvbnRleHRUeXBlKCk7CiAgICAgYm9v bCBpc0Fycm93RnVuY3Rpb25Db250ZXh0ID0gZXhlY3V0YWJsZS0+aXNBcnJvd0Z1bmN0aW9uQ29u dGV4dCgpOwotICAgIFNvdXJjZUNvZGVLZXkga2V5KHNvdXJjZSwgU3RyaW5nKCksIENhY2hlVHlw ZXM8VW5saW5rZWRDb2RlQmxvY2tUeXBlPjo6Y29kZVR5cGUsIGJ1aWx0aW5Nb2RlLCBzdHJpY3RN b2RlLCBzY3JpcHRNb2RlLCBkZXJpdmVkQ29udGV4dFR5cGUsIGV2YWxDb250ZXh0VHlwZSwgaXNB cnJvd0Z1bmN0aW9uQ29udGV4dCk7CisgICAgU291cmNlQ29kZUtleSBrZXkoc291cmNlLCBTdHJp bmcoKSwgQ2FjaGVUeXBlczxVbmxpbmtlZENvZGVCbG9ja1R5cGU+Ojpjb2RlVHlwZSwgc3RyaWN0 TW9kZSwgc2NyaXB0TW9kZSwgZGVyaXZlZENvbnRleHRUeXBlLCBldmFsQ29udGV4dFR5cGUsIGlz QXJyb3dGdW5jdGlvbkNvbnRleHQpOwogICAgIFNvdXJjZUNvZGVWYWx1ZSogY2FjaGUgPSBtX3Nv dXJjZUNvZGUuZmluZENhY2hlQW5kVXBkYXRlQWdlKGtleSk7CiAgICAgYm9vbCBjYW5DYWNoZSA9 IGRlYnVnZ2VyTW9kZSA9PSBEZWJ1Z2dlck9mZiAmJiAhdm0udHlwZVByb2ZpbGVyKCkgJiYgIXZt LmNvbnRyb2xGbG93UHJvZmlsZXIoKSAmJiBPcHRpb25zOjp1c2VDb2RlQ2FjaGUoKTsKICAgICBp ZiAoY2FjaGUgJiYgY2FuQ2FjaGUpIHsKQEAgLTcwLDcgKzcwLDcgQEAgVW5saW5rZWRDb2RlQmxv Y2tUeXBlKiBDb2RlQ2FjaGU6OmdldFVubAogICAgIH0KICAgICAKICAgICBWYXJpYWJsZUVudmly b25tZW50IHZhcmlhYmxlc1VuZGVyVERaOwotICAgIFVubGlua2VkQ29kZUJsb2NrVHlwZSogdW5s aW5rZWRDb2RlQmxvY2sgPSBnZW5lcmF0ZVVubGlua2VkQ29kZUJsb2NrPFVubGlua2VkQ29kZUJs b2NrVHlwZSwgRXhlY3V0YWJsZVR5cGU+KHZtLCBleGVjdXRhYmxlLCBzb3VyY2UsIGJ1aWx0aW5N b2RlLCBzdHJpY3RNb2RlLCBzY3JpcHRNb2RlLCBkZWJ1Z2dlck1vZGUsIGVycm9yLCBldmFsQ29u dGV4dFR5cGUsICZ2YXJpYWJsZXNVbmRlclREWik7CisgICAgVW5saW5rZWRDb2RlQmxvY2tUeXBl KiB1bmxpbmtlZENvZGVCbG9jayA9IGdlbmVyYXRlVW5saW5rZWRDb2RlQmxvY2s8VW5saW5rZWRD b2RlQmxvY2tUeXBlLCBFeGVjdXRhYmxlVHlwZT4odm0sIGV4ZWN1dGFibGUsIHNvdXJjZSwgc3Ry aWN0TW9kZSwgc2NyaXB0TW9kZSwgZGVidWdnZXJNb2RlLCBlcnJvciwgZXZhbENvbnRleHRUeXBl LCAmdmFyaWFibGVzVW5kZXJURFopOwogCiAgICAgaWYgKHVubGlua2VkQ29kZUJsb2NrICYmIGNh bkNhY2hlKQogICAgICAgICBtX3NvdXJjZUNvZGUuYWRkQ2FjaGUoa2V5LCBTb3VyY2VDb2RlVmFs dWUodm0sIHVubGlua2VkQ29kZUJsb2NrLCBtX3NvdXJjZUNvZGUuYWdlKCkpKTsKQEAgLTc4LDE5 ICs3OCwxOSBAQCBVbmxpbmtlZENvZGVCbG9ja1R5cGUqIENvZGVDYWNoZTo6Z2V0VW5sCiAgICAg cmV0dXJuIHVubGlua2VkQ29kZUJsb2NrOwogfQogCi1VbmxpbmtlZFByb2dyYW1Db2RlQmxvY2sq IENvZGVDYWNoZTo6Z2V0VW5saW5rZWRQcm9ncmFtQ29kZUJsb2NrKFZNJiB2bSwgUHJvZ3JhbUV4 ZWN1dGFibGUqIGV4ZWN1dGFibGUsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgSlNQYXJzZXJC dWlsdGluTW9kZSBidWlsdGluTW9kZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUsIERl YnVnZ2VyTW9kZSBkZWJ1Z2dlck1vZGUsIFBhcnNlckVycm9yJiBlcnJvcikKK1VubGlua2VkUHJv Z3JhbUNvZGVCbG9jayogQ29kZUNhY2hlOjpnZXRVbmxpbmtlZFByb2dyYW1Db2RlQmxvY2soVk0m IHZtLCBQcm9ncmFtRXhlY3V0YWJsZSogZXhlY3V0YWJsZSwgY29uc3QgU291cmNlQ29kZSYgc291 cmNlLCBKU1BhcnNlclN0cmljdE1vZGUgc3RyaWN0TW9kZSwgRGVidWdnZXJNb2RlIGRlYnVnZ2Vy TW9kZSwgUGFyc2VyRXJyb3ImIGVycm9yKQogewotICAgIHJldHVybiBnZXRVbmxpbmtlZEdsb2Jh bENvZGVCbG9jazxVbmxpbmtlZFByb2dyYW1Db2RlQmxvY2s+KHZtLCBleGVjdXRhYmxlLCBzb3Vy Y2UsIGJ1aWx0aW5Nb2RlLCBzdHJpY3RNb2RlLCBKU1BhcnNlclNjcmlwdE1vZGU6OkNsYXNzaWMs IGRlYnVnZ2VyTW9kZSwgZXJyb3IsIEV2YWxDb250ZXh0VHlwZTo6Tm9uZSk7CisgICAgcmV0dXJu IGdldFVubGlua2VkR2xvYmFsQ29kZUJsb2NrPFVubGlua2VkUHJvZ3JhbUNvZGVCbG9jaz4odm0s IGV4ZWN1dGFibGUsIHNvdXJjZSwgc3RyaWN0TW9kZSwgSlNQYXJzZXJTY3JpcHRNb2RlOjpDbGFz c2ljLCBkZWJ1Z2dlck1vZGUsIGVycm9yLCBFdmFsQ29udGV4dFR5cGU6Ok5vbmUpOwogfQogCi1V bmxpbmtlZEV2YWxDb2RlQmxvY2sqIENvZGVDYWNoZTo6Z2V0VW5saW5rZWRHbG9iYWxFdmFsQ29k ZUJsb2NrKFZNJiB2bSwgSW5kaXJlY3RFdmFsRXhlY3V0YWJsZSogZXhlY3V0YWJsZSwgY29uc3Qg U291cmNlQ29kZSYgc291cmNlLCBKU1BhcnNlckJ1aWx0aW5Nb2RlIGJ1aWx0aW5Nb2RlLCBKU1Bh cnNlclN0cmljdE1vZGUgc3RyaWN0TW9kZSwgRGVidWdnZXJNb2RlIGRlYnVnZ2VyTW9kZSwgUGFy c2VyRXJyb3ImIGVycm9yLCBFdmFsQ29udGV4dFR5cGUgZXZhbENvbnRleHRUeXBlKQorVW5saW5r ZWRFdmFsQ29kZUJsb2NrKiBDb2RlQ2FjaGU6OmdldFVubGlua2VkR2xvYmFsRXZhbENvZGVCbG9j ayhWTSYgdm0sIEluZGlyZWN0RXZhbEV4ZWN1dGFibGUqIGV4ZWN1dGFibGUsIGNvbnN0IFNvdXJj ZUNvZGUmIHNvdXJjZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUsIERlYnVnZ2VyTW9k ZSBkZWJ1Z2dlck1vZGUsIFBhcnNlckVycm9yJiBlcnJvciwgRXZhbENvbnRleHRUeXBlIGV2YWxD b250ZXh0VHlwZSkKIHsKLSAgICByZXR1cm4gZ2V0VW5saW5rZWRHbG9iYWxDb2RlQmxvY2s8VW5s aW5rZWRFdmFsQ29kZUJsb2NrPih2bSwgZXhlY3V0YWJsZSwgc291cmNlLCBidWlsdGluTW9kZSwg c3RyaWN0TW9kZSwgSlNQYXJzZXJTY3JpcHRNb2RlOjpDbGFzc2ljLCBkZWJ1Z2dlck1vZGUsIGVy cm9yLCBldmFsQ29udGV4dFR5cGUpOworICAgIHJldHVybiBnZXRVbmxpbmtlZEdsb2JhbENvZGVC bG9jazxVbmxpbmtlZEV2YWxDb2RlQmxvY2s+KHZtLCBleGVjdXRhYmxlLCBzb3VyY2UsIHN0cmlj dE1vZGUsIEpTUGFyc2VyU2NyaXB0TW9kZTo6Q2xhc3NpYywgZGVidWdnZXJNb2RlLCBlcnJvciwg ZXZhbENvbnRleHRUeXBlKTsKIH0KIAotVW5saW5rZWRNb2R1bGVQcm9ncmFtQ29kZUJsb2NrKiBD b2RlQ2FjaGU6OmdldFVubGlua2VkTW9kdWxlUHJvZ3JhbUNvZGVCbG9jayhWTSYgdm0sIE1vZHVs ZVByb2dyYW1FeGVjdXRhYmxlKiBleGVjdXRhYmxlLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2Us IEpTUGFyc2VyQnVpbHRpbk1vZGUgYnVpbHRpbk1vZGUsIERlYnVnZ2VyTW9kZSBkZWJ1Z2dlck1v ZGUsIFBhcnNlckVycm9yJiBlcnJvcikKK1VubGlua2VkTW9kdWxlUHJvZ3JhbUNvZGVCbG9jayog Q29kZUNhY2hlOjpnZXRVbmxpbmtlZE1vZHVsZVByb2dyYW1Db2RlQmxvY2soVk0mIHZtLCBNb2R1 bGVQcm9ncmFtRXhlY3V0YWJsZSogZXhlY3V0YWJsZSwgY29uc3QgU291cmNlQ29kZSYgc291cmNl LCBEZWJ1Z2dlck1vZGUgZGVidWdnZXJNb2RlLCBQYXJzZXJFcnJvciYgZXJyb3IpCiB7Ci0gICAg cmV0dXJuIGdldFVubGlua2VkR2xvYmFsQ29kZUJsb2NrPFVubGlua2VkTW9kdWxlUHJvZ3JhbUNv ZGVCbG9jaz4odm0sIGV4ZWN1dGFibGUsIHNvdXJjZSwgYnVpbHRpbk1vZGUsIEpTUGFyc2VyU3Ry aWN0TW9kZTo6U3RyaWN0LCBKU1BhcnNlclNjcmlwdE1vZGU6Ok1vZHVsZSwgZGVidWdnZXJNb2Rl LCBlcnJvciwgRXZhbENvbnRleHRUeXBlOjpOb25lKTsKKyAgICByZXR1cm4gZ2V0VW5saW5rZWRH bG9iYWxDb2RlQmxvY2s8VW5saW5rZWRNb2R1bGVQcm9ncmFtQ29kZUJsb2NrPih2bSwgZXhlY3V0 YWJsZSwgc291cmNlLCBKU1BhcnNlclN0cmljdE1vZGU6OlN0cmljdCwgSlNQYXJzZXJTY3JpcHRN b2RlOjpNb2R1bGUsIGRlYnVnZ2VyTW9kZSwgZXJyb3IsIEV2YWxDb250ZXh0VHlwZTo6Tm9uZSk7 CiB9CiAKIFVubGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlKiBDb2RlQ2FjaGU6OmdldFVubGlua2Vk R2xvYmFsRnVuY3Rpb25FeGVjdXRhYmxlKFZNJiB2bSwgY29uc3QgSWRlbnRpZmllciYgbmFtZSwg Y29uc3QgU291cmNlQ29kZSYgc291cmNlLCBQYXJzZXJFcnJvciYgZXJyb3IpCkBAIC05OCw3ICs5 OCw2IEBAIFVubGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlKiBDb2RlQ2FjaGU6OmcKICAgICBib29s IGlzQXJyb3dGdW5jdGlvbkNvbnRleHQgPSBmYWxzZTsKICAgICBTb3VyY2VDb2RlS2V5IGtleSgK ICAgICAgICAgc291cmNlLCBuYW1lLnN0cmluZygpLCBTb3VyY2VDb2RlVHlwZTo6RnVuY3Rpb25U eXBlLAotICAgICAgICBKU1BhcnNlckJ1aWx0aW5Nb2RlOjpOb3RCdWlsdGluLAogICAgICAgICBK U1BhcnNlclN0cmljdE1vZGU6Ok5vdFN0cmljdCwKICAgICAgICAgSlNQYXJzZXJTY3JpcHRNb2Rl OjpDbGFzc2ljLAogICAgICAgICBEZXJpdmVkQ29udGV4dFR5cGU6Ok5vbmUsCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db2RlQ2FjaGUuaAkocmV2aXNpb24gMjA4NzEyKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29kZUNhY2hlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE5MywxNiArMTkzLDE2IEBAIHByaXZhdGU6CiBjbGFzcyBDb2RlQ2FjaGUgewogICAg IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIFVubGlua2VkUHJvZ3JhbUNv ZGVCbG9jayogZ2V0VW5saW5rZWRQcm9ncmFtQ29kZUJsb2NrKFZNJiwgUHJvZ3JhbUV4ZWN1dGFi bGUqLCBjb25zdCBTb3VyY2VDb2RlJiwgSlNQYXJzZXJCdWlsdGluTW9kZSwgSlNQYXJzZXJTdHJp Y3RNb2RlLCBEZWJ1Z2dlck1vZGUsIFBhcnNlckVycm9yJik7Ci0gICAgVW5saW5rZWRFdmFsQ29k ZUJsb2NrKiBnZXRVbmxpbmtlZEdsb2JhbEV2YWxDb2RlQmxvY2soVk0mLCBJbmRpcmVjdEV2YWxF eGVjdXRhYmxlKiwgY29uc3QgU291cmNlQ29kZSYsIEpTUGFyc2VyQnVpbHRpbk1vZGUsIEpTUGFy c2VyU3RyaWN0TW9kZSwgRGVidWdnZXJNb2RlLCBQYXJzZXJFcnJvciYsIEV2YWxDb250ZXh0VHlw ZSk7Ci0gICAgVW5saW5rZWRNb2R1bGVQcm9ncmFtQ29kZUJsb2NrKiBnZXRVbmxpbmtlZE1vZHVs ZVByb2dyYW1Db2RlQmxvY2soVk0mLCBNb2R1bGVQcm9ncmFtRXhlY3V0YWJsZSosIGNvbnN0IFNv dXJjZUNvZGUmLCBKU1BhcnNlckJ1aWx0aW5Nb2RlLCBEZWJ1Z2dlck1vZGUsIFBhcnNlckVycm9y Jik7CisgICAgVW5saW5rZWRQcm9ncmFtQ29kZUJsb2NrKiBnZXRVbmxpbmtlZFByb2dyYW1Db2Rl QmxvY2soVk0mLCBQcm9ncmFtRXhlY3V0YWJsZSosIGNvbnN0IFNvdXJjZUNvZGUmLCBKU1BhcnNl clN0cmljdE1vZGUsIERlYnVnZ2VyTW9kZSwgUGFyc2VyRXJyb3ImKTsKKyAgICBVbmxpbmtlZEV2 YWxDb2RlQmxvY2sqIGdldFVubGlua2VkR2xvYmFsRXZhbENvZGVCbG9jayhWTSYsIEluZGlyZWN0 RXZhbEV4ZWN1dGFibGUqLCBjb25zdCBTb3VyY2VDb2RlJiwgSlNQYXJzZXJTdHJpY3RNb2RlLCBE ZWJ1Z2dlck1vZGUsIFBhcnNlckVycm9yJiwgRXZhbENvbnRleHRUeXBlKTsKKyAgICBVbmxpbmtl ZE1vZHVsZVByb2dyYW1Db2RlQmxvY2sqIGdldFVubGlua2VkTW9kdWxlUHJvZ3JhbUNvZGVCbG9j ayhWTSYsIE1vZHVsZVByb2dyYW1FeGVjdXRhYmxlKiwgY29uc3QgU291cmNlQ29kZSYsIERlYnVn Z2VyTW9kZSwgUGFyc2VyRXJyb3ImKTsKICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSog Z2V0VW5saW5rZWRHbG9iYWxGdW5jdGlvbkV4ZWN1dGFibGUoVk0mLCBjb25zdCBJZGVudGlmaWVy JiwgY29uc3QgU291cmNlQ29kZSYsIFBhcnNlckVycm9yJik7CiAKICAgICB2b2lkIGNsZWFyKCkg eyBtX3NvdXJjZUNvZGUuY2xlYXIoKTsgfQogCiBwcml2YXRlOgogICAgIHRlbXBsYXRlIDxjbGFz cyBVbmxpbmtlZENvZGVCbG9ja1R5cGUsIGNsYXNzIEV4ZWN1dGFibGVUeXBlPiAKLSAgICBVbmxp bmtlZENvZGVCbG9ja1R5cGUqIGdldFVubGlua2VkR2xvYmFsQ29kZUJsb2NrKFZNJiwgRXhlY3V0 YWJsZVR5cGUqLCBjb25zdCBTb3VyY2VDb2RlJiwgSlNQYXJzZXJCdWlsdGluTW9kZSwgSlNQYXJz ZXJTdHJpY3RNb2RlLCBKU1BhcnNlclNjcmlwdE1vZGUsIERlYnVnZ2VyTW9kZSwgUGFyc2VyRXJy b3ImLCBFdmFsQ29udGV4dFR5cGUpOworICAgIFVubGlua2VkQ29kZUJsb2NrVHlwZSogZ2V0VW5s aW5rZWRHbG9iYWxDb2RlQmxvY2soVk0mLCBFeGVjdXRhYmxlVHlwZSosIGNvbnN0IFNvdXJjZUNv ZGUmLCBKU1BhcnNlclN0cmljdE1vZGUsIEpTUGFyc2VyU2NyaXB0TW9kZSwgRGVidWdnZXJNb2Rl LCBQYXJzZXJFcnJvciYsIEV2YWxDb250ZXh0VHlwZSk7CiAKICAgICBDb2RlQ2FjaGVNYXAgbV9z b3VyY2VDb2RlOwogfTsKQEAgLTIyOCwxMiArMjI4LDEyIEBAIHRlbXBsYXRlIDw+IHN0cnVjdCBD YWNoZVR5cGVzPFVubGlua2VkTW8KIH07CiAKIHRlbXBsYXRlIDxjbGFzcyBVbmxpbmtlZENvZGVC bG9ja1R5cGUsIGNsYXNzIEV4ZWN1dGFibGVUeXBlPgotVW5saW5rZWRDb2RlQmxvY2tUeXBlKiBn ZW5lcmF0ZVVubGlua2VkQ29kZUJsb2NrKFZNJiB2bSwgRXhlY3V0YWJsZVR5cGUqIGV4ZWN1dGFi bGUsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgSlNQYXJzZXJCdWlsdGluTW9kZSBidWlsdGlu TW9kZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUsIEpTUGFyc2VyU2NyaXB0TW9kZSBz Y3JpcHRNb2RlLCBEZWJ1Z2dlck1vZGUgZGVidWdnZXJNb2RlLCBQYXJzZXJFcnJvciYgZXJyb3Is IEV2YWxDb250ZXh0VHlwZSBldmFsQ29udGV4dFR5cGUsIGNvbnN0IFZhcmlhYmxlRW52aXJvbm1l bnQqIHZhcmlhYmxlc1VuZGVyVERaKQorVW5saW5rZWRDb2RlQmxvY2tUeXBlKiBnZW5lcmF0ZVVu bGlua2VkQ29kZUJsb2NrKFZNJiB2bSwgRXhlY3V0YWJsZVR5cGUqIGV4ZWN1dGFibGUsIGNvbnN0 IFNvdXJjZUNvZGUmIHNvdXJjZSwgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUsIEpTUGFy c2VyU2NyaXB0TW9kZSBzY3JpcHRNb2RlLCBEZWJ1Z2dlck1vZGUgZGVidWdnZXJNb2RlLCBQYXJz ZXJFcnJvciYgZXJyb3IsIEV2YWxDb250ZXh0VHlwZSBldmFsQ29udGV4dFR5cGUsIGNvbnN0IFZh cmlhYmxlRW52aXJvbm1lbnQqIHZhcmlhYmxlc1VuZGVyVERaKQogewogICAgIHR5cGVkZWYgdHlw ZW5hbWUgQ2FjaGVUeXBlczxVbmxpbmtlZENvZGVCbG9ja1R5cGU+OjpSb290Tm9kZSBSb290Tm9k ZTsKICAgICBEZXJpdmVkQ29udGV4dFR5cGUgZGVyaXZlZENvbnRleHRUeXBlID0gZXhlY3V0YWJs ZS0+ZGVyaXZlZENvbnRleHRUeXBlKCk7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFJvb3ROb2RlPiBy b290Tm9kZSA9IHBhcnNlPFJvb3ROb2RlPigKLSAgICAgICAgJnZtLCBzb3VyY2UsIElkZW50aWZp ZXIoKSwgYnVpbHRpbk1vZGUsIHN0cmljdE1vZGUsIHNjcmlwdE1vZGUsIENhY2hlVHlwZXM8VW5s aW5rZWRDb2RlQmxvY2tUeXBlPjo6cGFyc2VNb2RlLCBTdXBlckJpbmRpbmc6Ok5vdE5lZWRlZCwg ZXJyb3IsIG51bGxwdHIsIENvbnN0cnVjdG9yS2luZDo6Tm9uZSwgZGVyaXZlZENvbnRleHRUeXBl LCBldmFsQ29udGV4dFR5cGUpOworICAgICAgICAmdm0sIHNvdXJjZSwgSWRlbnRpZmllcigpLCBK U1BhcnNlckJ1aWx0aW5Nb2RlOjpOb3RCdWlsdGluLCBzdHJpY3RNb2RlLCBzY3JpcHRNb2RlLCBD YWNoZVR5cGVzPFVubGlua2VkQ29kZUJsb2NrVHlwZT46OnBhcnNlTW9kZSwgU3VwZXJCaW5kaW5n OjpOb3ROZWVkZWQsIGVycm9yLCBudWxscHRyLCBDb25zdHJ1Y3RvcktpbmQ6Ok5vbmUsIGRlcml2 ZWRDb250ZXh0VHlwZSwgZXZhbENvbnRleHRUeXBlKTsKICAgICBpZiAoIXJvb3ROb2RlKQogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNHbG9iYWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAkocmV2aXNpb24gMjA4NzEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMzIwLDcgKzEzMjAsNyBAQCBVbmxpbmtlZFByb2dyYW1Db2RlQmxvY2sqIEpTR2xvYmFs T2JqZWN0CiAgICAgSlNQYXJzZXJTdHJpY3RNb2RlIHN0cmljdE1vZGUgPSBleGVjdXRhYmxlLT5p c1N0cmljdE1vZGUoKSA/IEpTUGFyc2VyU3RyaWN0TW9kZTo6U3RyaWN0IDogSlNQYXJzZXJTdHJp Y3RNb2RlOjpOb3RTdHJpY3Q7CiAgICAgRGVidWdnZXJNb2RlIGRlYnVnZ2VyTW9kZSA9IGhhc0lu dGVyYWN0aXZlRGVidWdnZXIoKSA/IERlYnVnZ2VyT24gOiBEZWJ1Z2dlck9mZjsKICAgICBVbmxp bmtlZFByb2dyYW1Db2RlQmxvY2sqIHVubGlua2VkQ29kZUJsb2NrID0gdm0oKS5jb2RlQ2FjaGUo KS0+Z2V0VW5saW5rZWRQcm9ncmFtQ29kZUJsb2NrKAotICAgICAgICB2bSgpLCBleGVjdXRhYmxl LCBleGVjdXRhYmxlLT5zb3VyY2UoKSwgSlNQYXJzZXJCdWlsdGluTW9kZTo6Tm90QnVpbHRpbiwg c3RyaWN0TW9kZSwgCisgICAgICAgIHZtKCksIGV4ZWN1dGFibGUsIGV4ZWN1dGFibGUtPnNvdXJj ZSgpLCBzdHJpY3RNb2RlLCAKICAgICAgICAgZGVidWdnZXJNb2RlLCBlcnJvcik7CiAKICAgICBp ZiAoaGFzRGVidWdnZXIoKSkKQEAgLTEzNDYsNyArMTM0Niw3IEBAIFVubGlua2VkRXZhbENvZGVC bG9jayogSlNHbG9iYWxPYmplY3Q6OmMKIAogICAgIC8vIFdlIGRvbid0IGJvdGhlciB3aXRoIENv ZGVDYWNoZSBoZXJlIGJlY2F1c2UgbG9jYWwgZXZhbCB1c2VzIGEgc3BlY2lhbGl6ZWQgRXZhbENv ZGVDYWNoZS4KICAgICBVbmxpbmtlZEV2YWxDb2RlQmxvY2sqIHVubGlua2VkQ29kZUJsb2NrID0g Z2VuZXJhdGVVbmxpbmtlZENvZGVCbG9jazxVbmxpbmtlZEV2YWxDb2RlQmxvY2s+KAotICAgICAg ICB2bSwgZXhlY3V0YWJsZSwgZXhlY3V0YWJsZS0+c291cmNlKCksIEpTUGFyc2VyQnVpbHRpbk1v ZGU6Ok5vdEJ1aWx0aW4sIHN0cmljdE1vZGUsIEpTUGFyc2VyU2NyaXB0TW9kZTo6Q2xhc3NpYywg ZGVidWdnZXJNb2RlLCBlcnJvciwgZXZhbENvbnRleHRUeXBlLCB2YXJpYWJsZXNVbmRlclREWik7 CisgICAgICAgIHZtLCBleGVjdXRhYmxlLCBleGVjdXRhYmxlLT5zb3VyY2UoKSwgc3RyaWN0TW9k ZSwgSlNQYXJzZXJTY3JpcHRNb2RlOjpDbGFzc2ljLCBkZWJ1Z2dlck1vZGUsIGVycm9yLCBldmFs Q29udGV4dFR5cGUsIHZhcmlhYmxlc1VuZGVyVERaKTsKIAogICAgIGlmIChoYXNEZWJ1Z2dlcigp KQogICAgICAgICBkZWJ1Z2dlcigpLT5zb3VyY2VQYXJzZWQoY2FsbEZyYW1lLCBleGVjdXRhYmxl LT5zb3VyY2UoKS5wcm92aWRlcigpLCBlcnJvci5saW5lKCksIGVycm9yLm1lc3NhZ2UoKSk7CkBA IC0xMzcwLDcgKzEzNzAsNyBAQCBVbmxpbmtlZEV2YWxDb2RlQmxvY2sqIEpTR2xvYmFsT2JqZWN0 OjpjCiAgICAgRXZhbENvbnRleHRUeXBlIGV2YWxDb250ZXh0VHlwZSA9IGV4ZWN1dGFibGUtPmV4 ZWN1dGFibGVJbmZvKCkuZXZhbENvbnRleHRUeXBlKCk7CiAgICAgCiAgICAgVW5saW5rZWRFdmFs Q29kZUJsb2NrKiB1bmxpbmtlZENvZGVCbG9jayA9IHZtLmNvZGVDYWNoZSgpLT5nZXRVbmxpbmtl ZEdsb2JhbEV2YWxDb2RlQmxvY2soCi0gICAgICAgIHZtLCBleGVjdXRhYmxlLCBleGVjdXRhYmxl LT5zb3VyY2UoKSwgSlNQYXJzZXJCdWlsdGluTW9kZTo6Tm90QnVpbHRpbiwgc3RyaWN0TW9kZSwg ZGVidWdnZXJNb2RlLCBlcnJvciwgZXZhbENvbnRleHRUeXBlKTsKKyAgICAgICAgdm0sIGV4ZWN1 dGFibGUsIGV4ZWN1dGFibGUtPnNvdXJjZSgpLCBzdHJpY3RNb2RlLCBkZWJ1Z2dlck1vZGUsIGVy cm9yLCBldmFsQ29udGV4dFR5cGUpOwogCiAgICAgaWYgKGhhc0RlYnVnZ2VyKCkpCiAgICAgICAg IGRlYnVnZ2VyKCktPnNvdXJjZVBhcnNlZChjYWxsRnJhbWUsIGV4ZWN1dGFibGUtPnNvdXJjZSgp LnByb3ZpZGVyKCksIGVycm9yLmxpbmUoKSwgZXJyb3IubWVzc2FnZSgpKTsKQEAgLTEzOTEsNyAr MTM5MSw3IEBAIFVubGlua2VkTW9kdWxlUHJvZ3JhbUNvZGVCbG9jayogSlNHbG9iYWwKICAgICBQ YXJzZXJFcnJvciBlcnJvcjsKICAgICBEZWJ1Z2dlck1vZGUgZGVidWdnZXJNb2RlID0gaGFzSW50 ZXJhY3RpdmVEZWJ1Z2dlcigpID8gRGVidWdnZXJPbiA6IERlYnVnZ2VyT2ZmOwogICAgIFVubGlu a2VkTW9kdWxlUHJvZ3JhbUNvZGVCbG9jayogdW5saW5rZWRDb2RlQmxvY2sgPSB2bS5jb2RlQ2Fj aGUoKS0+Z2V0VW5saW5rZWRNb2R1bGVQcm9ncmFtQ29kZUJsb2NrKAotICAgICAgICB2bSwgZXhl Y3V0YWJsZSwgZXhlY3V0YWJsZS0+c291cmNlKCksIEpTUGFyc2VyQnVpbHRpbk1vZGU6Ok5vdEJ1 aWx0aW4sIGRlYnVnZ2VyTW9kZSwgZXJyb3IpOworICAgICAgICB2bSwgZXhlY3V0YWJsZSwgZXhl Y3V0YWJsZS0+c291cmNlKCksIGRlYnVnZ2VyTW9kZSwgZXJyb3IpOwogCiAgICAgaWYgKGhhc0Rl YnVnZ2VyKCkpCiAgICAgICAgIGRlYnVnZ2VyKCktPnNvdXJjZVBhcnNlZChjYWxsRnJhbWUsIGV4 ZWN1dGFibGUtPnNvdXJjZSgpLnByb3ZpZGVyKCksIGVycm9yLmxpbmUoKSwgZXJyb3IubWVzc2Fn ZSgpKTsK