133800 2014-06-12 09:12:41 -0700 Move structureHasRareData out of TypeInfo 2014-06-12 11:23:19 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg commit-queue oldest_to_newest 1015130 0 mhahnenberg 2014-06-12 09:12:41 -0700 It was originally put there to avoid making Structure bigger, but we have a few spare bits in Structure so it would be nice to remove this hack. 1015132 1 232956 mhahnenberg 2014-06-12 09:14:31 -0700 Created attachment 232956 Patch 1015165 2 232956 commit-queue 2014-06-12 11:23:17 -0700 Comment on attachment 232956 Patch Clearing flags on attachment: 232956 Committed r169903: <http://trac.webkit.org/changeset/169903> 1015167 3 commit-queue 2014-06-12 11:23:19 -0700 All reviewed patches have been landed. Closing bug. 232956 2014-06-12 09:14:31 -0700 2014-06-12 11:23:17 -0700 Patch bug-133800-20140612091407.patch text/plain 9359 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY5ODk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE0LTA2LTEyICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgTW92ZSBzdHJ1Y3R1cmVIYXNSYXJlRGF0YSBvdXQgb2YgVHlwZUluZm8KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzgwMAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0cnVjdHVyZUhhc1Jh cmVEYXRhIHdhcyBvcmlnaW5hbGx5IHB1dCBpbiBUeXBlSW5mbyB0byBhdm9pZCBtYWtpbmcgU3Ry dWN0dXJlIGJpZ2dlciwgCisgICAgICAgIGJ1dCB3ZSBoYXZlIGEgZmV3IHNwYXJlIGJpdHMgaW4g U3RydWN0dXJlIHNvIGl0IHdvdWxkIGJlIG5pY2UgdG8gcmVtb3ZlIHRoaXMgaGFjay4KKworICAg ICAgICAqIHJ1bnRpbWUvSlNUeXBlSW5mby5oOgorICAgICAgICAoSlNDOjpUeXBlSW5mbzo6bmV3 SW1wdXJlUHJvcGVydHlGaXJlc1dhdGNocG9pbnRzKToKKyAgICAgICAgKEpTQzo6VHlwZUluZm86 OnN0cnVjdHVyZUhhc1JhcmVEYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBydW50aW1lL1N0cnVj dHVyZS5jcHA6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6U3RydWN0dXJlKToKKyAgICAgICAg KEpTQzo6U3RydWN0dXJlOjphbGxvY2F0ZVJhcmVEYXRhKToKKyAgICAgICAgKEpTQzo6U3RydWN0 dXJlOjpjbG9uZVJhcmVEYXRhRnJvbSk6CisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuaDoK KyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpwcmV2aW91c0lEKToKKyAgICAgICAgKEpTQzo6U3Ry dWN0dXJlOjpvYmplY3RUb1N0cmluZ1ZhbHVlKToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpz ZXRPYmplY3RUb1N0cmluZ1ZhbHVlKToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpzZXRQcmV2 aW91c0lEKToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlOjpjbGVhclByZXZpb3VzSUQpOgorICAg ICAgICAoSlNDOjpTdHJ1Y3R1cmU6OnByZXZpb3VzKToKKyAgICAgICAgKEpTQzo6U3RydWN0dXJl OjpyYXJlRGF0YSk6CisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmVJbmxpbmVzLmg6CisgICAg ICAgIChKU0M6OlN0cnVjdHVyZTo6c2V0RW51bWVyYXRpb25DYWNoZSk6CisgICAgICAgIChKU0M6 OlN0cnVjdHVyZTo6ZW51bWVyYXRpb25DYWNoZSk6CisKIDIwMTQtMDYtMTIgIFpzb2x0IEJvcmJl bHkgIDx6c2JvcmJlbHkudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBB bGxvdyBlbnVtIGd1YXJkcyB0byBiZSBnZW5lcmF0ZWQgZnJvbSB0aGUgcmVwbGF5IGpzb24gZmls ZXMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTVHlwZUluZm8uaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1R5cGVJbmZvLmgJKHJl dmlzaW9uIDE2OTg5OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTVHlwZUlu Zm8uaAkod29ya2luZyBjb3B5KQpAQCAtNDksOCArNDksNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICBzdGF0aWMgY29uc3QgdW5zaWduZWQgUHJvaGliaXRzUHJvcGVydHlDYWNoaW5nID0gMSA8PCA5 OwogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBIYXNJbXB1cmVHZXRPd25Qcm9wZXJ0eVNsb3Qg PSAxIDw8IDEwOwogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBOZXdJbXB1cmVQcm9wZXJ0eUZp cmVzV2F0Y2hwb2ludHMgPSAxIDw8IDExOwotICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBTdHJ1 Y3R1cmVIYXNSYXJlRGF0YSA9IDEgPDwgMTI7Ci0gICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFN0 cnVjdHVyZUlzSW1tb3J0YWwgPSAxIDw8IDEzOworICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBT dHJ1Y3R1cmVJc0ltbW9ydGFsID0gMSA8PCAxMjsKIAogICAgIGNsYXNzIFR5cGVJbmZvIHsKICAg ICBwdWJsaWM6CkBAIC05Niw3ICs5NSw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBib29s IHByb2hpYml0c1Byb3BlcnR5Q2FjaGluZygpIGNvbnN0IHsgcmV0dXJuIGlzU2V0T25GbGFnczIo UHJvaGliaXRzUHJvcGVydHlDYWNoaW5nKTsgfQogICAgICAgICBib29sIGhhc0ltcHVyZUdldE93 blByb3BlcnR5U2xvdCgpIGNvbnN0IHsgcmV0dXJuIGlzU2V0T25GbGFnczIoSGFzSW1wdXJlR2V0 T3duUHJvcGVydHlTbG90KTsgfQogICAgICAgICBib29sIG5ld0ltcHVyZVByb3BlcnR5RmlyZXNX YXRjaHBvaW50cygpIGNvbnN0IHsgcmV0dXJuIGlzU2V0T25GbGFnczIoTmV3SW1wdXJlUHJvcGVy dHlGaXJlc1dhdGNocG9pbnRzKTsgfQotICAgICAgICBib29sIHN0cnVjdHVyZUhhc1JhcmVEYXRh KCkgY29uc3QgeyByZXR1cm4gaXNTZXRPbkZsYWdzMihTdHJ1Y3R1cmVIYXNSYXJlRGF0YSk7IH0K ICAgICAgICAgYm9vbCBzdHJ1Y3R1cmVJc0ltbW9ydGFsKCkgY29uc3QgeyByZXR1cm4gaXNTZXRP bkZsYWdzMihTdHJ1Y3R1cmVJc0ltbW9ydGFsKTsgfQogCiAgICAgICAgIHN0YXRpYyBwdHJkaWZm X3QgZmxhZ3NPZmZzZXQoKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3Ry dWN0dXJlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9T dHJ1Y3R1cmUuY3BwCShyZXZpc2lvbiAxNjk4OTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9TdHJ1Y3R1cmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjksMTAgKzE2OSwxMSBA QCBTdHJ1Y3R1cmU6OlN0cnVjdHVyZShWTSYgdm0sIEpTR2xvYmFsT2JqCiAgICAgLCBtX3ByZXZl bnRFeHRlbnNpb25zKGZhbHNlKQogICAgICwgbV9kaWRUcmFuc2l0aW9uKGZhbHNlKQogICAgICwg bV9zdGF0aWNGdW5jdGlvblJlaWZpZWQoZmFsc2UpCisgICAgLCBtX2hhc1JhcmVEYXRhKGZhbHNl KQogewogICAgIEFTU0VSVChpbmxpbmVDYXBhY2l0eSA8PSBKU0ZpbmFsT2JqZWN0OjptYXhJbmxp bmVDYXBhY2l0eSgpKTsKICAgICBBU1NFUlQoc3RhdGljX2Nhc3Q8UHJvcGVydHlPZmZzZXQ+KGlu bGluZUNhcGFjaXR5KSA8IGZpcnN0T3V0T2ZMaW5lT2Zmc2V0KTsKLSAgICBBU1NFUlQoIXR5cGVJ bmZvLnN0cnVjdHVyZUhhc1JhcmVEYXRhKCkpOworICAgIEFTU0VSVCghbV9oYXNSYXJlRGF0YSk7 CiAgICAgQVNTRVJUKGhhc1JlYWRPbmx5T3JHZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVzRXhjbHVkaW5n UHJvdG8oKSB8fCAhbV9jbGFzc0luZm8tPmhhc1N0YXRpY1NldHRlck9yUmVhZG9ubHlQcm9wZXJ0 aWVzKHZtKSk7CiAgICAgQVNTRVJUKGhhc0dldHRlclNldHRlclByb3BlcnRpZXMoKSB8fCAhbV9j bGFzc0luZm8tPmhhc1N0YXRpY1NldHRlck9yUmVhZG9ubHlQcm9wZXJ0aWVzKHZtKSk7CiB9CkBA IC0xOTgsNiArMTk5LDcgQEAgU3RydWN0dXJlOjpTdHJ1Y3R1cmUoVk0mIHZtKQogICAgICwgbV9w cmV2ZW50RXh0ZW5zaW9ucyhmYWxzZSkKICAgICAsIG1fZGlkVHJhbnNpdGlvbihmYWxzZSkKICAg ICAsIG1fc3RhdGljRnVuY3Rpb25SZWlmaWVkKGZhbHNlKQorICAgICwgbV9oYXNSYXJlRGF0YShm YWxzZSkKIHsKICAgICBUeXBlSW5mbyB0eXBlSW5mbyA9IFR5cGVJbmZvKENvbXBvdW5kVHlwZSwg T3ZlcnJpZGVzVmlzaXRDaGlsZHJlbiB8IFN0cnVjdHVyZUlzSW1tb3J0YWwpOwogICAgIG1fYmxv YiA9IFN0cnVjdHVyZUlEQmxvYih2bS5oZWFwLnN0cnVjdHVyZUlEVGFibGUoKS5hbGxvY2F0ZUlE KHRoaXMpLCAwLCB0eXBlSW5mbyk7CkBAIC0yMjYsMTMgKzIyOCwxNCBAQCBTdHJ1Y3R1cmU6OlN0 cnVjdHVyZShWTSYgdm0sIFN0cnVjdHVyZSogCiAgICAgLCBtX3ByZXZlbnRFeHRlbnNpb25zKHBy ZXZpb3VzLT5tX3ByZXZlbnRFeHRlbnNpb25zKQogICAgICwgbV9kaWRUcmFuc2l0aW9uKHRydWUp CiAgICAgLCBtX3N0YXRpY0Z1bmN0aW9uUmVpZmllZChwcmV2aW91cy0+bV9zdGF0aWNGdW5jdGlv blJlaWZpZWQpCisgICAgLCBtX2hhc1JhcmVEYXRhKGZhbHNlKQogewotICAgIFR5cGVJbmZvIHR5 cGVJbmZvID0gVHlwZUluZm8ocHJldmlvdXMtPnR5cGVJbmZvKCkudHlwZSgpLCBwcmV2aW91cy0+ dHlwZUluZm8oKS5mbGFncygpICYgflN0cnVjdHVyZUhhc1JhcmVEYXRhKTsKKyAgICBUeXBlSW5m byB0eXBlSW5mbyA9IHByZXZpb3VzLT50eXBlSW5mbygpOwogICAgIG1fYmxvYiA9IFN0cnVjdHVy ZUlEQmxvYih2bS5oZWFwLnN0cnVjdHVyZUlEVGFibGUoKS5hbGxvY2F0ZUlEKHRoaXMpLCBwcmV2 aW91cy0+aW5kZXhpbmdUeXBlSW5jbHVkaW5nSGlzdG9yeSgpLCB0eXBlSW5mbyk7CiAgICAgbV9v dXRPZkxpbmVUeXBlRmxhZ3MgPSB0eXBlSW5mby5vdXRPZkxpbmVUeXBlRmxhZ3MoKTsKIAogICAg IEFTU0VSVCghcHJldmlvdXMtPnR5cGVJbmZvKCkuc3RydWN0dXJlSXNJbW1vcnRhbCgpKTsKLSAg ICBpZiAocHJldmlvdXMtPnR5cGVJbmZvKCkuc3RydWN0dXJlSGFzUmFyZURhdGEoKSAmJiBwcmV2 aW91cy0+cmFyZURhdGEoKS0+bmVlZHNDbG9uaW5nKCkpCisgICAgaWYgKHByZXZpb3VzLT5tX2hh c1JhcmVEYXRhICYmIHByZXZpb3VzLT5yYXJlRGF0YSgpLT5uZWVkc0Nsb25pbmcoKSkKICAgICAg ICAgY2xvbmVSYXJlRGF0YUZyb20odm0sIHByZXZpb3VzKTsKICAgICBzZXRQcmV2aW91c0lEKHZt LCB0aGlzLCBwcmV2aW91cyk7CiAKQEAgLTc5MCwyNCArNzkzLDIxIEBAIHZvaWQgU3RydWN0dXJl OjpwaW4oKQogCiB2b2lkIFN0cnVjdHVyZTo6YWxsb2NhdGVSYXJlRGF0YShWTSYgdm0pCiB7Ci0g ICAgQVNTRVJUKCF0eXBlSW5mbygpLnN0cnVjdHVyZUhhc1JhcmVEYXRhKCkpOworICAgIEFTU0VS VCghbV9oYXNSYXJlRGF0YSk7CiAgICAgU3RydWN0dXJlUmFyZURhdGEqIHJhcmVEYXRhID0gU3Ry dWN0dXJlUmFyZURhdGE6OmNyZWF0ZSh2bSwgcHJldmlvdXMoKSk7Ci0gICAgVHlwZUluZm8gb2xk VHlwZUluZm8gPSB0eXBlSW5mbygpOwotICAgIFR5cGVJbmZvIG5ld1R5cGVJbmZvID0gVHlwZUlu Zm8ob2xkVHlwZUluZm8udHlwZSgpLCBvbGRUeXBlSW5mby5mbGFncygpIHwgU3RydWN0dXJlSGFz UmFyZURhdGEpOwotICAgIG1fb3V0T2ZMaW5lVHlwZUZsYWdzID0gbmV3VHlwZUluZm8ub3V0T2ZM aW5lVHlwZUZsYWdzKCk7CiAgICAgbV9wcmV2aW91c09yUmFyZURhdGEuc2V0KHZtLCB0aGlzLCBy YXJlRGF0YSk7Ci0gICAgQVNTRVJUKHR5cGVJbmZvKCkuc3RydWN0dXJlSGFzUmFyZURhdGEoKSk7 CisgICAgbV9oYXNSYXJlRGF0YSA9IHRydWU7CisgICAgQVNTRVJUKG1faGFzUmFyZURhdGEpOwog fQogCiB2b2lkIFN0cnVjdHVyZTo6Y2xvbmVSYXJlRGF0YUZyb20oVk0mIHZtLCBjb25zdCBTdHJ1 Y3R1cmUqIG90aGVyKQogewotICAgIEFTU0VSVChvdGhlci0+dHlwZUluZm8oKS5zdHJ1Y3R1cmVI YXNSYXJlRGF0YSgpKTsKKyAgICBBU1NFUlQoIW1faGFzUmFyZURhdGEpOworICAgIEFTU0VSVChv dGhlci0+bV9oYXNSYXJlRGF0YSk7CiAgICAgU3RydWN0dXJlUmFyZURhdGEqIG5ld1JhcmVEYXRh ID0gU3RydWN0dXJlUmFyZURhdGE6OmNsb25lKHZtLCBvdGhlci0+cmFyZURhdGEoKSk7Ci0gICAg VHlwZUluZm8gb2xkVHlwZUluZm8gPSB0eXBlSW5mbygpOwotICAgIFR5cGVJbmZvIG5ld1R5cGVJ bmZvID0gVHlwZUluZm8ob2xkVHlwZUluZm8udHlwZSgpLCBvbGRUeXBlSW5mby5mbGFncygpIHwg U3RydWN0dXJlSGFzUmFyZURhdGEpOwotICAgIG1fb3V0T2ZMaW5lVHlwZUZsYWdzID0gbmV3VHlw ZUluZm8ub3V0T2ZMaW5lVHlwZUZsYWdzKCk7CiAgICAgbV9wcmV2aW91c09yUmFyZURhdGEuc2V0 KHZtLCB0aGlzLCBuZXdSYXJlRGF0YSk7Ci0gICAgQVNTRVJUKHR5cGVJbmZvKCkuc3RydWN0dXJl SGFzUmFyZURhdGEoKSk7CisgICAgbV9oYXNSYXJlRGF0YSA9IHRydWU7CisgICAgQVNTRVJUKG1f aGFzUmFyZURhdGEpOwogfQogCiAjaWYgRFVNUF9QUk9QRVJUWU1BUF9TVEFUUwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgJKHJldmlzaW9uIDE2OTg5OCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xOTYsNyArMTk2LDcgQEAgcHVibGljOgogICAgIFN0cnVjdHVyZSogcHJldmlvdXNJ RCgpIGNvbnN0CiAgICAgewogICAgICAgICBBU1NFUlQoc3RydWN0dXJlKCktPmNsYXNzSW5mbygp ID09IGluZm8oKSk7Ci0gICAgICAgIGlmICh0eXBlSW5mbygpLnN0cnVjdHVyZUhhc1JhcmVEYXRh KCkpCisgICAgICAgIGlmIChtX2hhc1JhcmVEYXRhKQogICAgICAgICAgICAgcmV0dXJuIHJhcmVE YXRhKCktPnByZXZpb3VzSUQoKTsKICAgICAgICAgcmV0dXJuIHByZXZpb3VzKCk7CiAgICAgfQpA QCAtMzA1LDE0ICszMDUsMTQgQEAgcHVibGljOgogCiAgICAgSlNTdHJpbmcqIG9iamVjdFRvU3Ry aW5nVmFsdWUoKQogICAgIHsKLSAgICAgICAgaWYgKCF0eXBlSW5mbygpLnN0cnVjdHVyZUhhc1Jh cmVEYXRhKCkpCisgICAgICAgIGlmICghbV9oYXNSYXJlRGF0YSkKICAgICAgICAgICAgIHJldHVy biAwOwogICAgICAgICByZXR1cm4gcmFyZURhdGEoKS0+b2JqZWN0VG9TdHJpbmdWYWx1ZSgpOwog ICAgIH0KIAogICAgIHZvaWQgc2V0T2JqZWN0VG9TdHJpbmdWYWx1ZShWTSYgdm0sIGNvbnN0IEpT Q2VsbCogb3duZXIsIEpTU3RyaW5nKiB2YWx1ZSkKICAgICB7Ci0gICAgICAgIGlmICghdHlwZUlu Zm8oKS5zdHJ1Y3R1cmVIYXNSYXJlRGF0YSgpKQorICAgICAgICBpZiAoIW1faGFzUmFyZURhdGEp CiAgICAgICAgICAgICBhbGxvY2F0ZVJhcmVEYXRhKHZtKTsKICAgICAgICAgcmFyZURhdGEoKS0+ c2V0T2JqZWN0VG9TdHJpbmdWYWx1ZSh2bSwgb3duZXIsIHZhbHVlKTsKICAgICB9CkBAIC00NTgs NyArNDU4LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0UHJldmlvdXNJRChWTSYgdm0sIFN0 cnVjdHVyZSogdHJhbnNpdGlvbiwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUpCiAgICAgewotICAgICAg ICBpZiAodHlwZUluZm8oKS5zdHJ1Y3R1cmVIYXNSYXJlRGF0YSgpKQorICAgICAgICBpZiAobV9o YXNSYXJlRGF0YSkKICAgICAgICAgICAgIHJhcmVEYXRhKCktPnNldFByZXZpb3VzSUQodm0sIHRy YW5zaXRpb24sIHN0cnVjdHVyZSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fcHJldmlv dXNPclJhcmVEYXRhLnNldCh2bSwgdHJhbnNpdGlvbiwgc3RydWN0dXJlKTsKQEAgLTQ2Niw3ICs0 NjYsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBjbGVhclByZXZpb3VzSUQoKQogICAgIHsKLSAg ICAgICAgaWYgKHR5cGVJbmZvKCkuc3RydWN0dXJlSGFzUmFyZURhdGEoKSkKKyAgICAgICAgaWYg KG1faGFzUmFyZURhdGEpCiAgICAgICAgICAgICByYXJlRGF0YSgpLT5jbGVhclByZXZpb3VzSUQo KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9wcmV2aW91c09yUmFyZURhdGEuY2xlYXIo KTsKQEAgLTQ4NSwxMyArNDg1LDEzIEBAIHByaXZhdGU6CiAKICAgICBTdHJ1Y3R1cmUqIHByZXZp b3VzKCkgY29uc3QKICAgICB7Ci0gICAgICAgIEFTU0VSVCghdHlwZUluZm8oKS5zdHJ1Y3R1cmVI YXNSYXJlRGF0YSgpKTsKKyAgICAgICAgQVNTRVJUKCFtX2hhc1JhcmVEYXRhKTsKICAgICAgICAg cmV0dXJuIHN0YXRpY19jYXN0PFN0cnVjdHVyZSo+KG1fcHJldmlvdXNPclJhcmVEYXRhLmdldCgp KTsKICAgICB9CiAKICAgICBTdHJ1Y3R1cmVSYXJlRGF0YSogcmFyZURhdGEoKSBjb25zdAogICAg IHsKLSAgICAgICAgQVNTRVJUKHR5cGVJbmZvKCkuc3RydWN0dXJlSGFzUmFyZURhdGEoKSk7Cisg ICAgICAgIEFTU0VSVChtX2hhc1JhcmVEYXRhKTsKICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0 PFN0cnVjdHVyZVJhcmVEYXRhKj4obV9wcmV2aW91c09yUmFyZURhdGEuZ2V0KCkpOwogICAgIH0K ICAgICAgICAgCkBAIC01NDksNiArNTQ5LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX3By ZXZlbnRFeHRlbnNpb25zIDogMTsKICAgICB1bnNpZ25lZCBtX2RpZFRyYW5zaXRpb24gOiAxOwog ICAgIHVuc2lnbmVkIG1fc3RhdGljRnVuY3Rpb25SZWlmaWVkIDogMTsKKyAgICBib29sIG1faGFz UmFyZURhdGEgOiAxOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmVJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlSW5saW5lcy5oCShyZXZpc2lvbiAx Njk4OTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmVJbmxpbmVz LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1NCwxNCArMTU0LDE0IEBAIGlubGluZSBib29sIFN0cnVj dHVyZTo6dHJhbnNpdGl2ZWx5VHJhbnMKIGlubGluZSB2b2lkIFN0cnVjdHVyZTo6c2V0RW51bWVy YXRpb25DYWNoZShWTSYgdm0sIEpTUHJvcGVydHlOYW1lSXRlcmF0b3IqIGVudW1lcmF0aW9uQ2Fj aGUpCiB7CiAgICAgQVNTRVJUKCFpc0RpY3Rpb25hcnkoKSk7Ci0gICAgaWYgKCF0eXBlSW5mbygp LnN0cnVjdHVyZUhhc1JhcmVEYXRhKCkpCisgICAgaWYgKCFtX2hhc1JhcmVEYXRhKQogICAgICAg ICBhbGxvY2F0ZVJhcmVEYXRhKHZtKTsKICAgICByYXJlRGF0YSgpLT5zZXRFbnVtZXJhdGlvbkNh Y2hlKHZtLCB0aGlzLCBlbnVtZXJhdGlvbkNhY2hlKTsKIH0KIAogaW5saW5lIEpTUHJvcGVydHlO YW1lSXRlcmF0b3IqIFN0cnVjdHVyZTo6ZW51bWVyYXRpb25DYWNoZSgpCiB7Ci0gICAgaWYgKCF0 eXBlSW5mbygpLnN0cnVjdHVyZUhhc1JhcmVEYXRhKCkpCisgICAgaWYgKCFtX2hhc1JhcmVEYXRh KQogICAgICAgICByZXR1cm4gMDsKICAgICByZXR1cm4gcmFyZURhdGEoKS0+ZW51bWVyYXRpb25D YWNoZSgpOwogfQo=