59903 2011-05-01 17:47:32 -0700 Use AssemblerLabel throughout Assembler classes, AssemblerBuffer 2011-05-05 03:41:22 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough thouraya.andolsi oldest_to_newest 396144 0 barraclough 2011-05-01 17:47:32 -0700 Creating a lable() into the AssemblerBuffer should return an AssemblerLabel, not an unsigned int. 396146 1 91861 barraclough 2011-05-01 17:49:27 -0700 Created attachment 91861 The patch 396159 2 barraclough 2011-05-01 18:04:29 -0700 Fixed in r85448 398649 3 thouraya.andolsi 2011-05-05 03:41:22 -0700 Hello, Due to the changes you did, building webkit for SH4 platform, I had the following error : error: AssemblerLabel does not name a type I created a bug that fixes the issue: https://bugs.webkit.org/show_bug.cgi?id=59927 I think there is the same issue in MIPS platforms. Regards, Thouraya. 91861 2011-05-01 17:49:27 -0700 2011-05-01 17:57:19 -0700 The patch 59903.patch text/plain 14252 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODU0NDUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDcgQEAK KzIwMTEtMDUtMDEgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTkwMworICAgICAgICBVc2UgQXNzZW1i bGVyTGFiZWwgdGhyb3VnaG91dCBBc3NlbWJsZXIgY2xhc3NlcywgQXNzZW1ibGVyQnVmZmVyCisK KyAgICAgICAgQ3JlYXRpbmcgYSBsYWJsZSgpIGludG8gdGhlIEFzc2VtYmxlckJ1ZmZlciBzaG91 bGQgcmV0dXJuIGFuIEFzc2VtYmxlckxhYmVsLAorICAgICAgICBub3QgYW4gdW5zaWduZWQgaW50 LgorCisgICAgICAgICogYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5jcHA6CisgICAgICAgIChKU0M6 OkFSTUFzc2VtYmxlcjo6ZXhlY3V0YWJsZUNvcHkpOgorICAgICAgICAqIGFzc2VtYmxlci9BUk1B c3NlbWJsZXIuaDoKKyAgICAgICAgKEpTQzo6QVJNQXNzZW1ibGVyOjpibHgpOgorICAgICAgICAo SlNDOjpBUk1Bc3NlbWJsZXI6OmxhYmVsKToKKyAgICAgICAgKEpTQzo6QVJNQXNzZW1ibGVyOjps b2FkQnJhbmNoVGFyZ2V0KToKKyAgICAgICAgKiBhc3NlbWJsZXIvQVJNdjdBc3NlbWJsZXIuaDoK KyAgICAgICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmIpOgorICAgICAgICAoSlNDOjpBUk12N0Fz c2VtYmxlcjo6Ymx4KToKKyAgICAgICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmJ4KToKKyAgICAg ICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmxhYmVsKToKKyAgICAgICAgKEpTQzo6QVJNdjdBc3Nl bWJsZXI6OkFSTUluc3RydWN0aW9uRm9ybWF0dGVyOjpsYWJlbCk6CisgICAgICAgICogYXNzZW1i bGVyL0Fzc2VtYmxlckJ1ZmZlci5oOgorICAgICAgICAoSlNDOjpBc3NlbWJsZXJCdWZmZXI6Omxh YmVsKToKKyAgICAgICAgKiBhc3NlbWJsZXIvQXNzZW1ibGVyQnVmZmVyV2l0aENvbnN0YW50UG9v bC5oOgorICAgICAgICAqIGFzc2VtYmxlci9NSVBTQXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6 Ok1JUFNBc3NlbWJsZXI6OmxhYmVsKToKKyAgICAgICAgKEpTQzo6TUlQU0Fzc2VtYmxlcjo6cmVs b2NhdGVKdW1wcyk6CisgICAgICAgICogYXNzZW1ibGVyL1NINEFzc2VtYmxlci5oOgorICAgICAg ICAoSlNDOjpTSDRBc3NlbWJsZXI6OmxvYWRDb25zdGFudCk6CisgICAgICAgIChKU0M6OlNINEFz c2VtYmxlcjo6bG9hZENvbnN0YW50VW5SZXVzYWJsZSk6CisgICAgICAgIChKU0M6OlNINEFzc2Vt Ymxlcjo6Y2FsbCk6CisgICAgICAgIChKU0M6OlNINEFzc2VtYmxlcjo6am1wKToKKyAgICAgICAg KEpTQzo6U0g0QXNzZW1ibGVyOjpqbmUpOgorICAgICAgICAoSlNDOjpTSDRBc3NlbWJsZXI6Ompl KToKKyAgICAgICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpsYWJlbCk6CisgICAgICAgIChKU0M6OlNI NEFzc2VtYmxlcjo6b25lU2hvcnRPcCk6CisgICAgICAgICogYXNzZW1ibGVyL1g4NkFzc2VtYmxl ci5oOgorICAgICAgICAoSlNDOjpYODZBc3NlbWJsZXI6OmNhbGwpOgorICAgICAgICAoSlNDOjpY ODZBc3NlbWJsZXI6OmptcF9yKToKKyAgICAgICAgKEpTQzo6WDg2QXNzZW1ibGVyOjpsYWJlbCk6 CisgICAgICAgIChKU0M6Olg4NkFzc2VtYmxlcjo6WDg2SW5zdHJ1Y3Rpb25Gb3JtYXR0ZXI6Omlt bWVkaWF0ZVJlbDMyKToKKyAgICAgICAgKEpTQzo6WDg2QXNzZW1ibGVyOjpYODZJbnN0cnVjdGlv bkZvcm1hdHRlcjo6bGFiZWwpOgorCiAyMDExLTA1LTAxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuY3BwCShyZXZp c2lvbiA4NTQzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1i bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ3LDE4ICszNDcsMTggQEAgdm9pZCogQVJNQXNz ZW1ibGVyOjpleGVjdXRhYmxlQ29weShFeGVjdQogewogICAgIC8vIDY0LWJpdCBhbGlnbm1lbnQg aXMgcmVxdWlyZWQgZm9yIG5leHQgY29uc3RhbnQgcG9vbCBhbmQgSklUIGNvZGUgYXMgd2VsbAog ICAgIG1fYnVmZmVyLmZsdXNoV2l0aG91dEJhcnJpZXIodHJ1ZSk7Ci0gICAgaWYgKG1fYnVmZmVy LmxhYmVsKCkgJiAweDcpCisgICAgaWYgKG1fYnVmZmVyLmNvZGVTaXplKCkgJiAweDcpCiAgICAg ICAgIGJrcHQoMCk7CiAKICAgICBjaGFyKiBkYXRhID0gcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4o bV9idWZmZXIuZXhlY3V0YWJsZUNvcHkoYWxsb2NhdG9yKSk7CiAKICAgICBmb3IgKEp1bXBzOjpJ dGVyYXRvciBpdGVyID0gbV9qdW1wcy5iZWdpbigpOyBpdGVyICE9IG1fanVtcHMuZW5kKCk7ICsr aXRlcikgewogICAgICAgICAvLyBUaGUgbGFzdCBiaXQgaXMgc2V0IGlmIHRoZSBjb25zdGFudCBt dXN0IGJlIHBsYWNlZCBvbiBjb25zdGFudCBwb29sLgotICAgICAgICBpbnQgcG9zID0gKCppdGVy KSAmICh+MHgxKTsKKyAgICAgICAgaW50IHBvcyA9IChpdGVyLT5tX29mZnNldCkgJiAofjB4MSk7 CiAgICAgICAgIEFSTVdvcmQqIGxkckFkZHIgPSByZWludGVycHJldF9jYXN0X3B0cjxBUk1Xb3Jk Kj4oZGF0YSArIHBvcyk7CiAgICAgICAgIEFSTVdvcmQqIGFkZHIgPSBnZXRMZHJJbW1BZGRyZXNz KGxkckFkZHIpOwogICAgICAgICBpZiAoKmFkZHIgIT0gSW52YWxpZEJyYW5jaFRhcmdldCkgewot ICAgICAgICAgICAgaWYgKCEoKml0ZXIgJiAxKSkgeworICAgICAgICAgICAgaWYgKCEoaXRlci0+ bV9vZmZzZXQgJiAxKSkgewogICAgICAgICAgICAgICAgIGludCBkaWZmID0gcmVpbnRlcnByZXRf Y2FzdF9wdHI8QVJNV29yZCo+KGRhdGEgKyAqYWRkcikgLSAobGRyQWRkciArIERlZmF1bHRQcmVm ZXRjaGluZyk7CiAKICAgICAgICAgICAgICAgICBpZiAoKGRpZmYgPD0gQk9GRlNFVF9NQVggJiYg ZGlmZiA+PSBCT0ZGU0VUX01JTikpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvQVJNQXNzZW1ibGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaAkocmV2aXNpb24gODU0MzIpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC05 Nyw3ICs5Nyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB0eXBlZGVmIEFSTVJlZ2lzdGVy czo6UmVnaXN0ZXJJRCBSZWdpc3RlcklEOwogICAgICAgICB0eXBlZGVmIEFSTVJlZ2lzdGVyczo6 RlBSZWdpc3RlcklEIEZQUmVnaXN0ZXJJRDsKICAgICAgICAgdHlwZWRlZiBBc3NlbWJsZXJCdWZm ZXJXaXRoQ29uc3RhbnRQb29sPDIwNDgsIDQsIDQsIEFSTUFzc2VtYmxlcj4gQVJNQnVmZmVyOwot ICAgICAgICB0eXBlZGVmIFNlZ21lbnRlZFZlY3RvcjxpbnQsIDY0PiBKdW1wczsKKyAgICAgICAg dHlwZWRlZiBTZWdtZW50ZWRWZWN0b3I8QXNzZW1ibGVyTGFiZWwsIDY0PiBKdW1wczsKIAogICAg ICAgICBBUk1Bc3NlbWJsZXIoKSB7IH0KIApAQCAtNTkxLDcgKzU5MSw3IEBAIG5hbWVzcGFjZSBK U0MgewogICAgICAgICAgICAgbW92X3IoQVJNUmVnaXN0ZXJzOjpsciwgQVJNUmVnaXN0ZXJzOjpw YywgY2MpOwogICAgICAgICAgICAgYngocm0sIGNjKTsKICNlbmRpZgotICAgICAgICAgICAgcmV0 dXJuIEFzc2VtYmxlckxhYmVsKG1fYnVmZmVyLmxhYmVsKCkpOworICAgICAgICAgICAgcmV0dXJu IG1fYnVmZmVyLmxhYmVsKCk7CiAgICAgICAgIH0KIAogICAgICAgICBzdGF0aWMgQVJNV29yZCBs c2woaW50IHJlZywgQVJNV29yZCB2YWx1ZSkKQEAgLTY1Niw3ICs2NTYsNyBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICAgICAgQXNzZW1ibGVyTGFiZWwgbGFiZWwoKQogICAgICAgICB7CiAgICAgICAg ICAgICBtX2J1ZmZlci5lbnN1cmVTcGFjZUZvckFueU9uZUluc3RydWN0aW9uKCk7Ci0gICAgICAg ICAgICByZXR1cm4gQXNzZW1ibGVyTGFiZWwobV9idWZmZXIubGFiZWwoKSk7CisgICAgICAgICAg ICByZXR1cm4gbV9idWZmZXIubGFiZWwoKTsKICAgICAgICAgfQogCiAgICAgICAgIEFzc2VtYmxl ckxhYmVsIGFsaWduKGludCBhbGlnbm1lbnQpCkBAIC02NzIsNyArNjcyLDcgQEAgbmFtZXNwYWNl IEpTQyB7CiAgICAgICAgICAgICBlbnN1cmVTcGFjZShzaXplb2YoQVJNV29yZCksIHNpemVvZihB Uk1Xb3JkKSk7CiAgICAgICAgICAgICBtX2p1bXBzLmFwcGVuZChtX2J1ZmZlci5sYWJlbCgpIHwg KHVzZUNvbnN0YW50UG9vbCAmIDB4MSkpOwogICAgICAgICAgICAgbGRyX3VuX2ltbShyZCwgSW52 YWxpZEJyYW5jaFRhcmdldCwgY2MpOwotICAgICAgICAgICAgcmV0dXJuIEFzc2VtYmxlckxhYmVs KG1fYnVmZmVyLmxhYmVsKCkpOworICAgICAgICAgICAgcmV0dXJuIG1fYnVmZmVyLmxhYmVsKCk7 CiAgICAgICAgIH0KIAogICAgICAgICBBc3NlbWJsZXJMYWJlbCBqbXAoQ29uZGl0aW9uIGNjID0g QUwsIGludCB1c2VDb25zdGFudFBvb2wgPSAwKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2Fzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvQVJNdjdBc3NlbWJsZXIuaAkocmV2aXNpb24gODU0MzIpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTXY3QXNzZW1ibGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTgyNiw3ICs4MjYsNyBAQCBwdWJsaWM6CiAgICAgQXNzZW1ibGVyTGFiZWwgYigp CiAgICAgewogICAgICAgICBtX2Zvcm1hdHRlci50d29Xb3JkT3AxNk9wMTYoT1BfQl9UNGEsIE9Q X0JfVDRiKTsKLSAgICAgICAgcmV0dXJuIEFzc2VtYmxlckxhYmVsKG1fZm9ybWF0dGVyLmxhYmVs KCkpOworICAgICAgICByZXR1cm4gbV9mb3JtYXR0ZXIubGFiZWwoKTsKICAgICB9CiAgICAgCiAg ICAgLy8gT25seSBhbGxvd2VkIGluIElUIChpZiB0aGVuKSBibG9jayBpZiBsYXN0IGluc3RydWN0 aW9uLgpAQCAtODM0LDE0ICs4MzQsMTQgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgQVNTRVJU KHJtICE9IEFSTVJlZ2lzdGVyczo6cGMpOwogICAgICAgICBtX2Zvcm1hdHRlci5vbmVXb3JkT3A4 UmVnUmVnMTQzKE9QX0JMWCwgcm0sIChSZWdpc3RlcklEKTgpOwotICAgICAgICByZXR1cm4gQXNz ZW1ibGVyTGFiZWwobV9mb3JtYXR0ZXIubGFiZWwoKSk7CisgICAgICAgIHJldHVybiBtX2Zvcm1h dHRlci5sYWJlbCgpOwogICAgIH0KIAogICAgIC8vIE9ubHkgYWxsb3dlZCBpbiBJVCAoaWYgdGhl bikgYmxvY2sgaWYgbGFzdCBpbnN0cnVjdGlvbi4KICAgICBBc3NlbWJsZXJMYWJlbCBieChSZWdp c3RlcklEIHJtKQogICAgIHsKICAgICAgICAgbV9mb3JtYXR0ZXIub25lV29yZE9wOFJlZ1JlZzE0 MyhPUF9CWCwgcm0sIChSZWdpc3RlcklEKTApOwotICAgICAgICByZXR1cm4gQXNzZW1ibGVyTGFi ZWwobV9mb3JtYXR0ZXIubGFiZWwoKSk7CisgICAgICAgIHJldHVybiBtX2Zvcm1hdHRlci5sYWJl bCgpOwogICAgIH0KIAogICAgIHZvaWQgYmtwdCh1aW50OF90IGltbT0wKQpAQCAtMTUyOCw3ICsx NTI4LDcgQEAgcHVibGljOgogCiAgICAgQXNzZW1ibGVyTGFiZWwgbGFiZWwoKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIEFzc2VtYmxlckxhYmVsKG1fZm9ybWF0dGVyLmxhYmVsKCkpOworICAgICAg ICByZXR1cm4gbV9mb3JtYXR0ZXIubGFiZWwoKTsKICAgICB9CiAgICAgCiAgICAgQXNzZW1ibGVy TGFiZWwgYWxpZ24oaW50IGFsaWdubWVudCkKQEAgLTIxOTksNiArMjE5OSw3IEBAIHByaXZhdGU6 CiAgICAgICAgIC8vIEFkbWluaXN0cmF0aXZlIG1ldGhvZHM6CiAKICAgICAgICAgc2l6ZV90IGNv ZGVTaXplKCkgY29uc3QgeyByZXR1cm4gbV9idWZmZXIuY29kZVNpemUoKTsgfQorICAgICAgICBB c3NlbWJsZXJMYWJlbCBsYWJlbCgpIGNvbnN0IHsgcmV0dXJuIG1fYnVmZmVyLmxhYmVsKCk7IH0K ICAgICAgICAgYm9vbCBpc0FsaWduZWQoaW50IGFsaWdubWVudCkgY29uc3QgeyByZXR1cm4gbV9i dWZmZXIuaXNBbGlnbmVkKGFsaWdubWVudCk7IH0KICAgICAgICAgdm9pZCogZGF0YSgpIGNvbnN0 IHsgcmV0dXJuIG1fYnVmZmVyLmRhdGEoKTsgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL0Fzc2VtYmxlckJ1ZmZlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvQXNzZW1ibGVyQnVmZmVyLmgJKHJldmlzaW9uIDg1NDMyKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9Bc3NlbWJsZXJCdWZmZXIuaAkod29y a2luZyBjb3B5KQpAQCAtMTUwLDkgKzE1MCw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAg ICAgcmV0dXJuIG1fc2l6ZTsKICAgICAgICAgfQogCi0gICAgICAgIHVuc2lnbmVkIGxhYmVsKCkg Y29uc3QKKyAgICAgICAgQXNzZW1ibGVyTGFiZWwgbGFiZWwoKSBjb25zdAogICAgICAgICB7Ci0g ICAgICAgICAgICByZXR1cm4gbV9zaXplOworICAgICAgICAgICAgcmV0dXJuIEFzc2VtYmxlckxh YmVsKG1fc2l6ZSk7CiAgICAgICAgIH0KIAogICAgICAgICB2b2lkKiBleGVjdXRhYmxlQ29weShF eGVjdXRhYmxlUG9vbCogYWxsb2NhdG9yKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9Bc3NlbWJsZXJCdWZmZXJXaXRoQ29uc3RhbnRQb29sLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9Bc3NlbWJsZXJCdWZmZXJXaXRoQ29uc3Rh bnRQb29sLmgJKHJldmlzaW9uIDg1NDMxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9Bc3NlbWJsZXJCdWZmZXJXaXRoQ29uc3RhbnRQb29sLmgJKHdvcmtpbmcgY29weSkKQEAg LTI1NCw3ICsyNTQsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgbV9tYXhEaXN0YW5jZSA9IG1h eFBvb2xTaXplOwogICAgICAgICBmbHVzaElmTm9TcGFjZUZvcihzaXplb2YoSW50ZWdyYWxUeXBl KSwgNCk7CiAKLSAgICAgICAgbV9sb2FkT2Zmc2V0cy5hcHBlbmQobGFiZWwoKSk7CisgICAgICAg IG1fbG9hZE9mZnNldHMuYXBwZW5kKGNvZGVTaXplKCkpOwogICAgICAgICBpZiAoaXNSZXVzYWJs ZSkgewogICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX251bUNvbnN0czsgKytpKSB7 CiAgICAgICAgICAgICAgICAgaWYgKG1fbWFza1tpXSA9PSBSZXVzYWJsZUNvbnN0ICYmIG1fcG9v bFtpXSA9PSBjb25zdGFudCkgewpAQCAtMjk2LDcgKzI5Niw3IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICAgICAgQXNzZW1ibGVyQnVmZmVyOjpwdXRJbnQoQXNzZW1ibGVyVHlwZTo6cGFkRm9yQWxp Z24zMik7CiAgICAgICAgIH0KIAotICAgICAgICBpbnQgY29uc3RQb29sT2Zmc2V0ID0gbGFiZWwo KTsKKyAgICAgICAgaW50IGNvbnN0UG9vbE9mZnNldCA9IGNvZGVTaXplKCk7CiAgICAgICAgIGFw cGVuZChyZWludGVycHJldF9jYXN0PGNoYXIqPihtX3Bvb2wpLCBtX251bUNvbnN0cyAqIHNpemVv Zih1aW50MzJfdCkpOwogCiAgICAgICAgIC8vIFBhdGNoIGVhY2ggUEMgcmVsYXRpdmUgbG9hZApJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNzZW1ibGVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNzZW1ibGVy LmgJKHJldmlzaW9uIDg1NDMyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9N SVBTQXNzZW1ibGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0OCw3ICsxNDgsNyBAQCBjbGFzcyBN SVBTQXNzZW1ibGVyIHsKIHB1YmxpYzoKICAgICB0eXBlZGVmIE1JUFNSZWdpc3RlcnM6OlJlZ2lz dGVySUQgUmVnaXN0ZXJJRDsKICAgICB0eXBlZGVmIE1JUFNSZWdpc3RlcnM6OkZQUmVnaXN0ZXJJ RCBGUFJlZ2lzdGVySUQ7Ci0gICAgdHlwZWRlZiBTZWdtZW50ZWRWZWN0b3I8aW50LCA2ND4gSnVt cHM7CisgICAgdHlwZWRlZiBTZWdtZW50ZWRWZWN0b3I8QXNzZW1ibGVyTGFiZWwsIDY0PiBKdW1w czsKIAogICAgIE1JUFNBc3NlbWJsZXIoKQogICAgIHsKQEAgLTYxNyw3ICs2MTcsNyBAQCBwdWJs aWM6CiAKICAgICBBc3NlbWJsZXJMYWJlbCBsYWJlbCgpCiAgICAgewotICAgICAgICByZXR1cm4g QXNzZW1ibGVyTGFiZWwobV9idWZmZXIubGFiZWwoKSk7CisgICAgICAgIHJldHVybiBtX2J1ZmZl ci5sYWJlbCgpOwogICAgIH0KIAogICAgIEFzc2VtYmxlckxhYmVsIGFsaWduKGludCBhbGlnbm1l bnQpCkBAIC03NTcsNyArNzU3LDcgQEAgcHJpdmF0ZToKICAgICB7CiAgICAgICAgIC8vIENoZWNr IGVhY2gganVtcAogICAgICAgICBmb3IgKEp1bXBzOjpJdGVyYXRvciBpdGVyID0gbV9qdW1wcy5i ZWdpbigpOyBpdGVyICE9IG1fanVtcHMuZW5kKCk7ICsraXRlcikgewotICAgICAgICAgICAgaW50 IHBvcyA9ICppdGVyOworICAgICAgICAgICAgaW50IHBvcyA9IGl0ZXItPm1fb2Zmc2V0OwogICAg ICAgICAgICAgTUlQU1dvcmQqIGluc24gPSByZWludGVycHJldF9jYXN0PE1JUFNXb3JkKj4ocmVp bnRlcnByZXRfY2FzdDxpbnRwdHJfdD4obmV3QmFzZSkgKyBwb3MpOwogICAgICAgICAgICAgaW5z biA9IGluc24gKyAyOwogICAgICAgICAgICAgLy8gTmVlZCB0byBtYWtlIHN1cmUgd2UgaGF2ZSA1 IHZhbGlkIGluc3RydWN0aW9ucyBhZnRlciBwb3MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvU0g0QXNzZW1ibGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9TSDRBc3NlbWJsZXIuaAkocmV2aXNpb24gODU0MzIpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NINEFzc2VtYmxlci5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMTI1LDcgKzExMjUsNyBAQCBwdWJsaWM6CiAgICAgICAgIHVpbnQxNl90IG9wYyA9IGdl dE9wY29kZUdyb3VwMyhNT1ZJTU1fT1BDT0RFLCBkc3QsIDApOwogCiAgICAgICAgIG1fYnVmZmVy LmVuc3VyZVNwYWNlKG1heEluc3RydWN0aW9uU2l6ZSwgc2l6ZW9mKHVpbnQzMl90KSk7Ci0gICAg ICAgIHByaW50SW5zdHIoZ2V0T3Bjb2RlR3JvdXAzKE1PVklNTV9PUENPREUsIGRzdCwgY29uc3Rh bnQpLCBtX2J1ZmZlci5sYWJlbCgpKTsKKyAgICAgICAgcHJpbnRJbnN0cihnZXRPcGNvZGVHcm91 cDMoTU9WSU1NX09QQ09ERSwgZHN0LCBjb25zdGFudCksIG1fYnVmZmVyLmNvZGVTaXplKCkpOwog ICAgICAgICBtX2J1ZmZlci5wdXRTaG9ydFdpdGhDb25zdGFudEludChvcGMsIGNvbnN0YW50LCB0 cnVlKTsKICAgICB9CiAKQEAgLTExMzYsNyArMTEzNiw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYg KGVuc3VyZVNwYWNlKQogICAgICAgICAgICAgbV9idWZmZXIuZW5zdXJlU3BhY2UobWF4SW5zdHJ1 Y3Rpb25TaXplLCBzaXplb2YodWludDMyX3QpKTsKIAotICAgICAgICBwcmludEluc3RyKGdldE9w Y29kZUdyb3VwMyhNT1ZJTU1fT1BDT0RFLCBkc3QsIGNvbnN0YW50KSwgbV9idWZmZXIubGFiZWwo KSk7CisgICAgICAgIHByaW50SW5zdHIoZ2V0T3Bjb2RlR3JvdXAzKE1PVklNTV9PUENPREUsIGRz dCwgY29uc3RhbnQpLCBtX2J1ZmZlci5jb2RlU2l6ZSgpKTsKICAgICAgICAgbV9idWZmZXIucHV0 U2hvcnRXaXRoQ29uc3RhbnRJbnQob3BjLCBjb25zdGFudCk7CiAgICAgfQogCkBAIC0xMTUwLDcg KzExNTAsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJyYW5jaChKU1JfT1BDT0RFLCBzY3IpOwogICAg ICAgICBub3AoKTsKICAgICAgICAgcmVsZWFzZVNjcmF0Y2goc2NyKTsKLSAgICAgICAgcmV0dXJu IEFzc2VtYmxlckxhYmVsKG1fYnVmZmVyLmxhYmVsKCkpOworICAgICAgICByZXR1cm4gbV9idWZm ZXIubGFiZWwoKTsKICAgICB9CiAKICAgICBBc3NlbWJsZXJMYWJlbCBjYWxsKFJlZ2lzdGVySUQg ZHN0KQpAQCAtMTE1OCwyNSArMTE1OCwyNSBAQCBwdWJsaWM6CiAgICAgICAgIG1fYnVmZmVyLmVu c3VyZVNwYWNlKG1heEluc3RydWN0aW9uU2l6ZSArIDIpOwogICAgICAgICBicmFuY2goSlNSX09Q Q09ERSwgZHN0KTsKICAgICAgICAgbm9wKCk7Ci0gICAgICAgIHJldHVybiBBc3NlbWJsZXJMYWJl bChtX2J1ZmZlci5sYWJlbCgpKTsKKyAgICAgICAgcmV0dXJuIG1fYnVmZmVyLmxhYmVsKCk7CiAg ICAgfQogCiAgICAgQXNzZW1ibGVyTGFiZWwgam1wKCkKICAgICB7CiAgICAgICAgIFJlZ2lzdGVy SUQgc2NyID0gY2xhaW1TY3JhdGNoKCk7CiAgICAgICAgIG1fYnVmZmVyLmVuc3VyZVNwYWNlKG1h eEluc3RydWN0aW9uU2l6ZSArIDQsIHNpemVvZih1aW50MzJfdCkpOwotICAgICAgICBpbnQgbV9z aXplID0gbV9idWZmZXIubGFiZWwoKTsKKyAgICAgICAgQXNzZW1ibGVyTGFiZWwgbGFiZWwgPSBt X2J1ZmZlci5sYWJlbCgpOwogICAgICAgICBsb2FkQ29uc3RhbnRVblJldXNhYmxlKDB4MCwgc2Ny KTsKICAgICAgICAgYnJhbmNoKEJSQUZfT1BDT0RFLCBzY3IpOwogICAgICAgICBub3AoKTsKICAg ICAgICAgcmVsZWFzZVNjcmF0Y2goc2NyKTsKLSAgICAgICAgcmV0dXJuIEFzc2VtYmxlckxhYmVs KG1fc2l6ZSk7CisgICAgICAgIHJldHVybiBsYWJlbDsKICAgICB9CiAKICAgICBBc3NlbWJsZXJM YWJlbCBqbXAoUmVnaXN0ZXJJRCBkc3QpCiAgICAgewogICAgICAgICBqbXBSZWcoZHN0KTsKLSAg ICAgICAgcmV0dXJuIEFzc2VtYmxlckxhYmVsKG1fYnVmZmVyLmxhYmVsKCkpOworICAgICAgICBy ZXR1cm4gbV9idWZmZXIubGFiZWwoKTsKICAgICB9CiAKICAgICB2b2lkIGptcFJlZyhSZWdpc3Rl cklEIGRzdCkKQEAgLTExODgsMTYgKzExODgsMTYgQEAgcHVibGljOgogCiAgICAgQXNzZW1ibGVy TGFiZWwgam5lKCkKICAgICB7Ci0gICAgICAgIGludCBtX3NpemUgPSBtX2J1ZmZlci5sYWJlbCgp OworICAgICAgICBBc3NlbWJsZXJMYWJlbCBsYWJlbCA9IG1fYnVmZmVyLmxhYmVsKCk7CiAgICAg ICAgIGJyYW5jaChCRl9PUENPREUsIDApOwotICAgICAgICByZXR1cm4gQXNzZW1ibGVyTGFiZWwo bV9zaXplKTsKKyAgICAgICAgcmV0dXJuIGxhYmVsOwogICAgIH0KIAogICAgIEFzc2VtYmxlckxh YmVsIGplKCkKICAgICB7Ci0gICAgICAgIGludCBtX3NpemUgPSBtX2J1ZmZlci5sYWJlbCgpOwor ICAgICAgICBBc3NlbWJsZXJMYWJlbCBsYWJlbCA9IG1fYnVmZmVyLmxhYmVsKCk7CiAgICAgICAg IGJyYW5jaChCVF9PUENPREUsIDApOwotICAgICAgICByZXR1cm4gQXNzZW1ibGVyTGFiZWwobV9z aXplKTsKKyAgICAgICAgcmV0dXJuIGxhYmVsOwogICAgIH0KIAogICAgIHZvaWQgcmV0KCkKQEAg LTEyMDksNyArMTIwOSw3IEBAIHB1YmxpYzoKICAgICBBc3NlbWJsZXJMYWJlbCBsYWJlbCgpCiAg ICAgewogICAgICAgICBtX2J1ZmZlci5lbnN1cmVTcGFjZUZvckFueU9uZUluc3RydWN0aW9uKCk7 Ci0gICAgICAgIHJldHVybiBBc3NlbWJsZXJMYWJlbChtX2J1ZmZlci5sYWJlbCgpKTsKKyAgICAg ICAgcmV0dXJuIG1fYnVmZmVyLmxhYmVsKCk7CiAgICAgfQogCiAgICAgaW50IHNpemVPZkNvbnN0 YW50UG9vbCgpCkBAIC0xNDgxLDcgKzE0ODEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIG9uZVNo b3J0T3AodWludDE2X3Qgb3Bjb2RlLCBib29sIGNoZWNrc2l6ZSA9IHRydWUsIGJvb2wgaXNEb3Vi bGUgPSB0cnVlKQogICAgIHsKLSAgICAgICAgcHJpbnRJbnN0cihvcGNvZGUsIG1fYnVmZmVyLmxh YmVsKCksIGlzRG91YmxlKTsKKyAgICAgICAgcHJpbnRJbnN0cihvcGNvZGUsIG1fYnVmZmVyLmNv ZGVTaXplKCksIGlzRG91YmxlKTsKICAgICAgICAgaWYgKGNoZWNrc2l6ZSkKICAgICAgICAgICAg IG1fYnVmZmVyLmVuc3VyZVNwYWNlKG1heEluc3RydWN0aW9uU2l6ZSk7CiAgICAgICAgIG1fYnVm ZmVyLnB1dFNob3J0VW5jaGVja2VkKG9wY29kZSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL1g4NkFzc2VtYmxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvWDg2QXNzZW1ibGVyLmgJKHJldmlzaW9uIDg1NDMyKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9YODZBc3NlbWJsZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtMTE3Nyw3ICsxMTc3LDcgQEAgcHVibGljOgogICAgIEFzc2VtYmxlckxhYmVsIGNhbGwo UmVnaXN0ZXJJRCBkc3QpCiAgICAgewogICAgICAgICBtX2Zvcm1hdHRlci5vbmVCeXRlT3AoT1Bf R1JPVVA1X0V2LCBHUk9VUDVfT1BfQ0FMTE4sIGRzdCk7Ci0gICAgICAgIHJldHVybiBBc3NlbWJs ZXJMYWJlbChtX2Zvcm1hdHRlci5sYWJlbCgpKTsKKyAgICAgICAgcmV0dXJuIG1fZm9ybWF0dGVy LmxhYmVsKCk7CiAgICAgfQogICAgIAogICAgIHZvaWQgY2FsbF9tKGludCBvZmZzZXQsIFJlZ2lz dGVySUQgYmFzZSkKQEAgLTExOTcsNyArMTE5Nyw3IEBAIHB1YmxpYzoKICAgICBBc3NlbWJsZXJM YWJlbCBqbXBfcihSZWdpc3RlcklEIGRzdCkKICAgICB7CiAgICAgICAgIG1fZm9ybWF0dGVyLm9u ZUJ5dGVPcChPUF9HUk9VUDVfRXYsIEdST1VQNV9PUF9KTVBOLCBkc3QpOwotICAgICAgICByZXR1 cm4gQXNzZW1ibGVyTGFiZWwobV9mb3JtYXR0ZXIubGFiZWwoKSk7CisgICAgICAgIHJldHVybiBt X2Zvcm1hdHRlci5sYWJlbCgpOwogICAgIH0KICAgICAKICAgICB2b2lkIGptcF9tKGludCBvZmZz ZXQsIFJlZ2lzdGVySUQgYmFzZSkKQEAgLTE0NzgsNyArMTQ3OCw3IEBAIHB1YmxpYzoKIAogICAg IEFzc2VtYmxlckxhYmVsIGxhYmVsKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBBc3NlbWJsZXJM YWJlbChtX2Zvcm1hdHRlci5sYWJlbCgpKTsKKyAgICAgICAgcmV0dXJuIG1fZm9ybWF0dGVyLmxh YmVsKCk7CiAgICAgfQogICAgIAogICAgIHN0YXRpYyBBc3NlbWJsZXJMYWJlbCBsYWJlbEZvcihB c3NlbWJsZXJMYWJlbCBqdW1wLCBpbnRwdHJfdCBvZmZzZXQgPSAwKQpAQCAtMTg3MCwxMyArMTg3 MCwxMyBAQCBwcml2YXRlOgogICAgICAgICBBc3NlbWJsZXJMYWJlbCBpbW1lZGlhdGVSZWwzMigp CiAgICAgICAgIHsKICAgICAgICAgICAgIG1fYnVmZmVyLnB1dEludFVuY2hlY2tlZCgwKTsKLSAg ICAgICAgICAgIHJldHVybiBBc3NlbWJsZXJMYWJlbChsYWJlbCgpKTsKKyAgICAgICAgICAgIHJl dHVybiBsYWJlbCgpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gQWRtaW5pc3RyYXRpdmUgbWV0 aG9kczoKIAogICAgICAgICBzaXplX3QgY29kZVNpemUoKSBjb25zdCB7IHJldHVybiBtX2J1ZmZl ci5jb2RlU2l6ZSgpOyB9Ci0gICAgICAgIHNpemVfdCBsYWJlbCgpIGNvbnN0IHsgcmV0dXJuIG1f YnVmZmVyLmxhYmVsKCk7IH0KKyAgICAgICAgQXNzZW1ibGVyTGFiZWwgbGFiZWwoKSBjb25zdCB7 IHJldHVybiBtX2J1ZmZlci5sYWJlbCgpOyB9CiAgICAgICAgIGJvb2wgaXNBbGlnbmVkKGludCBh bGlnbm1lbnQpIGNvbnN0IHsgcmV0dXJuIG1fYnVmZmVyLmlzQWxpZ25lZChhbGlnbm1lbnQpOyB9 CiAgICAgICAgIHZvaWQqIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX2J1ZmZlci5kYXRhKCk7IH0K IAo=