54482 2011-02-15 11:54:27 -0800 Moved MarkedBlock data members to the head of the block 2011-02-15 13:03:21 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren webkit.review.bot oldest_to_newest 351441 0 ggaren 2011-02-15 11:54:27 -0800 Moved MarkedBlock data members to the head of the block 351457 1 82498 ggaren 2011-02-15 12:07:58 -0800 Created attachment 82498 Patch 351463 2 webkit.review.bot 2011-02-15 12:11:16 -0800 Attachment 82498 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/runtime/MarkedBlock.h:53: BLOCK_MASK is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/runtime/MarkedBlock.h:64: CELLS_PER_BLOCK is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 351472 3 82498 darin 2011-02-15 12:16:39 -0800 Comment on attachment 82498 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82498&action=review Change seems fine. Could you please take a little time out and make the constants use normal style instead of MACRO_STYLE? Then the style bot would like you better. > Source/JavaScriptCore/runtime/MarkedBlock.h:38 > + template <size_t divisor> inline size_t roundUpToMultipleOf(size_t x) Normally we don’t put a space between template and the "<" by analogy with the function name and "(". 351508 4 ggaren 2011-02-15 12:58:33 -0800 > Could you please take a little time out and make the constants use normal style instead of MACRO_STYLE? Then the style bot would like you better. OK, I'll do that in my next patch. 351512 5 ggaren 2011-02-15 13:03:21 -0800 Committed r78605: <http://trac.webkit.org/changeset/78605> 82498 2011-02-15 12:07:58 -0800 2011-02-15 12:16:39 -0800 Patch bug-54482-20110215120757.patch text/plain 9155 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzg1OTcpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDIgQEAK KzIwMTEtMDItMTUgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCBNYXJrZWRCbG9j ayBkYXRhIG1lbWJlcnMgdG8gdGhlIGhlYWQgb2YgdGhlIGJsb2NrCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDQ4MgorICAgICAgICAKKyAgICAgICAg VGhpcyBhbGxvd3MgZm9yIGEgdmFyaWFibGUtc2l6ZWQgdGFpbCwgdG8gYWNjb21tb2RhdGUgb3Zl cnNpemVkIGJsb2Nrcy4KKworICAgICAgICBTdW5TcGlkZXIgcmVwb3J0cyBubyBjaGFuZ2UuCisg ICAgICAgIAorICAgICAgICAqIHJ1bnRpbWUvSlNDZWxsLmg6CisgICAgICAgIChKU0M6OkpTQ2Vs bDo6TWFya2VkQmxvY2s6OmFsbG9jYXRlKToKKyAgICAgICAgKiBydW50aW1lL01hcmtlZEJsb2Nr LmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OmRlc3Ryb3kpOgorICAgICAgICAoSlND OjpNYXJrZWRCbG9jazo6TWFya2VkQmxvY2spOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6 c3dlZXApOgorICAgICAgICAqIHJ1bnRpbWUvTWFya2VkQmxvY2suaDogQWRkZWQgbWlzc2luZyBl bGVtZW50IHRvIHRoZSBDRUxMU19QRVJfQkxPQ0sKKyAgICAgICAgY2FsY3VsYXRpb24uIFRoaXMg a2luZCBvZiBlcnJvciBpcyB3aHkgd2Ugd2FudCB0byBtaWdyYXRlIHRvIHRoZSBzeXN0ZW0KKyAg ICAgICAgZGVzY3JpYmVkIGJlbG93LgorCisgICAgICAgIChKU0M6OnJvdW5kVXBUb011bHRpcGxl T2YpOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6Zmlyc3RDZWxsKToKKyAgICAgICAgKEpT Qzo6TWFya2VkQmxvY2s6OmNlbGxzKToKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OmNlbGxO dW1iZXIpOiBVc2Ugc3VidHJhY3Rpb24gaW5zdGVhZCBvZiBtYXNraW5nIHRvCisgICAgICAgIGNh bGN1bGF0ZSBjZWxsIG51bWJlci4gVGhlIG1hc2sgaXMgbm8gbG9uZ2VyIGNvcnJlY3QgYmVjYXVz ZSB0aGUgZmlyc3QKKyAgICAgICAgY2VsbCBpcyBub3QgYXQgdGhlIGhlYWQgb2YgdGhlIGJsb2Nr LgorCisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpmb3JFYWNoKTogUmVwbGFjZWQgbV9jZWxs cyBkYXRhIG1lbWJlciB3aXRoIGEgY2VsbHMoKQorICAgICAgICBhY2Nlc3Nvci4gV2Ugd2FudCB0 byB1c2Ugc2l6ZW9mKE1hcmtlZEJsb2NrKSB0byBjYWxjdWxhdGUgdGhlIHNpemUgb2YgdGhlCisg ICAgICAgIGJsb2NrIGhlYWRlciwgc28gd2UgY2FuJ3QgaGF2ZSBhbiBleHBsaWNpdCBkYXRhIG1l bWJlciB0byByZXByZXNlbnQgdGhlIGJsb2NrIHRhaWwuCisgICAgICAgIAorICAgICAgICBBbHNv IHJlcGxhY2VkIGl0ZXJhdGlvbiBmcm9tIHplcm8gd2l0aCBpdGVyYXRpb24gZnJvbSBzdGFydENl bGwoKSwgc2luY2UKKyAgICAgICAgdGhlIGZpcnN0IE4gY2VsbHMgYXJlIG5vdyBvY2N1cGllZCBi eSB0aGUgaGVhZGVyLgorCisgICAgICAgICogcnVudGltZS9NYXJrZWRTcGFjZS5jcHA6CisgICAg ICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpNYXJrZWRTcGFjZSk6CisgICAgICAgIChKU0M6Ok1hcmtl ZFNwYWNlOjpyZXNldCk6IFJlcGxhY2VkIGl0ZXJhdGlvbiBmcm9tIHplcm8gYXMgYWJvdmUuCisK IDIwMTEtMDItMTUgIENocmlzIFJvZ2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNDZWxsLmgJKHJldmlzaW9uIDc4NTAxKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwNywxNCArNDA3LDE0 IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBkbyB7CiAgICAgICAgICAgICBBU1NFUlQobmV4 dENlbGwgPCBDRUxMU19QRVJfQkxPQ0spOwogICAgICAgICAgICAgaWYgKCFtX21hcmtzLnRlc3RB bmRTZXQobmV4dENlbGwpKSB7IC8vIEFsd2F5cyBmYWxzZSBmb3IgdGhlIGxhc3QgY2VsbCBpbiB0 aGUgYmxvY2sKLSAgICAgICAgICAgICAgICBKU0NlbGwqIGNlbGwgPSByZWludGVycHJldF9jYXN0 PEpTQ2VsbCo+KCZtX2NlbGxzW25leHRDZWxsKytdKTsKKyAgICAgICAgICAgICAgICBKU0NlbGwq IGNlbGwgPSByZWludGVycHJldF9jYXN0PEpTQ2VsbCo+KCZjZWxscygpW25leHRDZWxsKytdKTsK ICAgICAgICAgICAgICAgICBjZWxsLT5+SlNDZWxsKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJu IGNlbGw7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBuZXh0Q2VsbCA9IG1fbWFya3MubmV4 dFBvc3NpYmx5VW5zZXQobmV4dENlbGwpOwogICAgICAgICB9IHdoaWxlIChuZXh0Q2VsbCAhPSBD RUxMU19QRVJfQkxPQ0spOwotICAgICAgICAKLSAgICAgICAgbmV4dENlbGwgPSAwOworCisgICAg ICAgIG5leHRDZWxsID0gZmlyc3RDZWxsKCk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIApJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkQmxvY2suY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZEJsb2NrLmNwcAko cmV2aXNpb24gNzg1MDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRC bG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDggKzQwLDggQEAgTWFya2VkQmxvY2sqIE1h cmtlZEJsb2NrOjpjcmVhdGUoSlNHbG9iYQogCiB2b2lkIE1hcmtlZEJsb2NrOjpkZXN0cm95KE1h cmtlZEJsb2NrKiBibG9jaykKIHsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IENFTExTX1BF Ul9CTE9DSzsgKytpKQotICAgICAgICByZWludGVycHJldF9jYXN0PEpTQ2VsbCo+KCZibG9jay0+ bV9jZWxsc1tpXSktPn5KU0NlbGwoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gYmxvY2stPmZpcnN0 Q2VsbCgpOyBpIDwgQ0VMTFNfUEVSX0JMT0NLOyArK2kpCisgICAgICAgIHJlaW50ZXJwcmV0X2Nh c3Q8SlNDZWxsKj4oJmJsb2NrLT5jZWxscygpW2ldKS0+fkpTQ2VsbCgpOwogICAgIGJsb2NrLT5t X2FsbG9jYXRpb24uZGVhbGxvY2F0ZSgpOwogfQogCkBAIC01Miw4ICs1Miw4IEBAIE1hcmtlZEJs b2NrOjpNYXJrZWRCbG9jayhjb25zdCBQYWdlQWxsb2MKICAgICBtX21hcmtzLnNldChDRUxMU19Q RVJfQkxPQ0sgLSAxKTsKIAogICAgIFN0cnVjdHVyZSogZHVtbXlNYXJrYWJsZUNlbGxTdHJ1Y3R1 cmUgPSBnbG9iYWxEYXRhLT5kdW1teU1hcmthYmxlQ2VsbFN0cnVjdHVyZS5nZXQoKTsKLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IENFTExTX1BFUl9CTE9DSzsgKytpKQotICAgICAgICBuZXcg KCZtX2NlbGxzW2ldKSBKU0NlbGwoZHVtbXlNYXJrYWJsZUNlbGxTdHJ1Y3R1cmUpOworICAgIGZv ciAoc2l6ZV90IGkgPSBmaXJzdENlbGwoKTsgaSA8IENFTExTX1BFUl9CTE9DSzsgKytpKQorICAg ICAgICBuZXcgKCZjZWxscygpW2ldKSBKU0NlbGwoZHVtbXlNYXJrYWJsZUNlbGxTdHJ1Y3R1cmUp OwogfQogCiB2b2lkIE1hcmtlZEJsb2NrOjpzd2VlcCgpCkBAIC02MiwxMSArNjIsMTEgQEAgdm9p ZCBNYXJrZWRCbG9jazo6c3dlZXAoKQogICAgIFN0cnVjdHVyZSogZHVtbXlNYXJrYWJsZUNlbGxT dHJ1Y3R1cmUgPSBtX2hlYXAtPmdsb2JhbERhdGEoKS0+ZHVtbXlNYXJrYWJsZUNlbGxTdHJ1Y3R1 cmUuZ2V0KCk7CiAjZW5kaWYKIAotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgQ0VMTFNfUEVS X0JMT0NLOyArK2kpIHsKKyAgICBmb3IgKHNpemVfdCBpID0gZmlyc3RDZWxsKCk7IGkgPCBDRUxM U19QRVJfQkxPQ0s7ICsraSkgewogICAgICAgICBpZiAobV9tYXJrcy5nZXQoaSkpCiAgICAgICAg ICAgICBjb250aW51ZTsKIAotICAgICAgICBKU0NlbGwqIGNlbGwgPSByZWludGVycHJldF9jYXN0 PEpTQ2VsbCo+KCZtX2NlbGxzW2ldKTsKKyAgICAgICAgSlNDZWxsKiBjZWxsID0gcmVpbnRlcnBy ZXRfY2FzdDxKU0NlbGwqPigmY2VsbHMoKVtpXSk7CiAjaWYgRU5BQkxFKEpTQ19aT01CSUVTKQog ICAgICAgICBpZiAoIWNlbGwtPmlzWm9tYmllKCkpIHsKICAgICAgICAgICAgIGNvbnN0IENsYXNz SW5mbyogaW5mbyA9IGNlbGwtPmNsYXNzSW5mbygpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvTWFya2VkQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9NYXJrZWRCbG9jay5oCShyZXZpc2lvbiA3ODUwMSkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZEJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0 LDYgKzM0LDE1IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIGNsYXNzIEpTQ2VsbDsKICAgICBjbGFz cyBKU0dsb2JhbERhdGE7CiAKKyAgICAvLyBFZmZpY2llbnQgaW1wbGVtZW50YXRpb24gdGhhdCB0 YWtlcyBhZHZhbnRhZ2Ugb2YgcG93ZXJzIG9mIHR3by4KKyAgICB0ZW1wbGF0ZSA8c2l6ZV90IGRp dmlzb3I+IGlubGluZSBzaXplX3Qgcm91bmRVcFRvTXVsdGlwbGVPZihzaXplX3QgeCkKKyAgICB7 CisgICAgICAgIENPTVBJTEVfQVNTRVJUKGRpdmlzb3IgJiYgIShkaXZpc29yICYgKGRpdmlzb3Ig LSAxKSksIGRpdmlzb3JfaXNfYV9wb3dlcl9vZl90d28pOworCisgICAgICAgIHNpemVfdCByZW1h aW5kZXJNYXNrID0gZGl2aXNvciAtIDE7CisgICAgICAgIHJldHVybiAoeCArIHJlbWFpbmRlck1h c2spICYgfnJlbWFpbmRlck1hc2s7CisgICAgfQorCiAgICAgY2xhc3MgTWFya2VkQmxvY2sgewog I2lmIE9TKFdJTkNFKSB8fCBPUyhTWU1CSUFOKSB8fCBQTEFURk9STShCUkVXTVApCiAgICAgICAg IHN0YXRpYyBjb25zdCBzaXplX3QgQkxPQ0tfU0laRSA9IDY0ICogMTAyNDsgLy8gNjRrCkBAIC00 MSw4ICs1MCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90 IEJMT0NLX1NJWkUgPSAyNTYgKiAxMDI0OyAvLyAyNTZrCiAjZW5kaWYKIAotICAgICAgICBzdGF0 aWMgY29uc3Qgc2l6ZV90IEJMT0NLX09GRlNFVF9NQVNLID0gQkxPQ0tfU0laRSAtIDE7Ci0gICAg ICAgIHN0YXRpYyBjb25zdCBzaXplX3QgQkxPQ0tfTUFTSyA9IH5CTE9DS19PRkZTRVRfTUFTSzsK KyAgICAgICAgc3RhdGljIGNvbnN0IHNpemVfdCBCTE9DS19NQVNLID0gfihCTE9DS19TSVpFIC0g MSk7CiAgICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3QgTUlOSU1VTV9DRUxMX1NJWkUgPSA2NDsK ICAgICAgICAgc3RhdGljIGNvbnN0IHNpemVfdCBDRUxMX0FSUkFZX0xFTkdUSCA9IChNSU5JTVVN X0NFTExfU0laRSAvIHNpemVvZihkb3VibGUpKSArIChNSU5JTVVNX0NFTExfU0laRSAlIHNpemVv Zihkb3VibGUpICE9IDAgPyBzaXplb2YoZG91YmxlKSA6IDApOwogICAgIHB1YmxpYzoKQEAgLTUz LDcgKzYxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3Qg Q0VMTF9NQVNLID0gQ0VMTF9TSVpFIC0gMTsKICAgICAgICAgc3RhdGljIGNvbnN0IHNpemVfdCBD RUxMX0FMSUdOX01BU0sgPSB+Q0VMTF9NQVNLOwogICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90 IEJJVFNfUEVSX0JMT0NLID0gQkxPQ0tfU0laRSAvIENFTExfU0laRTsKLSAgICAgICAgc3RhdGlj IGNvbnN0IHNpemVfdCBDRUxMU19QRVJfQkxPQ0sgPSAoQkxPQ0tfU0laRSAtIHNpemVvZihIZWFw KikgLSBzaXplb2YoV1RGOjpCaXRtYXA8QklUU19QRVJfQkxPQ0s+KSkgLyBDRUxMX1NJWkU7IC8v IERpdmlzaW9uIHJvdW5kcyBkb3duIGludGVudGlvbmFsbHkuCisgICAgICAgIHN0YXRpYyBjb25z dCBzaXplX3QgQ0VMTFNfUEVSX0JMT0NLID0gKEJMT0NLX1NJWkUgLSBzaXplb2YoV1RGOjpCaXRt YXA8QklUU19QRVJfQkxPQ0s+KSAtIHNpemVvZihQYWdlQWxsb2NhdGlvbkFsaWduZWQpIC0gc2l6 ZW9mKEhlYXAqKSkgLyBDRUxMX1NJWkU7IC8vIERpdmlzaW9uIHJvdW5kcyBkb3duIGludGVudGlv bmFsbHkuCiAgICAgICAgIAogICAgICAgICBzdHJ1Y3QgQ29sbGVjdG9yQ2VsbCB7CiAgICAgICAg ICAgICBGaXhlZEFycmF5PGRvdWJsZSwgQ0VMTF9BUlJBWV9MRU5HVEg+IG1lbW9yeTsKQEAgLTgx LDYgKzg5LDggQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHNpemVfdCBzaXplKCk7CiAgICAg ICAgIHNpemVfdCBjYXBhY2l0eSgpOwogCisgICAgICAgIHNpemVfdCBmaXJzdENlbGwoKTsKKwog ICAgICAgICBzaXplX3QgY2VsbE51bWJlcihjb25zdCB2b2lkKik7CiAgICAgICAgIGJvb2wgaXNN YXJrZWQoY29uc3Qgdm9pZCopOwogICAgICAgICBib29sIHRlc3RBbmRTZXRNYXJrZWQoY29uc3Qg dm9pZCopOwpAQCAtOTAsMTMgKzEwMCwyMyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgIHByaXZh dGU6CiAgICAgICAgIE1hcmtlZEJsb2NrKGNvbnN0IFBhZ2VBbGxvY2F0aW9uQWxpZ25lZCYsIEpT R2xvYmFsRGF0YSopOworICAgICAgICBDb2xsZWN0b3JDZWxsKiBjZWxscygpOwogCi0gICAgICAg IEZpeGVkQXJyYXk8Q29sbGVjdG9yQ2VsbCwgQ0VMTFNfUEVSX0JMT0NLPiBtX2NlbGxzOwogICAg ICAgICBXVEY6OkJpdG1hcDxCSVRTX1BFUl9CTE9DSz4gbV9tYXJrczsKICAgICAgICAgUGFnZUFs bG9jYXRpb25BbGlnbmVkIG1fYWxsb2NhdGlvbjsKICAgICAgICAgSGVhcCogbV9oZWFwOwogICAg IH07CiAKKyAgICBpbmxpbmUgc2l6ZV90IE1hcmtlZEJsb2NrOjpmaXJzdENlbGwoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHJvdW5kVXBUb011bHRpcGxlT2Y8Q0VMTF9TSVpFPihzaXplb2YoTWFy a2VkQmxvY2spKSAvIENFTExfU0laRTsKKyAgICB9CisKKyAgICBpbmxpbmUgTWFya2VkQmxvY2s6 OkNvbGxlY3RvckNlbGwqIE1hcmtlZEJsb2NrOjpjZWxscygpCisgICAgeworICAgICAgICByZXR1 cm4gcmVpbnRlcnByZXRfY2FzdDxDb2xsZWN0b3JDZWxsKj4odGhpcyk7CisgICAgfQorCiAgICAg aW5saW5lIGJvb2wgTWFya2VkQmxvY2s6OmlzQ2VsbEFsaWduZWQoY29uc3Qgdm9pZCogcCkKICAg ICB7CiAgICAgICAgIHJldHVybiAhKChpbnRwdHJfdCkocCkgJiBDRUxMX01BU0spOwpAQCAtMTQ0 LDcgKzE2NCw3IEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgaW5saW5lIHNpemVfdCBNYXJrZWRC bG9jazo6Y2VsbE51bWJlcihjb25zdCB2b2lkKiBjZWxsKQogICAgIHsKLSAgICAgICAgcmV0dXJu IChyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oY2VsbCkgJiBCTE9DS19PRkZTRVRfTUFTSykg LyBDRUxMX1NJWkU7CisgICAgICAgIHJldHVybiAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+ KGNlbGwpIC0gcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHRoaXMpKSAvIENFTExfU0laRTsK ICAgICB9CiAKICAgICBpbmxpbmUgYm9vbCBNYXJrZWRCbG9jazo6aXNNYXJrZWQoY29uc3Qgdm9p ZCogY2VsbCkKQEAgLTE2NCwxMCArMTg0LDEwIEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgdGVt cGxhdGUgPHR5cGVuYW1lIEZ1bmN0b3I+IGlubGluZSB2b2lkIE1hcmtlZEJsb2NrOjpmb3JFYWNo KEZ1bmN0b3ImIGZ1bmN0b3IpCiAgICAgewotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IENFTExTX1BFUl9CTE9DSyAtIDE7ICsraSkgeyAvLyBUaGUgbGFzdCBjZWxsIGlzIGEgZHVtbXkg cGxhY2UtaG9sZGVyLgorICAgICAgICBmb3IgKHNpemVfdCBpID0gZmlyc3RDZWxsKCk7IGkgPCBD RUxMU19QRVJfQkxPQ0sgLSAxOyArK2kpIHsgLy8gVGhlIGxhc3QgY2VsbCBpcyBhIGR1bW15IHBs YWNlLWhvbGRlci4KICAgICAgICAgICAgIGlmICghbV9tYXJrcy5nZXQoaSkpCiAgICAgICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBmdW5jdG9yKHJlaW50ZXJwcmV0X2Nhc3Q8SlND ZWxsKj4oJm1fY2VsbHNbaV0pKTsKKyAgICAgICAgICAgIGZ1bmN0b3IocmVpbnRlcnByZXRfY2Fz dDxKU0NlbGwqPigmY2VsbHMoKVtpXSkpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRTcGFjZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkU3BhY2UuY3BwCShyZXZpc2lvbiA3 ODQ5MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZFNwYWNlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQCBNYXJrZWRTcGFjZTo6TWFya2VkU3BhY2Uo SlNHbG9iYWxEYXRhKiBnCiAgICAgLCBtX2dsb2JhbERhdGEoZ2xvYmFsRGF0YSkKIHsKICAgICBh bGxvY2F0ZUJsb2NrKCk7CisgICAgbV9oZWFwLm5leHRDZWxsID0gbV9oZWFwLmNvbGxlY3RvckJs b2NrKDApLT5maXJzdENlbGwoKTsKIH0KIAogdm9pZCBNYXJrZWRTcGFjZTo6ZGVzdHJveSgpCkBA IC0xMjcsOCArMTI4LDggQEAgc2l6ZV90IE1hcmtlZFNwYWNlOjpjYXBhY2l0eSgpIGNvbnN0CiAK IHZvaWQgTWFya2VkU3BhY2U6OnJlc2V0KCkKIHsKLSAgICBtX2hlYXAubmV4dENlbGwgPSAwOwog ICAgIG1faGVhcC5uZXh0QmxvY2sgPSAwOworICAgIG1faGVhcC5uZXh0Q2VsbCA9IG1faGVhcC5j b2xsZWN0b3JCbG9jaygwKS0+Zmlyc3RDZWxsKCk7CiAgICAgbV93YXRlck1hcmsgPSAwOwogI2lm IEVOQUJMRShKU0NfWk9NQklFUykKICAgICBzd2VlcCgpOwo=