147348 2015-07-27 19:09:07 -0700 Web Inspector: Type profiler return types aren't showing up 2015-08-17 15:57:35 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 saam saam commit-queue oldest_to_newest 1112647 0 saam 2015-07-27 19:09:07 -0700 The JSC patch that changed text offsets to start from the open paren of the parameter list instead of the open brace of the function body broke the type profiler's protocol. 1112651 1 257626 saam 2015-07-27 19:16:16 -0700 Created attachment 257626 patch 1112809 2 257626 joepeck 2015-07-28 12:30:16 -0700 Comment on attachment 257626 patch View in context: https://bugs.webkit.org/attachment.cgi?id=257626&action=review > Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js:179 > - divot: node.body.range[0] > + divot: node.isGetterOrSetter ? node.getterOrSetterRange[0] : node.range[0] // "f" in function, "s" in set, "g" in get, first letter in any method name for classes. Is this compatible with iOS 9 (a soon to be considered Legacy backend that wouldn't have had your recent backend changes). If not, maybe we should make this a function so that it would be easier to read. Something like: function functionReturnDivot(node) { // COMPATIBILITY (iOS 9): Legacy Backends something something something. // FIXME: Need a better way to determine backend versions. Using DOM.pseudoElement because that was added after iOS 9. if (!DOMAgent.hasEvent("pseudoElementAdded")) return node.body.range[0]; // "f" in function, "s" in set, "g" in get, first letter in any method name for classes. return node.isGetterOrSetter ? node.getterOrSetterRange[0] : node.range[0]; } Would be good to have a frontend test for this so it won't regress again in the future. But I won't make you write one now. 1118226 3 259178 saam 2015-08-17 13:40:29 -0700 Created attachment 259178 patch 1118242 4 259178 mattbaker 2015-08-17 14:33:17 -0700 Comment on attachment 259178 patch View in context: https://bugs.webkit.org/attachment.cgi?id=259178&action=review > Source/WebInspectorUI/ChangeLog:8 > + Bug #145995 changed the starting offset of a function to Nit: We typically use the form <https://webkit.org/b/xxxxxx> when referencing bugs in the WebInspector change log. 1118245 5 259178 bburg 2015-08-17 14:38:27 -0700 Comment on attachment 259178 patch r=me 1118279 6 259178 commit-queue 2015-08-17 15:57:31 -0700 Comment on attachment 259178 patch Clearing flags on attachment: 259178 Committed r188549: <http://trac.webkit.org/changeset/188549> 1118280 7 commit-queue 2015-08-17 15:57:35 -0700 All reviewed patches have been landed. Closing bug. 257626 2015-07-27 19:16:16 -0700 2015-08-17 13:40:29 -0700 patch patch.diff text/plain 5669 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg3NDc0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE1LTA3LTI3ICBTYWFtIGJhcmF0aSAgPHNhYW1iYXJhdGkxQGdtYWlsLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBUeXBlIHByb2ZpbGVyIHJldHVybiB0eXBlcyBhcmVuJ3Qgc2hv d2luZyB1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ3MzQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QnVnICMxNDU5OTUgY2hhbmdlZCB0aGUgc3RhcnRpbmcgb2Zmc2V0IG9mIGEgZnVuY3Rpb24gdG8g CisgICAgICAgIGJlIHRoZSBvcGVuIHBhcmVudGhlc2lzIG9mIHRoZSBmdW5jdGlvbidzIHBhcmFt ZXRlciBsaXN0LgorICAgICAgICBUaGlzIGJyb2tlIEpTQydzIHR5cGUgcHJvZmlsZXIgcHJvdG9j b2wgb2YgY29tbXVuaWNhdGluZyAKKyAgICAgICAgcmV0dXJuIHR5cGVzIG9mIGEgZnVuY3Rpb24g dG8gdGhlIHdlYiBpbnNwZWN0b3IuIFRoaXMKKyAgICAgICAgaXMgbm93IGZpeGVkLiBUaGUgdGV4 dCBvZmZzZXQgdXNlZCBpbiB0aGUgcHJvdG9jb2wgaXMgbm93CisgICAgICAgIHRoZSBmaXJzdCBs ZXR0ZXIgb2YgdGhlIGZ1bmN0aW9uL2dldC9zZXQvbWV0aG9kIG5hbWUuCisgICAgICAgIFNvICJm IiBpbiAiZnVuY3Rpb24gYSgpIHt9IiwgInMiIGluICJzZXQgZm9vKCl7fSIsIGV0Yy4KKworICAg ICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6 ZHVtcEJ5dGVjb2RlKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpDb2RlQmxvY2spOgorICAg ICAgICAqIGpzYy5jcHA6CisgICAgICAgIChmdW5jdGlvblJldHVyblR5cGVGb3IpOgorCiAyMDE1 LTA3LTI3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgVXNlIE5pbmphIG9uIFdpbmRvd3MuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv anNjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkocmV2 aXNpb24gMTg3Mzg1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTExNDcsNyArMTE0Nyw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwg ZnVuY3Rpb25SZXQKICAgICBSRUxFQVNFX0FTU0VSVChmdW5jdGlvblZhbHVlLmlzRnVuY3Rpb24o KSk7CiAgICAgRnVuY3Rpb25FeGVjdXRhYmxlKiBleGVjdXRhYmxlID0gKGpzRHluYW1pY0Nhc3Q8 SlNGdW5jdGlvbio+KGZ1bmN0aW9uVmFsdWUuYXNDZWxsKCktPmdldE9iamVjdCgpKSktPmpzRXhl Y3V0YWJsZSgpOwogCi0gICAgdW5zaWduZWQgb2Zmc2V0ID0gZXhlY3V0YWJsZS0+c291cmNlKCku c3RhcnRPZmZzZXQoKTsKKyAgICB1bnNpZ25lZCBvZmZzZXQgPSBleGVjdXRhYmxlLT50eXBlUHJv ZmlsaW5nU3RhcnRPZmZzZXQoKTsKICAgICBTdHJpbmcganNvblN0cmluZyA9IGV4ZWMtPnZtKCku dHlwZVByb2ZpbGVyKCktPnR5cGVJbmZvcm1hdGlvbkZvckV4cHJlc3Npb25BdE9mZnNldChUeXBl UHJvZmlsZXJTZWFyY2hEZXNjcmlwdG9yRnVuY3Rpb25SZXR1cm4sIG9mZnNldCwgZXhlY3V0YWJs ZS0+c291cmNlSUQoKSwgZXhlYy0+dm0oKSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShK U09OUGFyc2UoZXhlYywganNvblN0cmluZykpOwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE4NzM4NSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMTI3LDkgKzIxMjcsOSBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhTY3JpcHRFeGVjdXRhYmxl KiBvCiAgICAgICAgICAgICAgICAgICAgIC8vIEJlY2F1c2UgYSByZXR1cm4gc3RhdGVtZW50IGNh biBiZSBhZGRlZCBpbXBsaWNpdGx5IHRvIHJldHVybiB1bmRlZmluZWQgYXQgdGhlIGVuZCBvZiBh IGZ1bmN0aW9uLAogICAgICAgICAgICAgICAgICAgICAvLyBhbmQgdGhlc2Ugbm9kZXMgZG9uJ3Qg ZW1pdCBleHByZXNzaW9uIHJhbmdlcyBiZWNhdXNlIHRoZXkgYXJlbid0IGluIHRoZSBhY3R1YWwg c291cmNlIHRleHQgb2YKICAgICAgICAgICAgICAgICAgICAgLy8gdGhlIHVzZXIncyBwcm9ncmFt LCBnaXZlIHRoZSB0eXBlIHByb2ZpbGVyIHNvbWUgcmFuZ2UgdG8gaWRlbnRpZnkgdGhlc2UgcmV0 dXJuIHN0YXRlbWVudHMuCi0gICAgICAgICAgICAgICAgICAgIC8vIEN1cnJlbnRseSwgdGhlIHRl eHQgb2Zmc2V0IHRoYXQgaXMgdXNlZCBhcyBpZGVudGlmaWNhdGlvbiBpcyBvbiB0aGUgb3BlbiBi cmFjZSBvZiB0aGUgZnVuY3Rpb24gCisgICAgICAgICAgICAgICAgICAgIC8vIEN1cnJlbnRseSwg dGhlIHRleHQgb2Zmc2V0IHRoYXQgaXMgdXNlZCBhcyBpZGVudGlmaWNhdGlvbiBpcyAiZiIgaW4g dGhlIGZ1bmN0aW9uIGtleXdvcmQKICAgICAgICAgICAgICAgICAgICAgLy8gYW5kIGlzIHN0b3Jl ZCBvbiBUeXBlTG9jYXRpb24ncyBtX2Rpdm90Rm9yRnVuY3Rpb25PZmZzZXRJZlJldHVyblN0YXRl bWVudCBtZW1iZXIgdmFyaWFibGUuCi0gICAgICAgICAgICAgICAgICAgIGRpdm90U3RhcnQgPSBk aXZvdEVuZCA9IG1fc291cmNlT2Zmc2V0OworICAgICAgICAgICAgICAgICAgICBkaXZvdFN0YXJ0 ID0gZGl2b3RFbmQgPSBtX293bmVyRXhlY3V0YWJsZS0+dHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0 KCk7CiAgICAgICAgICAgICAgICAgICAgIHNob3VsZEFuYWx5emUgPSB0cnVlOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTIxNDIsNyArMjE0Miw3IEBAIENv ZGVCbG9jazo6Q29kZUJsb2NrKFNjcmlwdEV4ZWN1dGFibGUqIG8KICAgICAgICAgICAgIGJvb2wg aXNOZXdMb2NhdGlvbiA9IGxvY2F0aW9uUGFpci5zZWNvbmQ7CiAKICAgICAgICAgICAgIGlmIChm bGFnID09IFByb2ZpbGVUeXBlQnl0ZWNvZGVGdW5jdGlvblJldHVyblN0YXRlbWVudCkKLSAgICAg ICAgICAgICAgICBsb2NhdGlvbi0+bV9kaXZvdEZvckZ1bmN0aW9uT2Zmc2V0SWZSZXR1cm5TdGF0 ZW1lbnQgPSBtX3NvdXJjZU9mZnNldDsKKyAgICAgICAgICAgICAgICBsb2NhdGlvbi0+bV9kaXZv dEZvckZ1bmN0aW9uT2Zmc2V0SWZSZXR1cm5TdGF0ZW1lbnQgPSBtX293bmVyRXhlY3V0YWJsZS0+ dHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0KCk7CiAKICAgICAgICAgICAgIGlmIChzaG91bGRBbmFs eXplICYmIGlzTmV3TG9jYXRpb24pCiAgICAgICAgICAgICAgICAgdm0oKS0+dHlwZVByb2ZpbGVy KCktPmluc2VydE5ld0xvY2F0aW9uKGxvY2F0aW9uKTsKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZwkocmV2aXNpb24gMTg3NDc0KQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA3LTI3ICBTYWFtIGJhcmF0 aSAgPHNhYW1iYXJhdGkxQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBUeXBl IHByb2ZpbGVyIHJldHVybiB0eXBlcyBhcmVuJ3Qgc2hvd2luZyB1cAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MzQ4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnICMxNDU5OTUgY2hhbmdlZCB0aGUg c3RhcnRpbmcgb2Zmc2V0IG9mIGEgZnVuY3Rpb24gdG8gCisgICAgICAgIGJlIHRoZSBvcGVuIHBh cmVudGhlc2lzIG9mIHRoZSBmdW5jdGlvbidzIHBhcmFtZXRlciBsaXN0LgorICAgICAgICBUaGlz IGJyb2tlIHRoZSB0eXBlIHByb2ZpbGVyJ3MgdGV4dCBvZmZzZXQgYmFzZWQgcHJvdG9jb2wgd2l0 aCBKU0MuCisgICAgICAgIFRoZSB0ZXh0IG9mZnNldCB1c2VkIGluIHRoZSBwcm90b2NvbCBpcyBu b3cgdGhlIGZpcnN0IGxldHRlciBvZiB0aGUgCisgICAgICAgIGZ1bmN0aW9uL2dldC9zZXQvbWV0 aG9kIG5hbWUuICBTbyAiZiIgaW4gImZ1bmN0aW9uIGEoKSB7fSIsICJzIiBpbiAic2V0IGZvbygp e30iLCBldGMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRTeW50YXhU cmVlLmpzOgorCiAyMDE1LTA3LTI3ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGlja2luZyBhIGZyYW1lIGluIHRoZSBSZW5kZXJp bmcgRnJhbWVzIHRpbWVsaW5lIHNob3VsZCBzZWxlY3QgdGhlIGNvcnJlc3BvbmRpbmcgZ3JpZCBy b3cKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3Jp cHRTeW50YXhUcmVlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9TY3JpcHRTeW50YXhUcmVlLmpzCShyZXZpc2lvbiAxODczODUpCisr KyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0U3ludGF4 VHJlZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMTc2LDcgKzE3Niw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRTeW50YXhUcmVlID0gY2xhc3MgU2MKICAgICAgICAgICAgICAgICBhbGxSZXF1ZXN0cy5w dXNoKHsKICAgICAgICAgICAgICAgICAgICAgdHlwZUluZm9ybWF0aW9uRGVzY3JpcHRvcjogV2Vi SW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuVHlwZVByb2ZpbGVyU2VhcmNoRGVzY3JpcHRvci5G dW5jdGlvblJldHVybiwKICAgICAgICAgICAgICAgICAgICAgc291cmNlSUQsCi0gICAgICAgICAg ICAgICAgICAgIGRpdm90OiBub2RlLmJvZHkucmFuZ2VbMF0KKyAgICAgICAgICAgICAgICAgICAg ZGl2b3Q6IG5vZGUuaXNHZXR0ZXJPclNldHRlciA/IG5vZGUuZ2V0dGVyT3JTZXR0ZXJSYW5nZVsw XSA6IG5vZGUucmFuZ2VbMF0gLy8gImYiIGluIGZ1bmN0aW9uLCAicyIgaW4gc2V0LCAiZyIgaW4g Z2V0LCBmaXJzdCBsZXR0ZXIgaW4gYW55IG1ldGhvZCBuYW1lIGZvciBjbGFzc2VzLgogICAgICAg ICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgIGFsbFJlcXVlc3ROb2Rlcy5wdXNoKG5vZGUp OwogICAgICAgICAgICAgICAgIGJyZWFrOwo= 259178 2015-08-17 13:40:29 -0700 2015-08-17 15:57:31 -0700 patch c-backup.diff text/plain 6888 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4NTM5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE1LTA4LTE3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFR5cGUgcHJvZmlsZXIgcmV0dXJuIHR5cGVzIGFyZW4ndCBzaG93aW5n IHVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcz NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcg IzE0NTk5NSBjaGFuZ2VkIHRoZSBzdGFydGluZyBvZmZzZXQgb2YgYSBmdW5jdGlvbiB0byAKKyAg ICAgICAgYmUgdGhlIG9wZW4gcGFyZW50aGVzaXMgb2YgdGhlIGZ1bmN0aW9uJ3MgcGFyYW1ldGVy IGxpc3QuCisgICAgICAgIFRoaXMgYnJva2UgSlNDJ3MgdHlwZSBwcm9maWxlciBwcm90b2NvbCBv ZiBjb21tdW5pY2F0aW5nIAorICAgICAgICByZXR1cm4gdHlwZXMgb2YgYSBmdW5jdGlvbiB0byB0 aGUgd2ViIGluc3BlY3Rvci4gVGhpcworICAgICAgICBpcyBub3cgZml4ZWQuIFRoZSB0ZXh0IG9m ZnNldCB1c2VkIGluIHRoZSBwcm90b2NvbCBpcyBub3cKKyAgICAgICAgdGhlIGZpcnN0IGxldHRl ciBvZiB0aGUgZnVuY3Rpb24vZ2V0L3NldC9tZXRob2QgbmFtZS4KKyAgICAgICAgU28gImYiIGlu ICJmdW5jdGlvbiBhKCkge30iLCAicyIgaW4gInNldCBmb28oKXt9IiwgZXRjLgorCisgICAgICAg ICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpDb2Rl QmxvY2spOgorICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChmdW5jdGlvblJldHVyblR5cGVG b3IpOgorCiAyMDE1LTA4LTE3ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29t PgogCiAgICAgICAgIFtFUzZdIEltcGxlbWVudCBSZWZsZWN0LmdldApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2pzYy5jcHAJKHJldmlzaW9uIDE4ODUzMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2Mu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUwLDcgKzExNTAsNyBAQCBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGZ1bmN0aW9uUmV0CiAgICAgUkVMRUFTRV9BU1NFUlQoZnVuY3Rpb25WYWx1 ZS5pc0Z1bmN0aW9uKCkpOwogICAgIEZ1bmN0aW9uRXhlY3V0YWJsZSogZXhlY3V0YWJsZSA9IChq c0R5bmFtaWNDYXN0PEpTRnVuY3Rpb24qPihmdW5jdGlvblZhbHVlLmFzQ2VsbCgpLT5nZXRPYmpl Y3QoKSkpLT5qc0V4ZWN1dGFibGUoKTsKIAotICAgIHVuc2lnbmVkIG9mZnNldCA9IGV4ZWN1dGFi bGUtPnNvdXJjZSgpLnN0YXJ0T2Zmc2V0KCk7CisgICAgdW5zaWduZWQgb2Zmc2V0ID0gZXhlY3V0 YWJsZS0+dHlwZVByb2ZpbGluZ1N0YXJ0T2Zmc2V0KCk7CiAgICAgU3RyaW5nIGpzb25TdHJpbmcg PSBleGVjLT52bSgpLnR5cGVQcm9maWxlcigpLT50eXBlSW5mb3JtYXRpb25Gb3JFeHByZXNzaW9u QXRPZmZzZXQoVHlwZVByb2ZpbGVyU2VhcmNoRGVzY3JpcHRvckZ1bmN0aW9uUmV0dXJuLCBvZmZz ZXQsIGV4ZWN1dGFibGUtPnNvdXJjZUlEKCksIGV4ZWMtPnZtKCkpOwogICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoSlNPTlBhcnNlKGV4ZWMsIGpzb25TdHJpbmcpKTsKIH0KSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCShyZXZpc2lvbiAxODg1 MzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjA4OSw5ICsyMDg5LDkgQEAgQ29kZUJsb2NrOjpDb2RlQmxvY2soU2Ny aXB0RXhlY3V0YWJsZSogbwogICAgICAgICAgICAgICAgICAgICAvLyBCZWNhdXNlIGEgcmV0dXJu IHN0YXRlbWVudCBjYW4gYmUgYWRkZWQgaW1wbGljaXRseSB0byByZXR1cm4gdW5kZWZpbmVkIGF0 IHRoZSBlbmQgb2YgYSBmdW5jdGlvbiwKICAgICAgICAgICAgICAgICAgICAgLy8gYW5kIHRoZXNl IG5vZGVzIGRvbid0IGVtaXQgZXhwcmVzc2lvbiByYW5nZXMgYmVjYXVzZSB0aGV5IGFyZW4ndCBp biB0aGUgYWN0dWFsIHNvdXJjZSB0ZXh0IG9mCiAgICAgICAgICAgICAgICAgICAgIC8vIHRoZSB1 c2VyJ3MgcHJvZ3JhbSwgZ2l2ZSB0aGUgdHlwZSBwcm9maWxlciBzb21lIHJhbmdlIHRvIGlkZW50 aWZ5IHRoZXNlIHJldHVybiBzdGF0ZW1lbnRzLgotICAgICAgICAgICAgICAgICAgICAvLyBDdXJy ZW50bHksIHRoZSB0ZXh0IG9mZnNldCB0aGF0IGlzIHVzZWQgYXMgaWRlbnRpZmljYXRpb24gaXMg b24gdGhlIG9wZW4gYnJhY2Ugb2YgdGhlIGZ1bmN0aW9uIAorICAgICAgICAgICAgICAgICAgICAv LyBDdXJyZW50bHksIHRoZSB0ZXh0IG9mZnNldCB0aGF0IGlzIHVzZWQgYXMgaWRlbnRpZmljYXRp b24gaXMgImYiIGluIHRoZSBmdW5jdGlvbiBrZXl3b3JkCiAgICAgICAgICAgICAgICAgICAgIC8v IGFuZCBpcyBzdG9yZWQgb24gVHlwZUxvY2F0aW9uJ3MgbV9kaXZvdEZvckZ1bmN0aW9uT2Zmc2V0 SWZSZXR1cm5TdGF0ZW1lbnQgbWVtYmVyIHZhcmlhYmxlLgotICAgICAgICAgICAgICAgICAgICBk aXZvdFN0YXJ0ID0gZGl2b3RFbmQgPSBtX3NvdXJjZU9mZnNldDsKKyAgICAgICAgICAgICAgICAg ICAgZGl2b3RTdGFydCA9IGRpdm90RW5kID0gbV9vd25lckV4ZWN1dGFibGUtPnR5cGVQcm9maWxp bmdTdGFydE9mZnNldCgpOwogICAgICAgICAgICAgICAgICAgICBzaG91bGRBbmFseXplID0gdHJ1 ZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0yMTA0LDcg KzIxMDQsNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhTY3JpcHRFeGVjdXRhYmxlKiBvCiAgICAg ICAgICAgICBib29sIGlzTmV3TG9jYXRpb24gPSBsb2NhdGlvblBhaXIuc2Vjb25kOwogCiAgICAg ICAgICAgICBpZiAoZmxhZyA9PSBQcm9maWxlVHlwZUJ5dGVjb2RlRnVuY3Rpb25SZXR1cm5TdGF0 ZW1lbnQpCi0gICAgICAgICAgICAgICAgbG9jYXRpb24tPm1fZGl2b3RGb3JGdW5jdGlvbk9mZnNl dElmUmV0dXJuU3RhdGVtZW50ID0gbV9zb3VyY2VPZmZzZXQ7CisgICAgICAgICAgICAgICAgbG9j YXRpb24tPm1fZGl2b3RGb3JGdW5jdGlvbk9mZnNldElmUmV0dXJuU3RhdGVtZW50ID0gbV9vd25l ckV4ZWN1dGFibGUtPnR5cGVQcm9maWxpbmdTdGFydE9mZnNldCgpOwogCiAgICAgICAgICAgICBp ZiAoc2hvdWxkQW5hbHl6ZSAmJiBpc05ld0xvY2F0aW9uKQogICAgICAgICAgICAgICAgIHZtKCkt PnR5cGVQcm9maWxlcigpLT5pbnNlcnROZXdMb2NhdGlvbihsb2NhdGlvbik7CkluZGV4OiBTb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNw ZWN0b3JVSS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODUzOSkKKysrIFNvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxNS0wOC0x NyAgU2FhbSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBUeXBlIHByb2ZpbGVyIHJldHVybiB0eXBlcyBhcmVuJ3Qgc2hvd2luZyB1cAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MzQ4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnICMxNDU5OTUgY2hh bmdlZCB0aGUgc3RhcnRpbmcgb2Zmc2V0IG9mIGEgZnVuY3Rpb24gdG8gCisgICAgICAgIGJlIHRo ZSBvcGVuIHBhcmVudGhlc2lzIG9mIHRoZSBmdW5jdGlvbidzIHBhcmFtZXRlciBsaXN0LgorICAg ICAgICBUaGlzIGJyb2tlIHRoZSB0eXBlIHByb2ZpbGVyJ3MgdGV4dCBvZmZzZXQgYmFzZWQgcHJv dG9jb2wgd2l0aCBKU0MuCisgICAgICAgIFRoZSB0ZXh0IG9mZnNldCB1c2VkIGluIHRoZSBwcm90 b2NvbCBpcyBub3cgdGhlIGZpcnN0IGxldHRlciBvZiB0aGUgCisgICAgICAgIGZ1bmN0aW9uL2dl dC9zZXQvbWV0aG9kIG5hbWUuICBTbyAiZiIgaW4gImZ1bmN0aW9uIGEoKSB7fSIsICJzIiBpbiAi c2V0IGZvbygpe30iLCBldGMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9TY3Jp cHRTeW50YXhUcmVlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUu cHJvdG90eXBlLmNvbnRhaW5zTm9uRW1wdHlSZXR1cm5TdGF0ZW1lbnQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuZnVuY3Rpb25SZXR1cm5EaXZvdCk6CisKIDIwMTUt MDgtMTcgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogbG9hZCBQcm90b2NvbFRlc3RTdHViIGZyb20gdGhlIFdlYkluc3BlY3RvclVJIGJ1bmRs ZQpJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Njcmlw dFN5bnRheFRyZWUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL1NjcmlwdFN5bnRheFRyZWUuanMJKHJldmlzaW9uIDE4ODUzMikKKysr IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRTeW50YXhU cmVlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYsNiArMTQ2LDIzIEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRTeW50YXhUcmVlID0gY2xhc3MgU2MKICAgICAgICAgcmV0dXJuIGhhc05vbkVtcHR5UmV0 dXJuU3RhdGVtZW50OwogICAgIH0KIAorICAgIHN0YXRpYyBmdW5jdGlvblJldHVybkRpdm90KG5v ZGUpCisgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydCgKKyAgICAgICAgICAgIG5vZGUudHlw ZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuTm9kZVR5cGUuRnVuY3Rpb25EZWNs YXJhdGlvbiAKKyAgICAgICAgICAgIHx8IG5vZGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlw dFN5bnRheFRyZWUuTm9kZVR5cGUuRnVuY3Rpb25FeHByZXNzaW9uIAorICAgICAgICAgICAgfHwg bm9kZS50eXBlID09PSBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5Ob2RlVHlwZS5NZXRo b2REZWZpbml0aW9uKTsKKworICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgOSk6IExlZ2Fj eSBCYWNrZW5kcyB2aWV3IHRoZSByZXR1cm4gdHlwZSBhcyBiZWluZyB0aGUgb3BlbmluZyAieyIg b2YgdGhlIGZ1bmN0aW9uIGJvZHkuIAorICAgICAgICAvLyBBZnRlciBpT1MgOSwgdGhpcyBpcyB0 byBtb3ZlIHRvIHRoZSBzdGFydCBvZiB0aGUgZnVuY3Rpb24gc3RhdGVtZW50L2V4cHJlc3Npb24u IFNlZSBiZWxvdzoKKyAgICAgICAgLy8gRklYTUU6IE5lZWQgYSBiZXR0ZXIgd2F5IHRvIGRldGVy bWluZSBiYWNrZW5kIHZlcnNpb25zLiBVc2luZyBET00ucHNldWRvRWxlbWVudCBiZWNhdXNlIHRo YXQgd2FzIGFkZGVkIGFmdGVyIGlPUyA5LgorICAgICAgICBpZiAoIURPTUFnZW50Lmhhc0V2ZW50 KCJwc2V1ZG9FbGVtZW50QWRkZWQiKSkKKyAgICAgICAgICAgIHJldHVybiBub2RlLmJvZHkucmFu Z2VbMF07CisKKyAgICAgICAgLy8gImYiIGluIGZ1bmN0aW9uLCAicyIgaW4gc2V0LCAiZyIgaW4g Z2V0LCBmaXJzdCBsZXR0ZXIgaW4gYW55IG1ldGhvZCBuYW1lIGZvciBjbGFzc2VzLgorICAgICAg ICByZXR1cm4gbm9kZS5pc0dldHRlck9yU2V0dGVyID8gbm9kZS5nZXR0ZXJPclNldHRlclJhbmdl WzBdIDogbm9kZS5yYW5nZVswXTsKKyAgICB9CisKICAgICB1cGRhdGVUeXBlcyhub2Rlc1RvVXBk YXRlLCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KFJ1bnRpbWVBZ2Vu dC5nZXRSdW50aW1lVHlwZXNGb3JWYXJpYWJsZXNBdE9mZnNldHMpOwpAQCAtMTczLDEwICsxOTAs MTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUgPSBjbGFzcyBTYwogICAgICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogCisKICAgICAgICAgICAgICAgICBhbGxS ZXF1ZXN0cy5wdXNoKHsKICAgICAgICAgICAgICAgICAgICAgdHlwZUluZm9ybWF0aW9uRGVzY3Jp cHRvcjogV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuVHlwZVByb2ZpbGVyU2VhcmNoRGVz Y3JpcHRvci5GdW5jdGlvblJldHVybiwKICAgICAgICAgICAgICAgICAgICAgc291cmNlSUQsCi0g ICAgICAgICAgICAgICAgICAgIGRpdm90OiBub2RlLmJvZHkucmFuZ2VbMF0KKyAgICAgICAgICAg ICAgICAgICAgZGl2b3Q6IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLmZ1bmN0aW9uUmV0 dXJuRGl2b3Qobm9kZSkKICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgICBhbGxS ZXF1ZXN0Tm9kZXMucHVzaChub2RlKTsKICAgICAgICAgICAgICAgICBicmVhazsK