155807 2016-03-23 14:10:57 -0700 [ES6] Add Proxy based tests for RegExp.prototype[@@match] 2016-03-24 09:13:45 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 155829 1 msaboff msaboff commit-queue keith_miller mark.lam saam webkit-bug-importer oldest_to_newest 1177466 0 msaboff 2016-03-23 14:10:57 -0700 In <https://bugs.webkit.org/show_bug.cgi?id=155711> after change set r198554 was landed, it was suggested that we add more Proxy based tests to verify standards conformance. This would include handling the semantics issue raise in this comment: > > Source/JavaScriptCore/builtins/RegExpPrototype.js:59 > > + if (regexp.exec !== @RegExp.prototype.@exec && typeof(regexp.exec) === "function") { > Also, I'm not sure this is correct. You're calling "get" twice here. That is > an observable > operation. It looks like RegExpExec only does this get once in the spec. 1177599 1 webkit-bug-importer 2016-03-23 21:23:24 -0700 <rdar://problem/25331854> 1177668 2 274831 msaboff 2016-03-24 07:34:04 -0700 Created attachment 274831 Patch 1177669 3 commit-queue 2016-03-24 07:36:41 -0700 Attachment 274831 did not pass style-queue: ERROR: Source/JavaScriptCore/tests/stress/regexp-match-proxy.js:102: Line contains tab character. [whitespace/tab] [5] ERROR: Source/JavaScriptCore/tests/stress/regexp-match-proxy.js:137: Line contains tab character. [whitespace/tab] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1177670 4 274832 msaboff 2016-03-24 07:42:16 -0700 Created attachment 274832 Updated Patch - Removed Tabs 1177673 5 274832 saam 2016-03-24 08:41:08 -0700 Comment on attachment 274832 Updated Patch - Removed Tabs r=me Does es6.yaml also need to be updated? 1177677 6 msaboff 2016-03-24 09:13:23 -0700 (In reply to comment #5) > Comment on attachment 274832 [details] > Updated Patch - Removed Tabs > > r=me > Does es6.yaml also need to be updated? Yes it does, so I'll do it before landing. 1177679 7 msaboff 2016-03-24 09:13:45 -0700 Committed r198625: <http://trac.webkit.org/changeset/198625> 274831 2016-03-24 07:34:04 -0700 2016-03-24 07:42:16 -0700 Patch 155807.patch text/plain 7761 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4NjI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE2LTAzLTI0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFtFUzZdIEFkZCBQcm94eSBiYXNlZCB0ZXN0cyBmb3IgUmVnRXhwLnByb3RvdHlwZVtAQG1h dGNoXQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1 ODA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk ZWQgbmV3IHRlc3QgdGhhdCB1c2VzIFByb3h5IHRvIHZlcmlmeSBSZWdFeHAucHJvdG90eXBlW0BA bWF0Y2hdIHByb2Nlc3NpbmcKKyAgICAgICAgY29uZm9ybXMgdG8gdGhlIEVTNiBzdGFuZGFyZAor CisgICAgICAgIE1vZGlmaWVkIGJ1aWx0aW4gUmVnRXhwLnByb3RvdHlwZVtAQG1hdGNoXSB0byBi ZSBFUzYgc3BlYyBjb25mb3JtYW50LgorCisgICAgICAgICogYnVpbHRpbnMvUmVnRXhwUHJvdG90 eXBlLmpzOgorICAgICAgICAobWF0Y2gpOgorICAgICAgICAqIHRlc3RzL3N0cmVzcy9yZWdleHAt bWF0Y2gtcHJveHkuanM6IEFkZGVkLgorICAgICAgICAoYXNzZXJ0KToKKyAgICAgICAgKGxldC5n ZXRQcm94eU51bGxFeGVjLm5ldy5Qcm94eSk6CisgICAgICAgIChsZXQuZ2V0U2V0UHJveHlOdWxs RXhlYy5uZXcuUHJveHkpOgorICAgICAgICAoZ2V0IHJlc2V0VHJhY2tpbmcpOgorICAgICAgICAo bGV0LmdldFNldFByb3h5TWF0Y2hlc19zLm5ldy5Qcm94eSk6CisgICAgICAgIChzZXQgZ2V0IGdl dFNldFByb3h5TnVsbEV4ZWMpOgorICAgICAgICAobGV0LmdldFNldFByb3h5TWF0Y2hlc190eF9H cmVlZHkubmV3LlByb3h5KToKKyAgICAgICAgKHNldCBnZXQgZ2V0U2V0UHJveHlNYXRjaGVzX3Mp OgorICAgICAgICAobGV0LmdldFNldFByb3h5TWF0Y2hlc1VuaWNvZGVfZGlnaXRfbm9uR3JlZWR5 Lm5ldy5Qcm94eSk6CisgICAgICAgIChzZXQgZ2V0IGdldFNldFByb3h5TWF0Y2hlc190eF9HcmVl ZHkpOgorCiAyMDE2LTAzLTI0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgog CiAgICAgICAgIFtFUzZdIEdyZWVkeSB1bmljb2RlIFJlZ0V4cCdzIGRvbid0IHByb3Blcmx5IGJh Y2t0cmFjayBwYXN0IG5vbiBCTVAgY2hhcmFjdGVycwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2J1aWx0aW5zL1JlZ0V4cFByb3RvdHlwZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnVpbHRpbnMvUmVnRXhwUHJvdG90eXBlLmpzCShyZXZpc2lvbiAxOTg2MjQp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvUmVnRXhwUHJvdG90eXBlLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC01MiwxNyArNTIsMTcgQEAgZnVuY3Rpb24gbWF0Y2goc3RyKQogICAg IGlmICghcmVnZXhwLmdsb2JhbCkKICAgICAgICAgcmV0dXJuIHJlZ2V4cC5leGVjKHN0cmluZ0Fy Zyk7CiAKKyAgICBsZXQgdW5pY29kZSA9IHJlZ2V4cC51bmljb2RlOwogICAgIHJlZ2V4cC5sYXN0 SW5kZXggPSAwOwotCiAgICAgbGV0IHJlc3VsdExpc3QgPSBbXTsKKyAgICBsZXQgZXhlY0Z1bmMg PSByZWdleHAuZXhlYzsKIAotICAgIGlmIChyZWdleHAuZXhlYyAhPT0gQFJlZ0V4cC5wcm90b3R5 cGUuQGV4ZWMgJiYgdHlwZW9mKHJlZ2V4cC5leGVjKSA9PT0gImZ1bmN0aW9uIikgeworICAgIGlm IChleGVjRnVuYyAhPT0gQFJlZ0V4cC5wcm90b3R5cGUuQGV4ZWMgJiYgdHlwZW9mIGV4ZWNGdW5j ID09PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgIC8vIE1hdGNoIHVzaW5nIHRoZSBvdmVycmlkZGVu IGV4ZWMuCi0gICAgICAgIGxldCB1bmljb2RlID0gcmVnZXhwLnVuaWNvZGU7Ci0gICAgICAgIGxl dCBzdHJpbmdMZW5ndGggPSBzdHIubGVuZ3RoOworICAgICAgICBsZXQgc3RyaW5nTGVuZ3RoID0g c3RyaW5nQXJnLmxlbmd0aDsKIAogICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAg bGV0IHJlc3VsdCA9IHJlZ2V4cC5leGVjKHN0cmluZ0FyZyk7CisgICAgICAgICAgICBsZXQgcmVz dWx0ID0gZXhlY0Z1bmMoc3RyaW5nQXJnKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYg KHJlc3VsdCA9PT0gbnVsbCkgewogICAgICAgICAgICAgICAgIGlmIChyZXN1bHRMaXN0Lmxlbmd0 aCA9PT0gMCkKQEAgLTgxLDYgKzgxLDggQEAgZnVuY3Rpb24gbWF0Y2goc3RyKQogICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICByZXN1bHRMaXN0LkBwdXNoKHJlc3VsdFN0cmluZyk7CisKKyAg ICAgICAgICAgIGV4ZWNGdW5jID0gcmVnZXhwLmV4ZWM7CiAgICAgICAgIH0KICAgICB9CiAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVnZXhwLW1hdGNoLXByb3h5 LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVn ZXhwLW1hdGNoLXByb3h5LmpzCShyZXZpc2lvbiAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3Rlc3RzL3N0cmVzcy9yZWdleHAtbWF0Y2gtcHJveHkuanMJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSwxNjYgQEAKK2Z1bmN0aW9uIGFzc2VydChhc3NlcnRpb24pIHsKKyAgICBpZiAodHlwZW9m IGFzc2VydGlvbiAhPSAic3RyaW5nIikKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJJbnZhbGlk IGFzc2VydGlvbi4iKTsKKworICAgIGxldCByZXN1bHQgPSBldmFsKGFzc2VydGlvbik7CisKKyAg ICBpZiAoIXJlc3VsdCkKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQgYXNzZXJ0aW9uOiAi ICsgYXNzZXJ0aW9uKTsKK30KKworbGV0IGdldCA9IFtdOworbGV0IHNldCA9IFtdOworbGV0IGdl dFNldCA9IFtdOworCitmdW5jdGlvbiByZXNldFRyYWNraW5nKCkKK3sKKyAgICBnZXQgPSBbXTsK KyAgICBzZXQgPSBbXTsKKyAgICBnZXRTZXQgPSBbXTsKK30KKworbGV0IGdldFByb3h5TnVsbEV4 ZWMgPSBuZXcgUHJveHkoeworICAgICAgICBleGVjOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICB9CisgICAgfSwgeworICAgICAgICBnZXQ6 IGZ1bmN0aW9uKG8sIGspCisgICAgICAgIHsKKyAgICAgICAgICAgIGdldC5wdXNoKGspOyByZXR1 cm4gb1trXTsKKyAgICAgICAgfQorICAgIH0pOworCityZXNldFRyYWNraW5nKCk7CitSZWdFeHAu cHJvdG90eXBlW1N5bWJvbC5tYXRjaF0uY2FsbChnZXRQcm94eU51bGxFeGVjKTsKK2Fzc2VydCgn Z2V0ID09ICJnbG9iYWwsZXhlYyInKTsKKworbGV0IGdldFNldFByb3h5TnVsbEV4ZWMgPSBuZXcg UHJveHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAgICAg ICAgICAgIHJldHVybiBudWxsOworICAgICAgICB9CisgICAgfSwgeworICAgICAgICBnZXQ6IGZ1 bmN0aW9uKG8sIGspCisgICAgICAgIHsKKyAgICAgICAgICAgIGdldC5wdXNoKGspOworICAgICAg ICAgICAgZ2V0U2V0LnB1c2goayk7CisgICAgICAgICAgICByZXR1cm4gb1trXTsKKyAgICAgICAg fSwKKyAgICAgICAgc2V0OiBmdW5jdGlvbihvLCBrLCB2KQorICAgICAgICB7CisgICAgICAgICAg ICBzZXQucHVzaChrKTsKKyAgICAgICAgICAgIGdldFNldC5wdXNoKGspOworICAgICAgICAgICAg b1trXSA9IHY7CisgICAgICAgIH0KKyAgICB9KTsKKworZ2V0U2V0UHJveHlOdWxsRXhlYy5nbG9i YWwgPSB0cnVlOworCityZXNldFRyYWNraW5nKCk7CitSZWdFeHAucHJvdG90eXBlW1N5bWJvbC5t YXRjaF0uY2FsbChnZXRTZXRQcm94eU51bGxFeGVjKTsKK2Fzc2VydCgnZ2V0ID09ICJnbG9iYWws dW5pY29kZSxleGVjIicpOworYXNzZXJ0KCdzZXQgPT0gImxhc3RJbmRleCInKTsKK2Fzc2VydCgn Z2V0U2V0ID09ICJnbG9iYWwsdW5pY29kZSxsYXN0SW5kZXgsZXhlYyInKTsKKworbGV0IHJlZ0V4 cEdsb2JhbF9zID0gbmV3IFJlZ0V4cCgicyIsICJnIik7CitsZXQgZ2V0U2V0UHJveHlNYXRjaGVz X3MgPSBuZXcgUHJveHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbihzdHJpbmcpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiByZWdFeHBHbG9iYWxfcy5leGVjKHN0cmluZyk7 CisgICAgICAgIH0KKyAgICB9LCB7CisgICAgICAgIGdldDogZnVuY3Rpb24obywgaykKKyAgICAg ICAgeworICAgICAgICAgICAgZ2V0LnB1c2goayk7CisgICAgICAgICAgICBnZXRTZXQucHVzaChr KTsKKyAgICAgICAgICAgIHJldHVybiBvW2tdOworICAgICAgICB9LAorICAgICAgICBzZXQ6IGZ1 bmN0aW9uKG8sIGssIHYpCisgICAgICAgIHsKKyAgICAgICAgICAgIHNldC5wdXNoKGspOworICAg ICAgICAgICAgZ2V0U2V0LnB1c2goayk7CisgICAgICAgICAgICBvW2tdID0gdjsKKyAgICAgICAg fQorICAgIH0pOworCitnZXRTZXRQcm94eU1hdGNoZXNfcy5nbG9iYWwgPSB0cnVlOworcmVzZXRU cmFja2luZygpOworbGV0IG1hdGNoUmVzdWx0ID0gUmVnRXhwLnByb3RvdHlwZVtTeW1ib2wubWF0 Y2hdLmNhbGwoZ2V0U2V0UHJveHlNYXRjaGVzX3MsICJUaGlzIGlzIGEgdGVzdCIpOworYXNzZXJ0 KCdtYXRjaFJlc3VsdCA9PSAicyxzLHMiJyk7Cithc3NlcnQoJ2dldCA9PSAiZ2xvYmFsLHVuaWNv ZGUsZXhlYyxleGVjLGV4ZWMsZXhlYyInKTsKK2Fzc2VydCgnc2V0ID09ICJsYXN0SW5kZXgiJyk7 Cithc3NlcnQoJ2dldFNldCA9PSAiZ2xvYmFsLHVuaWNvZGUsbGFzdEluZGV4LGV4ZWMsZXhlYyxl eGVjLGV4ZWMiJyk7CisKK2xldCByZWdFeHBHbG9iYWxfdHhfR3JlZWR5ID0gbmV3IFJlZ0V4cCgi W3R4XSoiLCAiZyIpOworbGV0IGdldFNldFByb3h5TWF0Y2hlc190eF9HcmVlZHkgPSBuZXcgUHJv eHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbihzdHJpbmcpCisgICAgICAgIHsKKwkg ICAgcmV0dXJuIHJlZ0V4cEdsb2JhbF90eF9HcmVlZHkuZXhlYyhzdHJpbmcpOworICAgICAgICB9 CisgICAgfSwgeworICAgICAgICBnZXQ6IGZ1bmN0aW9uKG8sIGspCisgICAgICAgIHsKKyAgICAg ICAgICAgIGdldC5wdXNoKGspOworICAgICAgICAgICAgZ2V0U2V0LnB1c2goayk7CisgICAgICAg ICAgICBpZiAoay50b1N0cmluZygpID09ICJsYXN0SW5kZXgiKQorICAgICAgICAgICAgICAgIHJl dHVybiByZWdFeHBHbG9iYWxfdHhfR3JlZWR5Lmxhc3RJbmRleDsKKyAgICAgICAgICAgIHJldHVy biBvW2tdOworICAgICAgICB9LAorICAgICAgICBzZXQ6IGZ1bmN0aW9uKG8sIGssIHYpCisgICAg ICAgIHsKKyAgICAgICAgICAgIHNldC5wdXNoKGspOworICAgICAgICAgICAgZ2V0U2V0LnB1c2go ayk7CisgICAgICAgICAgICBpZiAoay50b1N0cmluZygpID09ICJsYXN0SW5kZXgiKQorICAgICAg ICAgICAgICAgIHJlZ0V4cEdsb2JhbF90eF9HcmVlZHkubGFzdEluZGV4ID0gdjsKKyAgICAgICAg ICAgIG9ba10gPSB2OworICAgICAgICB9CisgICAgfSk7CisKK2dldFNldFByb3h5TWF0Y2hlc190 eF9HcmVlZHkuZ2xvYmFsID0gdHJ1ZTsKKworcmVzZXRUcmFja2luZygpOworbWF0Y2hSZXN1bHQg PSBSZWdFeHAucHJvdG90eXBlW1N5bWJvbC5tYXRjaF0uY2FsbChnZXRTZXRQcm94eU1hdGNoZXNf dHhfR3JlZWR5LCAidGVzdGluZyIpOworYXNzZXJ0KCdtYXRjaFJlc3VsdCA9PSAidCwsLHQsLCws IicpOworYXNzZXJ0KCdnZXQgPT0gImdsb2JhbCx1bmljb2RlLGV4ZWMsZXhlYyxsYXN0SW5kZXgs ZXhlYyxsYXN0SW5kZXgsZXhlYyxleGVjLGxhc3RJbmRleCxleGVjLGxhc3RJbmRleCxleGVjLGxh c3RJbmRleCxleGVjLGxhc3RJbmRleCxleGVjIicpOworYXNzZXJ0KCdzZXQgPT0gImxhc3RJbmRl eCxsYXN0SW5kZXgsbGFzdEluZGV4LGxhc3RJbmRleCxsYXN0SW5kZXgsbGFzdEluZGV4LGxhc3RJ bmRleCInKTsKK2Fzc2VydCgnZ2V0U2V0ID09ICJnbG9iYWwsdW5pY29kZSxsYXN0SW5kZXgsZXhl YyxleGVjLGxhc3RJbmRleCxsYXN0SW5kZXgsZXhlYyxsYXN0SW5kZXgsbGFzdEluZGV4LGV4ZWMs ZXhlYyxsYXN0SW5kZXgsbGFzdEluZGV4LGV4ZWMsbGFzdEluZGV4LGxhc3RJbmRleCxleGVjLGxh c3RJbmRleCxsYXN0SW5kZXgsZXhlYyxsYXN0SW5kZXgsbGFzdEluZGV4LGV4ZWMiJyk7CisKK2xl dCByZWdFeHBHbG9iYWxVbmljb2RlX2RpZ2l0X25vbkdyZWVkeSA9IG5ldyBSZWdFeHAoIlxcZHsw LDF9IiwgImd1Iik7CitsZXQgZ2V0U2V0UHJveHlNYXRjaGVzVW5pY29kZV9kaWdpdF9ub25HcmVl ZHkgPSBuZXcgUHJveHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbihzdHJpbmcpCisg ICAgICAgIHsKKwkgICAgcmV0dXJuIHJlZ0V4cEdsb2JhbFVuaWNvZGVfZGlnaXRfbm9uR3JlZWR5 LmV4ZWMoc3RyaW5nKTsKKyAgICAgICAgfQorICAgIH0sIHsKKyAgICAgICAgZ2V0OiBmdW5jdGlv bihvLCBrKQorICAgICAgICB7CisgICAgICAgICAgICBnZXQucHVzaChrKTsKKyAgICAgICAgICAg IGdldFNldC5wdXNoKGspOworICAgICAgICAgICAgaWYgKGsudG9TdHJpbmcoKSA9PSAibGFzdElu ZGV4IikKKyAgICAgICAgICAgICAgICByZXR1cm4gcmVnRXhwR2xvYmFsVW5pY29kZV9kaWdpdF9u b25HcmVlZHkubGFzdEluZGV4OworICAgICAgICAgICAgcmV0dXJuIG9ba107CisgICAgICAgIH0s CisgICAgICAgIHNldDogZnVuY3Rpb24obywgaywgdikKKyAgICAgICAgeworICAgICAgICAgICAg c2V0LnB1c2goayk7CisgICAgICAgICAgICBnZXRTZXQucHVzaChrKTsKKyAgICAgICAgICAgIGlm IChrLnRvU3RyaW5nKCkgPT0gImxhc3RJbmRleCIpCisgICAgICAgICAgICAgICAgcmVnRXhwR2xv YmFsVW5pY29kZV9kaWdpdF9ub25HcmVlZHkubGFzdEluZGV4ID0gdjsKKyAgICAgICAgICAgIG9b a10gPSB2OworICAgICAgICB9CisgICAgfSk7CisKK2dldFNldFByb3h5TWF0Y2hlc1VuaWNvZGVf ZGlnaXRfbm9uR3JlZWR5Lmdsb2JhbCA9IHRydWU7CitnZXRTZXRQcm94eU1hdGNoZXNVbmljb2Rl X2RpZ2l0X25vbkdyZWVkeS51bmljb2RlID0gdHJ1ZTsKKworcmVzZXRUcmFja2luZygpOworbWF0 Y2hSZXN1bHQgPSBSZWdFeHAucHJvdG90eXBlW1N5bWJvbC5tYXRjaF0uY2FsbChnZXRTZXRQcm94 eU1hdGNoZXNVbmljb2RlX2RpZ2l0X25vbkdyZWVkeSwgIjEyWDNcdXsxMDQwMH00Iik7Cithc3Nl cnQoJ21hdGNoUmVzdWx0ID09ICIxLDIsLDMsLDQsIicpOworYXNzZXJ0KCdnZXQgPT0gImdsb2Jh bCx1bmljb2RlLGV4ZWMsZXhlYyxleGVjLGxhc3RJbmRleCxleGVjLGV4ZWMsbGFzdEluZGV4LGV4 ZWMsZXhlYyxsYXN0SW5kZXgsZXhlYyInKTsKK2Fzc2VydCgnc2V0ID09ICJsYXN0SW5kZXgsbGFz dEluZGV4LGxhc3RJbmRleCxsYXN0SW5kZXgiJyk7Cithc3NlcnQoJ2dldFNldCA9PSAiZ2xvYmFs LHVuaWNvZGUsbGFzdEluZGV4LGV4ZWMsZXhlYyxleGVjLGxhc3RJbmRleCxsYXN0SW5kZXgsZXhl YyxleGVjLGxhc3RJbmRleCxsYXN0SW5kZXgsZXhlYyxleGVjLGxhc3RJbmRleCxsYXN0SW5kZXgs ZXhlYyInKTsK 274832 2016-03-24 07:42:16 -0700 2016-03-24 08:41:08 -0700 Updated Patch - Removed Tabs 155807-2.patch text/plain 7775 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4NjI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE2LTAzLTI0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFtFUzZdIEFkZCBQcm94eSBiYXNlZCB0ZXN0cyBmb3IgUmVnRXhwLnByb3RvdHlwZVtAQG1h dGNoXQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1 ODA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk ZWQgbmV3IHRlc3QgdGhhdCB1c2VzIFByb3h5IHRvIHZlcmlmeSBSZWdFeHAucHJvdG90eXBlW0BA bWF0Y2hdIHByb2Nlc3NpbmcKKyAgICAgICAgY29uZm9ybXMgdG8gdGhlIEVTNiBzdGFuZGFyZAor CisgICAgICAgIE1vZGlmaWVkIGJ1aWx0aW4gUmVnRXhwLnByb3RvdHlwZVtAQG1hdGNoXSB0byBi ZSBFUzYgc3BlYyBjb25mb3JtYW50LgorCisgICAgICAgICogYnVpbHRpbnMvUmVnRXhwUHJvdG90 eXBlLmpzOgorICAgICAgICAobWF0Y2gpOgorICAgICAgICAqIHRlc3RzL3N0cmVzcy9yZWdleHAt bWF0Y2gtcHJveHkuanM6IEFkZGVkLgorICAgICAgICAoYXNzZXJ0KToKKyAgICAgICAgKGxldC5n ZXRQcm94eU51bGxFeGVjLm5ldy5Qcm94eSk6CisgICAgICAgIChsZXQuZ2V0U2V0UHJveHlOdWxs RXhlYy5uZXcuUHJveHkpOgorICAgICAgICAoZ2V0IHJlc2V0VHJhY2tpbmcpOgorICAgICAgICAo bGV0LmdldFNldFByb3h5TWF0Y2hlc19zLm5ldy5Qcm94eSk6CisgICAgICAgIChzZXQgZ2V0IGdl dFNldFByb3h5TnVsbEV4ZWMpOgorICAgICAgICAobGV0LmdldFNldFByb3h5TWF0Y2hlc190eF9H cmVlZHkubmV3LlByb3h5KToKKyAgICAgICAgKHNldCBnZXQgZ2V0U2V0UHJveHlNYXRjaGVzX3Mp OgorICAgICAgICAobGV0LmdldFNldFByb3h5TWF0Y2hlc1VuaWNvZGVfZGlnaXRfbm9uR3JlZWR5 Lm5ldy5Qcm94eSk6CisgICAgICAgIChzZXQgZ2V0IGdldFNldFByb3h5TWF0Y2hlc190eF9HcmVl ZHkpOgorCiAyMDE2LTAzLTI0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgog CiAgICAgICAgIFtFUzZdIEdyZWVkeSB1bmljb2RlIFJlZ0V4cCdzIGRvbid0IHByb3Blcmx5IGJh Y2t0cmFjayBwYXN0IG5vbiBCTVAgY2hhcmFjdGVycwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2J1aWx0aW5zL1JlZ0V4cFByb3RvdHlwZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnVpbHRpbnMvUmVnRXhwUHJvdG90eXBlLmpzCShyZXZpc2lvbiAxOTg2MjQp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvUmVnRXhwUHJvdG90eXBlLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC01MiwxNyArNTIsMTcgQEAgZnVuY3Rpb24gbWF0Y2goc3RyKQogICAg IGlmICghcmVnZXhwLmdsb2JhbCkKICAgICAgICAgcmV0dXJuIHJlZ2V4cC5leGVjKHN0cmluZ0Fy Zyk7CiAKKyAgICBsZXQgdW5pY29kZSA9IHJlZ2V4cC51bmljb2RlOwogICAgIHJlZ2V4cC5sYXN0 SW5kZXggPSAwOwotCiAgICAgbGV0IHJlc3VsdExpc3QgPSBbXTsKKyAgICBsZXQgZXhlY0Z1bmMg PSByZWdleHAuZXhlYzsKIAotICAgIGlmIChyZWdleHAuZXhlYyAhPT0gQFJlZ0V4cC5wcm90b3R5 cGUuQGV4ZWMgJiYgdHlwZW9mKHJlZ2V4cC5leGVjKSA9PT0gImZ1bmN0aW9uIikgeworICAgIGlm IChleGVjRnVuYyAhPT0gQFJlZ0V4cC5wcm90b3R5cGUuQGV4ZWMgJiYgdHlwZW9mIGV4ZWNGdW5j ID09PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgIC8vIE1hdGNoIHVzaW5nIHRoZSBvdmVycmlkZGVu IGV4ZWMuCi0gICAgICAgIGxldCB1bmljb2RlID0gcmVnZXhwLnVuaWNvZGU7Ci0gICAgICAgIGxl dCBzdHJpbmdMZW5ndGggPSBzdHIubGVuZ3RoOworICAgICAgICBsZXQgc3RyaW5nTGVuZ3RoID0g c3RyaW5nQXJnLmxlbmd0aDsKIAogICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAg bGV0IHJlc3VsdCA9IHJlZ2V4cC5leGVjKHN0cmluZ0FyZyk7CisgICAgICAgICAgICBsZXQgcmVz dWx0ID0gZXhlY0Z1bmMoc3RyaW5nQXJnKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYg KHJlc3VsdCA9PT0gbnVsbCkgewogICAgICAgICAgICAgICAgIGlmIChyZXN1bHRMaXN0Lmxlbmd0 aCA9PT0gMCkKQEAgLTgxLDYgKzgxLDggQEAgZnVuY3Rpb24gbWF0Y2goc3RyKQogICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICByZXN1bHRMaXN0LkBwdXNoKHJlc3VsdFN0cmluZyk7CisKKyAg ICAgICAgICAgIGV4ZWNGdW5jID0gcmVnZXhwLmV4ZWM7CiAgICAgICAgIH0KICAgICB9CiAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVnZXhwLW1hdGNoLXByb3h5 LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVn ZXhwLW1hdGNoLXByb3h5LmpzCShyZXZpc2lvbiAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3Rlc3RzL3N0cmVzcy9yZWdleHAtbWF0Y2gtcHJveHkuanMJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSwxNjYgQEAKK2Z1bmN0aW9uIGFzc2VydChhc3NlcnRpb24pIHsKKyAgICBpZiAodHlwZW9m IGFzc2VydGlvbiAhPSAic3RyaW5nIikKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJJbnZhbGlk IGFzc2VydGlvbi4iKTsKKworICAgIGxldCByZXN1bHQgPSBldmFsKGFzc2VydGlvbik7CisKKyAg ICBpZiAoIXJlc3VsdCkKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQgYXNzZXJ0aW9uOiAi ICsgYXNzZXJ0aW9uKTsKK30KKworbGV0IGdldCA9IFtdOworbGV0IHNldCA9IFtdOworbGV0IGdl dFNldCA9IFtdOworCitmdW5jdGlvbiByZXNldFRyYWNraW5nKCkKK3sKKyAgICBnZXQgPSBbXTsK KyAgICBzZXQgPSBbXTsKKyAgICBnZXRTZXQgPSBbXTsKK30KKworbGV0IGdldFByb3h5TnVsbEV4 ZWMgPSBuZXcgUHJveHkoeworICAgICAgICBleGVjOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICB9CisgICAgfSwgeworICAgICAgICBnZXQ6 IGZ1bmN0aW9uKG8sIGspCisgICAgICAgIHsKKyAgICAgICAgICAgIGdldC5wdXNoKGspOyByZXR1 cm4gb1trXTsKKyAgICAgICAgfQorICAgIH0pOworCityZXNldFRyYWNraW5nKCk7CitSZWdFeHAu cHJvdG90eXBlW1N5bWJvbC5tYXRjaF0uY2FsbChnZXRQcm94eU51bGxFeGVjKTsKK2Fzc2VydCgn Z2V0ID09ICJnbG9iYWwsZXhlYyInKTsKKworbGV0IGdldFNldFByb3h5TnVsbEV4ZWMgPSBuZXcg UHJveHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAgICAg ICAgICAgIHJldHVybiBudWxsOworICAgICAgICB9CisgICAgfSwgeworICAgICAgICBnZXQ6IGZ1 bmN0aW9uKG8sIGspCisgICAgICAgIHsKKyAgICAgICAgICAgIGdldC5wdXNoKGspOworICAgICAg ICAgICAgZ2V0U2V0LnB1c2goayk7CisgICAgICAgICAgICByZXR1cm4gb1trXTsKKyAgICAgICAg fSwKKyAgICAgICAgc2V0OiBmdW5jdGlvbihvLCBrLCB2KQorICAgICAgICB7CisgICAgICAgICAg ICBzZXQucHVzaChrKTsKKyAgICAgICAgICAgIGdldFNldC5wdXNoKGspOworICAgICAgICAgICAg b1trXSA9IHY7CisgICAgICAgIH0KKyAgICB9KTsKKworZ2V0U2V0UHJveHlOdWxsRXhlYy5nbG9i YWwgPSB0cnVlOworCityZXNldFRyYWNraW5nKCk7CitSZWdFeHAucHJvdG90eXBlW1N5bWJvbC5t YXRjaF0uY2FsbChnZXRTZXRQcm94eU51bGxFeGVjKTsKK2Fzc2VydCgnZ2V0ID09ICJnbG9iYWws dW5pY29kZSxleGVjIicpOworYXNzZXJ0KCdzZXQgPT0gImxhc3RJbmRleCInKTsKK2Fzc2VydCgn Z2V0U2V0ID09ICJnbG9iYWwsdW5pY29kZSxsYXN0SW5kZXgsZXhlYyInKTsKKworbGV0IHJlZ0V4 cEdsb2JhbF9zID0gbmV3IFJlZ0V4cCgicyIsICJnIik7CitsZXQgZ2V0U2V0UHJveHlNYXRjaGVz X3MgPSBuZXcgUHJveHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbihzdHJpbmcpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiByZWdFeHBHbG9iYWxfcy5leGVjKHN0cmluZyk7 CisgICAgICAgIH0KKyAgICB9LCB7CisgICAgICAgIGdldDogZnVuY3Rpb24obywgaykKKyAgICAg ICAgeworICAgICAgICAgICAgZ2V0LnB1c2goayk7CisgICAgICAgICAgICBnZXRTZXQucHVzaChr KTsKKyAgICAgICAgICAgIHJldHVybiBvW2tdOworICAgICAgICB9LAorICAgICAgICBzZXQ6IGZ1 bmN0aW9uKG8sIGssIHYpCisgICAgICAgIHsKKyAgICAgICAgICAgIHNldC5wdXNoKGspOworICAg ICAgICAgICAgZ2V0U2V0LnB1c2goayk7CisgICAgICAgICAgICBvW2tdID0gdjsKKyAgICAgICAg fQorICAgIH0pOworCitnZXRTZXRQcm94eU1hdGNoZXNfcy5nbG9iYWwgPSB0cnVlOworcmVzZXRU cmFja2luZygpOworbGV0IG1hdGNoUmVzdWx0ID0gUmVnRXhwLnByb3RvdHlwZVtTeW1ib2wubWF0 Y2hdLmNhbGwoZ2V0U2V0UHJveHlNYXRjaGVzX3MsICJUaGlzIGlzIGEgdGVzdCIpOworYXNzZXJ0 KCdtYXRjaFJlc3VsdCA9PSAicyxzLHMiJyk7Cithc3NlcnQoJ2dldCA9PSAiZ2xvYmFsLHVuaWNv ZGUsZXhlYyxleGVjLGV4ZWMsZXhlYyInKTsKK2Fzc2VydCgnc2V0ID09ICJsYXN0SW5kZXgiJyk7 Cithc3NlcnQoJ2dldFNldCA9PSAiZ2xvYmFsLHVuaWNvZGUsbGFzdEluZGV4LGV4ZWMsZXhlYyxl eGVjLGV4ZWMiJyk7CisKK2xldCByZWdFeHBHbG9iYWxfdHhfR3JlZWR5ID0gbmV3IFJlZ0V4cCgi W3R4XSoiLCAiZyIpOworbGV0IGdldFNldFByb3h5TWF0Y2hlc190eF9HcmVlZHkgPSBuZXcgUHJv eHkoCisgICAgeworICAgICAgICBleGVjOiBmdW5jdGlvbihzdHJpbmcpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHJldHVybiByZWdFeHBHbG9iYWxfdHhfR3JlZWR5LmV4ZWMoc3RyaW5nKTsKKyAg ICAgICAgfQorICAgIH0sIHsKKyAgICAgICAgZ2V0OiBmdW5jdGlvbihvLCBrKQorICAgICAgICB7 CisgICAgICAgICAgICBnZXQucHVzaChrKTsKKyAgICAgICAgICAgIGdldFNldC5wdXNoKGspOwor ICAgICAgICAgICAgaWYgKGsudG9TdHJpbmcoKSA9PSAibGFzdEluZGV4IikKKyAgICAgICAgICAg ICAgICByZXR1cm4gcmVnRXhwR2xvYmFsX3R4X0dyZWVkeS5sYXN0SW5kZXg7CisgICAgICAgICAg ICByZXR1cm4gb1trXTsKKyAgICAgICAgfSwKKyAgICAgICAgc2V0OiBmdW5jdGlvbihvLCBrLCB2 KQorICAgICAgICB7CisgICAgICAgICAgICBzZXQucHVzaChrKTsKKyAgICAgICAgICAgIGdldFNl dC5wdXNoKGspOworICAgICAgICAgICAgaWYgKGsudG9TdHJpbmcoKSA9PSAibGFzdEluZGV4IikK KyAgICAgICAgICAgICAgICByZWdFeHBHbG9iYWxfdHhfR3JlZWR5Lmxhc3RJbmRleCA9IHY7Cisg ICAgICAgICAgICBvW2tdID0gdjsKKyAgICAgICAgfQorICAgIH0pOworCitnZXRTZXRQcm94eU1h dGNoZXNfdHhfR3JlZWR5Lmdsb2JhbCA9IHRydWU7CisKK3Jlc2V0VHJhY2tpbmcoKTsKK21hdGNo UmVzdWx0ID0gUmVnRXhwLnByb3RvdHlwZVtTeW1ib2wubWF0Y2hdLmNhbGwoZ2V0U2V0UHJveHlN YXRjaGVzX3R4X0dyZWVkeSwgInRlc3RpbmciKTsKK2Fzc2VydCgnbWF0Y2hSZXN1bHQgPT0gInQs LCx0LCwsLCInKTsKK2Fzc2VydCgnZ2V0ID09ICJnbG9iYWwsdW5pY29kZSxleGVjLGV4ZWMsbGFz dEluZGV4LGV4ZWMsbGFzdEluZGV4LGV4ZWMsZXhlYyxsYXN0SW5kZXgsZXhlYyxsYXN0SW5kZXgs ZXhlYyxsYXN0SW5kZXgsZXhlYyxsYXN0SW5kZXgsZXhlYyInKTsKK2Fzc2VydCgnc2V0ID09ICJs YXN0SW5kZXgsbGFzdEluZGV4LGxhc3RJbmRleCxsYXN0SW5kZXgsbGFzdEluZGV4LGxhc3RJbmRl eCxsYXN0SW5kZXgiJyk7Cithc3NlcnQoJ2dldFNldCA9PSAiZ2xvYmFsLHVuaWNvZGUsbGFzdElu ZGV4LGV4ZWMsZXhlYyxsYXN0SW5kZXgsbGFzdEluZGV4LGV4ZWMsbGFzdEluZGV4LGxhc3RJbmRl eCxleGVjLGV4ZWMsbGFzdEluZGV4LGxhc3RJbmRleCxleGVjLGxhc3RJbmRleCxsYXN0SW5kZXgs ZXhlYyxsYXN0SW5kZXgsbGFzdEluZGV4LGV4ZWMsbGFzdEluZGV4LGxhc3RJbmRleCxleGVjIicp OworCitsZXQgcmVnRXhwR2xvYmFsVW5pY29kZV9kaWdpdF9ub25HcmVlZHkgPSBuZXcgUmVnRXhw KCJcXGR7MCwxfSIsICJndSIpOworbGV0IGdldFNldFByb3h5TWF0Y2hlc1VuaWNvZGVfZGlnaXRf bm9uR3JlZWR5ID0gbmV3IFByb3h5KAorICAgIHsKKyAgICAgICAgZXhlYzogZnVuY3Rpb24oc3Ry aW5nKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gcmVnRXhwR2xvYmFsVW5pY29kZV9k aWdpdF9ub25HcmVlZHkuZXhlYyhzdHJpbmcpOworICAgICAgICB9CisgICAgfSwgeworICAgICAg ICBnZXQ6IGZ1bmN0aW9uKG8sIGspCisgICAgICAgIHsKKyAgICAgICAgICAgIGdldC5wdXNoKGsp OworICAgICAgICAgICAgZ2V0U2V0LnB1c2goayk7CisgICAgICAgICAgICBpZiAoay50b1N0cmlu ZygpID09ICJsYXN0SW5kZXgiKQorICAgICAgICAgICAgICAgIHJldHVybiByZWdFeHBHbG9iYWxV bmljb2RlX2RpZ2l0X25vbkdyZWVkeS5sYXN0SW5kZXg7CisgICAgICAgICAgICByZXR1cm4gb1tr XTsKKyAgICAgICAgfSwKKyAgICAgICAgc2V0OiBmdW5jdGlvbihvLCBrLCB2KQorICAgICAgICB7 CisgICAgICAgICAgICBzZXQucHVzaChrKTsKKyAgICAgICAgICAgIGdldFNldC5wdXNoKGspOwor ICAgICAgICAgICAgaWYgKGsudG9TdHJpbmcoKSA9PSAibGFzdEluZGV4IikKKyAgICAgICAgICAg ICAgICByZWdFeHBHbG9iYWxVbmljb2RlX2RpZ2l0X25vbkdyZWVkeS5sYXN0SW5kZXggPSB2Owor ICAgICAgICAgICAgb1trXSA9IHY7CisgICAgICAgIH0KKyAgICB9KTsKKworZ2V0U2V0UHJveHlN YXRjaGVzVW5pY29kZV9kaWdpdF9ub25HcmVlZHkuZ2xvYmFsID0gdHJ1ZTsKK2dldFNldFByb3h5 TWF0Y2hlc1VuaWNvZGVfZGlnaXRfbm9uR3JlZWR5LnVuaWNvZGUgPSB0cnVlOworCityZXNldFRy YWNraW5nKCk7CittYXRjaFJlc3VsdCA9IFJlZ0V4cC5wcm90b3R5cGVbU3ltYm9sLm1hdGNoXS5j YWxsKGdldFNldFByb3h5TWF0Y2hlc1VuaWNvZGVfZGlnaXRfbm9uR3JlZWR5LCAiMTJYM1x1ezEw NDAwfTQiKTsKK2Fzc2VydCgnbWF0Y2hSZXN1bHQgPT0gIjEsMiwsMywsNCwiJyk7Cithc3NlcnQo J2dldCA9PSAiZ2xvYmFsLHVuaWNvZGUsZXhlYyxleGVjLGV4ZWMsbGFzdEluZGV4LGV4ZWMsZXhl YyxsYXN0SW5kZXgsZXhlYyxleGVjLGxhc3RJbmRleCxleGVjIicpOworYXNzZXJ0KCdzZXQgPT0g Imxhc3RJbmRleCxsYXN0SW5kZXgsbGFzdEluZGV4LGxhc3RJbmRleCInKTsKK2Fzc2VydCgnZ2V0 U2V0ID09ICJnbG9iYWwsdW5pY29kZSxsYXN0SW5kZXgsZXhlYyxleGVjLGV4ZWMsbGFzdEluZGV4 LGxhc3RJbmRleCxleGVjLGV4ZWMsbGFzdEluZGV4LGxhc3RJbmRleCxleGVjLGV4ZWMsbGFzdElu ZGV4LGxhc3RJbmRleCxleGVjIicpOwo=