134552 2014-07-02 11:52:56 -0700 WebCore JIT: rename registerCount to something less generic and add new types for lists of registers and lists of stack references 2014-07-02 12:50:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin achristensen bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1020003 0 benjamin 2014-07-02 11:52:56 -0700 WebCore JIT: rename registerCount to something less generic and add new types for lists of registers and lists of stack references 1020004 1 234272 benjamin 2014-07-02 12:01:21 -0700 Created attachment 234272 Patch 1020005 2 234272 achristensen 2014-07-02 12:06:46 -0700 Comment on attachment 234272 Patch r=me, but I haven't changed the contributors.json yet, so the commit queue won't like my r+ 1020008 3 benjamin 2014-07-02 12:50:13 -0700 Committed r170714: <http://trac.webkit.org/changeset/170714> 234272 2014-07-02 12:01:21 -0700 2014-07-02 12:06:45 -0700 Patch bug-134552-20140702120101.patch text/plain 8826 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODZkODQ5Njc4NjhjYmZm NjM4NGMzOTIyN2NjMzYzMWI2OGZlMzJmNS4uOTI4ZjcwZDE1NmM0MDgxODFmZjY3ZWM0NGNjMGM4 MDczN2EwYWRlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA3LTAyICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXZWJDb3JlIEpJ VDogcmVuYW1lIHJlZ2lzdGVyQ291bnQgdG8gc29tZXRoaW5nIGxlc3MgZ2VuZXJpYyBhbmQgYWRk IG5ldyB0eXBlcyBmb3IgbGlzdHMgb2YgcmVnaXN0ZXJzIGFuZCBsaXN0cyBvZiBzdGFjayByZWZl cmVuY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzQ1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBM aXR0bGUgY2xlYW51cDoKKyAgICAgICAgLVRoZSBuYW1lIHJlZ2lzdGVyQ291bnQgd2FzIGEgbGl0 dGxlIHRvbyBnZW5lcmljLiBSZW5hbWUgdGhhdCB0byAibWF4aW11bVJlZ2lzdGVyQ291bnQiIHRv IGF2b2lkIGNvbmZ1c2lvbi4KKyAgICAgICAgLUFkZCBhIG5ldyB0eXBlIFJlZ2lzdGVyVmVjdG9y IGZvciBhbnkgdmVjdG9yIGhvbGRpbmcgcmVnaXN0ZXJzLiBUaGlzIGlzIGp1c3QgdG8gYXZvaWQg cmVwZWF0aW5nIHRoZSBpbmxpbmUKKyAgICAgICAgIHNpemUgZXZlcnl3aGVyZSwgbm8gZnVuY3Rp b25hbCBjaGFuZ2UuCisgICAgICAgIC1TYW1lIGlkZWEgZm9yIHRoZSBzdGFjazogd2VsY29tZSBT dGFja1JlZmVyZW5jZVZlY3RvciEKKworICAgICAgICAqIGNzc2ppdC9GdW5jdGlvbkNhbGwuaDoK KyAgICAgICAgKFdlYkNvcmU6OkZ1bmN0aW9uQ2FsbDo6c2F2ZUFsbG9jYXRlZENhbGxlclNhdmVk UmVnaXN0ZXJzKToKKyAgICAgICAgUmVtb3ZlIHRoZSBhcHBlbmRWZWN0b3IgaGVyZS4gSXQgd2Fz IHVubmVjZXNzYXJpbHkgY2F1dGlvdXMsIFN0YWNrQWxsb2NhdG9yIGFscmVhZHkgcHJvdGVjdCB1 cworICAgICAgICBmcm9tIG1pc3Rha2VzLgorCisgICAgICAgICogY3Nzaml0L1JlZ2lzdGVyQWxs b2NhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpSZWdpc3RlckFsbG9jYXRvcjo6YWxsb2NhdGVk UmVnaXN0ZXJzKToKKyAgICAgICAgKiBjc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6Omdl bmVyYXRlU2VsZWN0b3JDaGVja2VyKToKKyAgICAgICAgQ2hhbmdpbmcgZnJvbSB0aGUgY291bnQg b2YgImNhbGxlZVNhdmVkUmVnaXN0ZXJDb3VudCIgdG8gIm1heGltdW1SZWdpc3RlckNvdW50IiB3 aWxsIGNhdXNlCisgICAgICAgIGNhbGxlZVNhdmVkUmVnaXN0ZXJTdGFja1JlZmVyZW5jZXMgdG8g YWx3YXlzIG92ZXJhbGxvY2F0ZS4KKyAgICAgICAgVGhlIGNvZGUgZ2VuZXJhdG9yIGlzIG5ldmVy IG9uIHRoZSBoZWFwLCBzbyB0aGF0IHNob3VsZCBub3QgY2hhbmdlIGFueXRoaW5nLgorCisgICAg ICAgICogY3Nzaml0L1N0YWNrQWxsb2NhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTdGFja0Fs bG9jYXRvcjo6cHVzaCk6CisgICAgICAgIChXZWJDb3JlOjpTdGFja0FsbG9jYXRvcjo6cG9wKToK KwogMjAxNC0wNy0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS10gRG8gbm90IGFkZCBmb3J3YXJkIGRlY2xhcmF0aW9uIG9mIGNsYXNz IHN0cnVjdCBmb3IgaW50ZXJmYWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nzaml0 L0Z1bmN0aW9uQ2FsbC5oIGIvU291cmNlL1dlYkNvcmUvY3Nzaml0L0Z1bmN0aW9uQ2FsbC5oCmlu ZGV4IDAzMzk3OWZiZjE3YTFjOTY3MTJlMTZmMWJmYzQ2OWFhMzFlZGU3NDkuLjRhNDE0YTg0MGZm YWJmMTg2Nzc4YjM3YmEwNjdlNzA1ZDUxODViMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzc2ppdC9GdW5jdGlvbkNhbGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQvRnVuY3Rp b25DYWxsLmgKQEAgLTE2MiwxMyArMTYyLDEyIEBAIHByaXZhdGU6CiAgICAgewogICAgICAgICBB U1NFUlQobV9zYXZlZFJlZ2lzdGVyU3RhY2tSZWZlcmVuY2VzLmlzRW1wdHkoKSk7CiAgICAgICAg IEFTU0VSVChtX3NhdmVkUmVnaXN0ZXJzLmlzRW1wdHkoKSk7Ci0gICAgICAgIGNvbnN0IFZlY3Rv cjxKU0M6Ok1hY3JvQXNzZW1ibGVyOjpSZWdpc3RlcklELCByZWdpc3RlckNvdW50PiYgYWxsb2Nh dGVkUmVnaXN0ZXJzID0gbV9yZWdpc3RlckFsbG9jYXRvci5hbGxvY2F0ZWRSZWdpc3RlcnMoKTsK KyAgICAgICAgY29uc3QgUmVnaXN0ZXJWZWN0b3ImIGFsbG9jYXRlZFJlZ2lzdGVycyA9IG1fcmVn aXN0ZXJBbGxvY2F0b3IuYWxsb2NhdGVkUmVnaXN0ZXJzKCk7CiAgICAgICAgIGZvciAoYXV0byBy ZWdpc3RlcklEIDogYWxsb2NhdGVkUmVnaXN0ZXJzKSB7CiAgICAgICAgICAgICBpZiAoUmVnaXN0 ZXJBbGxvY2F0b3I6OmlzQ2FsbGVyU2F2ZWRSZWdpc3RlcihyZWdpc3RlcklEKSkKICAgICAgICAg ICAgICAgICBtX3NhdmVkUmVnaXN0ZXJzLmFwcGVuZChyZWdpc3RlcklEKTsKICAgICAgICAgfQot ICAgICAgICBWZWN0b3I8U3RhY2tBbGxvY2F0b3I6OlN0YWNrUmVmZXJlbmNlLCByZWdpc3RlckNv dW50PiBzdGFja1JlZmVyZW5jZXMgPSBtX3N0YWNrQWxsb2NhdG9yLnB1c2gobV9zYXZlZFJlZ2lz dGVycyk7Ci0gICAgICAgIG1fc2F2ZWRSZWdpc3RlclN0YWNrUmVmZXJlbmNlcy5hcHBlbmRWZWN0 b3Ioc3RhY2tSZWZlcmVuY2VzKTsKKyAgICAgICAgbV9zYXZlZFJlZ2lzdGVyU3RhY2tSZWZlcmVu Y2VzID0gbV9zdGFja0FsbG9jYXRvci5wdXNoKG1fc2F2ZWRSZWdpc3RlcnMpOwogICAgIH0KIAog ICAgIHZvaWQgcmVzdG9yZUFsbG9jYXRlZENhbGxlclNhdmVkUmVnaXN0ZXJzKCkKQEAgLTE4Miw4 ICsxODEsOCBAQCBwcml2YXRlOgogICAgIFN0YWNrQWxsb2NhdG9yJiBtX3N0YWNrQWxsb2NhdG9y OwogICAgIFZlY3RvcjxzdGQ6OnBhaXI8SlNDOjpNYWNyb0Fzc2VtYmxlcjo6Q2FsbCwgSlNDOjpG dW5jdGlvblB0cj4sIDMyPiYgbV9jYWxsUmVnaXN0cnk7CiAKLSAgICBWZWN0b3I8SlNDOjpNYWNy b0Fzc2VtYmxlcjo6UmVnaXN0ZXJJRCwgcmVnaXN0ZXJDb3VudD4gbV9zYXZlZFJlZ2lzdGVyczsK LSAgICBWZWN0b3I8U3RhY2tBbGxvY2F0b3I6OlN0YWNrUmVmZXJlbmNlLCByZWdpc3RlckNvdW50 PiBtX3NhdmVkUmVnaXN0ZXJTdGFja1JlZmVyZW5jZXM7CisgICAgUmVnaXN0ZXJWZWN0b3IgbV9z YXZlZFJlZ2lzdGVyczsKKyAgICBTdGFja0FsbG9jYXRvcjo6U3RhY2tSZWZlcmVuY2VWZWN0b3Ig bV9zYXZlZFJlZ2lzdGVyU3RhY2tSZWZlcmVuY2VzOwogICAgIAogICAgIEpTQzo6RnVuY3Rpb25Q dHIgbV9mdW5jdGlvbkFkZHJlc3M7CiAgICAgdW5zaWduZWQgbV9hcmd1bWVudENvdW50OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nzaml0L1JlZ2lzdGVyQWxsb2NhdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3NqaXQvUmVnaXN0ZXJBbGxvY2F0b3IuaAppbmRleCAwZDEyOTdhOGE2MTgx NTlhNjRhMTAwNGViZDBkN2Q3NDI3Y2ZmZGI0Li5lMTc5OTE3MWU0MmRiNWQxZjQyYjgyYzg2MmE3 YmVmNWE5NmE4YjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQvUmVnaXN0ZXJB bGxvY2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQvUmVnaXN0ZXJBbGxvY2F0b3Iu aApAQCAtOTYsNyArOTYsOSBAQCBzdGF0aWMgY29uc3QgSlNDOjpNYWNyb0Fzc2VtYmxlcjo6UmVn aXN0ZXJJRCBjYWxsZWVTYXZlZFJlZ2lzdGVyc1tdID0gewogI2Vycm9yIFJlZ2lzdGVyQWxsb2Nh dG9yIGhhcyBubyBkZWZpbmVkIHJlZ2lzdGVycyBmb3IgdGhlIGFyY2hpdGVjdHVyZS4KICNlbmRp Zgogc3RhdGljIGNvbnN0IHVuc2lnbmVkIGNhbGxlZVNhdmVkUmVnaXN0ZXJDb3VudCA9IFdURl9B UlJBWV9MRU5HVEgoY2FsbGVlU2F2ZWRSZWdpc3RlcnMpOwotc3RhdGljIGNvbnN0IHVuc2lnbmVk IHJlZ2lzdGVyQ291bnQgPSBjYWxsZWVTYXZlZFJlZ2lzdGVyQ291bnQgKyBXVEZfQVJSQVlfTEVO R1RIKGNhbGxlclNhdmVkUmVnaXN0ZXJzKTsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBtYXhpbXVt UmVnaXN0ZXJDb3VudCA9IGNhbGxlZVNhdmVkUmVnaXN0ZXJDb3VudCArIFdURl9BUlJBWV9MRU5H VEgoY2FsbGVyU2F2ZWRSZWdpc3RlcnMpOworCit0eXBlZGVmIFZlY3RvcjxKU0M6Ok1hY3JvQXNz ZW1ibGVyOjpSZWdpc3RlcklELCBtYXhpbXVtUmVnaXN0ZXJDb3VudD4gUmVnaXN0ZXJWZWN0b3I7 CiAKIGNsYXNzIFJlZ2lzdGVyQWxsb2NhdG9yIHsKIHB1YmxpYzoKQEAgLTE3MSw3ICsxNzMsNyBA QCBwdWJsaWM6CiAgICAgICAgIHJldHVybiByZWdpc3RlcnM7CiAgICAgfQogCi0gICAgY29uc3Qg VmVjdG9yPEpTQzo6TWFjcm9Bc3NlbWJsZXI6OlJlZ2lzdGVySUQsIHJlZ2lzdGVyQ291bnQ+JiBh bGxvY2F0ZWRSZWdpc3RlcnMoKSBjb25zdCB7IHJldHVybiBtX2FsbG9jYXRlZFJlZ2lzdGVyczsg fQorICAgIGNvbnN0IFJlZ2lzdGVyVmVjdG9yJiBhbGxvY2F0ZWRSZWdpc3RlcnMoKSBjb25zdCB7 IHJldHVybiBtX2FsbG9jYXRlZFJlZ2lzdGVyczsgfQogCiAgICAgc3RhdGljIGJvb2wgaXNWYWxp ZFJlZ2lzdGVyKEpTQzo6TWFjcm9Bc3NlbWJsZXI6OlJlZ2lzdGVySUQgcmVnaXN0ZXJJRCkKICAg ICB7CkBAIC0yMDUsOCArMjA3LDggQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKLSAgICBE ZXF1ZTxKU0M6Ok1hY3JvQXNzZW1ibGVyOjpSZWdpc3RlcklELCByZWdpc3RlckNvdW50PiBtX3Jl Z2lzdGVyczsKLSAgICBWZWN0b3I8SlNDOjpNYWNyb0Fzc2VtYmxlcjo6UmVnaXN0ZXJJRCwgcmVn aXN0ZXJDb3VudD4gbV9hbGxvY2F0ZWRSZWdpc3RlcnM7CisgICAgRGVxdWU8SlNDOjpNYWNyb0Fz c2VtYmxlcjo6UmVnaXN0ZXJJRCwgbWF4aW11bVJlZ2lzdGVyQ291bnQ+IG1fcmVnaXN0ZXJzOwor ICAgIFJlZ2lzdGVyVmVjdG9yIG1fYWxsb2NhdGVkUmVnaXN0ZXJzOwogICAgIFZlY3RvcjxKU0M6 Ok1hY3JvQXNzZW1ibGVyOjpSZWdpc3RlcklELCBjYWxsZWVTYXZlZFJlZ2lzdGVyQ291bnQ+IG1f cmVzZXJ2ZWRDYWxsZWVTYXZlZFJlZ2lzdGVyczsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzc2pp dC9TZWxlY3RvckNvbXBpbGVyLmNwcAppbmRleCBiOTgwMmJiNzM4N2Y5MzI1NTk3NmJiMTA5MTYy MjAyOWVjNzc2Y2E1Li44YzljY2VkZGIzYTZjNmVhY2Y1ZjU2OTIwMjdlMDAyMGY5MzVhNzM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuY3BwCkBAIC0yNjUsNyAr MjY1LDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgZ2VuZXJhdGVQcm9sb2d1ZSgpOwogICAgIHZv aWQgZ2VuZXJhdGVFcGlsb2d1ZSgpOwotICAgIFZlY3RvcjxTdGFja0FsbG9jYXRvcjo6U3RhY2tS ZWZlcmVuY2UsIHJlZ2lzdGVyQ291bnQ+IG1fcHJvbG9ndWVTdGFja1JlZmVyZW5jZXM7CisgICAg U3RhY2tBbGxvY2F0b3I6OlN0YWNrUmVmZXJlbmNlVmVjdG9yIG1fcHJvbG9ndWVTdGFja1JlZmVy ZW5jZXM7CiAKICAgICBBc3NlbWJsZXIgbV9hc3NlbWJsZXI7CiAgICAgUmVnaXN0ZXJBbGxvY2F0 b3IgbV9yZWdpc3RlckFsbG9jYXRvcjsKQEAgLTExNjYsNyArMTE2Niw3IEBAIGlubGluZSB2b2lk IFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVFcGlsb2d1ZSgpCiAKIHZvaWQgU2VsZWN0 b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0ZVNlbGVjdG9yQ2hlY2tlcigpCiB7Ci0gICAgVmVjdG9y PFN0YWNrQWxsb2NhdG9yOjpTdGFja1JlZmVyZW5jZSwgY2FsbGVlU2F2ZWRSZWdpc3RlckNvdW50 PiBjYWxsZWVTYXZlZFJlZ2lzdGVyU3RhY2tSZWZlcmVuY2VzOworICAgIFN0YWNrQWxsb2NhdG9y OjpTdGFja1JlZmVyZW5jZVZlY3RvciBjYWxsZWVTYXZlZFJlZ2lzdGVyU3RhY2tSZWZlcmVuY2Vz OwogICAgIGJvb2wgcmVzZXJ2ZWRDYWxsZWVTYXZlZFJlZ2lzdGVycyA9IGZhbHNlOwogICAgIHVu c2lnbmVkIGF2YWlsYWJsZVJlZ2lzdGVyQ291bnQgPSBtX3JlZ2lzdGVyQWxsb2NhdG9yLmF2YWls YWJsZVJlZ2lzdGVyQ291bnQoKTsKICAgICB1bnNpZ25lZCBtaW5pbXVtUmVnaXN0ZXJDb3VudEZv ckF0dHJpYnV0ZXMgPSBtaW5pbXVtUmVnaXN0ZXJSZXF1aXJlbWVudHMobV9zZWxlY3RvckZyYWdt ZW50cyk7CkBAIC0xMTc2LDcgKzExNzYsNyBAQCB2b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6 Z2VuZXJhdGVTZWxlY3RvckNoZWNrZXIoKQogICAgIAogICAgIGJvb2wgbmVlZHNFcGlsb2d1ZSA9 IGdlbmVyYXRlUHJvbG9ndWUoKTsKICAgICAKLSAgICBBU1NFUlQobWluaW11bVJlZ2lzdGVyQ291 bnRGb3JBdHRyaWJ1dGVzIDw9IHJlZ2lzdGVyQ291bnQpOworICAgIEFTU0VSVChtaW5pbXVtUmVn aXN0ZXJDb3VudEZvckF0dHJpYnV0ZXMgPD0gbWF4aW11bVJlZ2lzdGVyQ291bnQpOwogICAgIGlm IChhdmFpbGFibGVSZWdpc3RlckNvdW50IDwgbWluaW11bVJlZ2lzdGVyQ291bnRGb3JBdHRyaWJ1 dGVzKSB7CiAgICAgICAgIHJlc2VydmVkQ2FsbGVlU2F2ZWRSZWdpc3RlcnMgPSB0cnVlOwogICAg ICAgICBjYWxsZWVTYXZlZFJlZ2lzdGVyU3RhY2tSZWZlcmVuY2VzID0gbV9zdGFja0FsbG9jYXRv ci5wdXNoKG1fcmVnaXN0ZXJBbGxvY2F0b3IucmVzZXJ2ZUNhbGxlZVNhdmVkUmVnaXN0ZXJzKG1p bmltdW1SZWdpc3RlckNvdW50Rm9yQXR0cmlidXRlcyAtIGF2YWlsYWJsZVJlZ2lzdGVyQ291bnQp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TdGFja0FsbG9jYXRvci5oIGIv U291cmNlL1dlYkNvcmUvY3Nzaml0L1N0YWNrQWxsb2NhdG9yLmgKaW5kZXggOGE3NGVhYTY5NTEx ZTdlMjkxZjI4NGI0ZjBkY2U2NzJjYmJlMzkyNi4uYjFlMWNkZmFkMWI2ZGYxM2Y3MTdhZTRmN2Nj YTYwZDBiYjViZTZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nzaml0L1N0YWNrQWxs b2NhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nzaml0L1N0YWNrQWxsb2NhdG9yLmgKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMywgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ4 LDYgKzQ4LDggQEAgcHVibGljOgogICAgICAgICB1bnNpZ25lZCBtX29mZnNldEZyb21Ub3A7CiAg ICAgfTsKIAorICAgIHR5cGVkZWYgVmVjdG9yPFN0YWNrUmVmZXJlbmNlLCBtYXhpbXVtUmVnaXN0 ZXJDb3VudD4gU3RhY2tSZWZlcmVuY2VWZWN0b3I7CisKICAgICBTdGFja0FsbG9jYXRvcihKU0M6 Ok1hY3JvQXNzZW1ibGVyJiBhc3NlbWJsZXIpCiAgICAgICAgIDogbV9hc3NlbWJsZXIoYXNzZW1i bGVyKQogICAgICAgICAsIG1fb2Zmc2V0RnJvbVRvcCgwKQpAQCAtNjksMTAgKzcxLDEwIEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuIFN0YWNrUmVmZXJlbmNlKG1fb2Zmc2V0RnJvbVRvcCk7CiAg ICAgfQogCi0gICAgVmVjdG9yPFN0YWNrUmVmZXJlbmNlLCByZWdpc3RlckNvdW50PiBwdXNoKGNv bnN0IFZlY3RvcjxKU0M6Ok1hY3JvQXNzZW1ibGVyOjpSZWdpc3RlcklEPiYgcmVnaXN0ZXJJRHMp CisgICAgU3RhY2tSZWZlcmVuY2VWZWN0b3IgcHVzaChjb25zdCBWZWN0b3I8SlNDOjpNYWNyb0Fz c2VtYmxlcjo6UmVnaXN0ZXJJRD4mIHJlZ2lzdGVySURzKQogICAgIHsKICAgICAgICAgUkVMRUFT RV9BU1NFUlQoIW1faGFzRnVuY3Rpb25DYWxsUGFkZGluZyk7Ci0gICAgICAgIFZlY3RvcjxTdGFj a1JlZmVyZW5jZSwgcmVnaXN0ZXJDb3VudD4gc3RhY2tSZWZlcmVuY2VzOworICAgICAgICBTdGFj a1JlZmVyZW5jZVZlY3RvciBzdGFja1JlZmVyZW5jZXM7CiAjaWYgQ1BVKEFSTTY0KQogICAgICAg ICB1bnNpZ25lZCBwdXNoUmVnaXN0ZXJDb3VudCA9IHJlZ2lzdGVySURzLnNpemUoKTsKICAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHB1c2hSZWdpc3RlckNvdW50IC0gMTsgaSArPSAy KSB7CkBAIC05OCw3ICsxMDAsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBTdGFja1JlZmVy ZW5jZShtX29mZnNldEZyb21Ub3ApOwogICAgIH0KIAotICAgIHZvaWQgcG9wKGNvbnN0IFZlY3Rv cjxTdGFja1JlZmVyZW5jZT4mIHN0YWNrUmVmZXJlbmNlcywgY29uc3QgVmVjdG9yPEpTQzo6TWFj cm9Bc3NlbWJsZXI6OlJlZ2lzdGVySUQ+JiByZWdpc3RlcklEcykKKyAgICB2b2lkIHBvcChjb25z dCBTdGFja1JlZmVyZW5jZVZlY3RvciYgc3RhY2tSZWZlcmVuY2VzLCBjb25zdCBWZWN0b3I8SlND OjpNYWNyb0Fzc2VtYmxlcjo6UmVnaXN0ZXJJRD4mIHJlZ2lzdGVySURzKQogICAgIHsKICAgICAg ICAgUkVMRUFTRV9BU1NFUlQoIW1faGFzRnVuY3Rpb25DYWxsUGFkZGluZyk7CiAK