46589 2010-09-26 15:54:22 -0700 Add WTF_MAKE_NONCOPYABLE macro 2010-11-22 01:47:09 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 42998 48505 49897 1 andersca andersca andersca ap darin webkit.review.bot yong.li.webkit zoltan oldest_to_newest 285191 0 andersca 2010-09-26 15:54:22 -0700 Add WTF_MAKE_NONCOPYABLE macro 285192 1 68864 andersca 2010-09-26 15:59:25 -0700 Created attachment 68864 Patch 285193 2 webkit.review.bot 2010-09-26 16:05:25 -0700 Attachment 68864 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 JavaScriptCore/runtime/JSCell.h:37: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 285212 3 webkit.review.bot 2010-09-26 17:33:24 -0700 Attachment 68864 did not build on win: Build output: http://queues.webkit.org/results/4087096 285275 4 68864 abarth 2010-09-26 21:02:42 -0700 Comment on attachment 68864 Patch ok 285574 5 68864 ap 2010-09-27 10:54:45 -0700 Comment on attachment 68864 Patch Not that I'm a fan of CustomAllocated, but isn't this patch breaking it? r-, because of incredibly poor ChangeLog that doesn't explain why this change is being made. 285597 6 andersca 2010-09-27 11:15:41 -0700 (In reply to comment #5) > (From update of attachment 68864 [details]) > Not that I'm a fan of CustomAllocated, but isn't this patch breaking it? > Not sure what you mean here. > r-, because of incredibly poor ChangeLog that doesn't explain why this change is being made. Good point, will fix. 285606 7 68934 andersca 2010-09-27 11:20:47 -0700 Created attachment 68934 Patch 285609 8 webkit.review.bot 2010-09-27 11:22:58 -0700 Attachment 68934 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 JavaScriptCore/runtime/JSCell.h:37: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 285670 9 andersca 2010-09-27 12:19:32 -0700 Committed r68414: <http://trac.webkit.org/changeset/68414> 296073 10 zoltan 2010-10-19 02:24:29 -0700 Unfortunately, we can't use - in many cases - this macro instead of inheriting from Noncopyable, because Noncopyable base class contains protected constructor and destructor but the macro doesn't. Furthermore, we can't put them explicitly inside the macro, because it'll cause compile errors in some cases. 300347 11 andersca 2010-10-27 10:28:59 -0700 (In reply to comment #10) > Unfortunately, we can't use - in many cases - this macro instead of inheriting from Noncopyable, because Noncopyable base class contains protected constructor and destructor but the macro doesn't. Furthermore, we can't put them explicitly inside the macro, because it'll cause compile errors in some cases. Could you give an example of this? The whole idea of WTF_MAKE_NONCOPYABLE (And the Noncopyable class) is to completely disallow copying. 300956 12 zoltan 2010-10-28 02:37:12 -0700 (In reply to comment #11) > Could you give an example of this? The whole idea of WTF_MAKE_NONCOPYABLE (And the Noncopyable class) is to completely disallow copying. Yes, I know. The problem comes when you want to instantiate a struct or class which hasn't got ctor/dtor since the macro defines copy/assigm ctors but simple ctors, then gcc won't generate default to them. So in cases like this gcc will give compile errors. Now, I can show only a platform specific case: ----------------------------------------------------------------------------- diff --git a/WebCore/platform/graphics/qt/FontCustomPlatformData.h b/WebCore/platform/graphics/qt/FontCustomPlatformData.h index 6c41d47..8a35ceb 100644 --- a/WebCore/platform/graphics/qt/FontCustomPlatformData.h +++ b/WebCore/platform/graphics/qt/FontCustomPlatformData.h @@ -32,7 +32,9 @@ namespace WebCore { class FontPlatformData; class SharedBuffer; -struct FontCustomPlatformData : Noncopyable { +struct FontCustomPlatformData { + WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); + public: ~FontCustomPlatformData(); // for use with QFontDatabase::addApplicationFont/removeApplicationFont ----------------------------------------------------------------------------- FontCustomPlatformData hasn't got ctor and gcc don't generate for it, but FontCustomPlatformData is instantiated by new in WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp:59. Accordingly the compile error: error: no matching function for call to WebCore::FontCustomPlatformData::FontCustomPlatformData() I don't know exactly how many cases like this are in WebKit. We can solve the problem with putting an empty ctor to this classes. What do you think, is it the right way? 301230 13 darin 2010-10-28 12:23:08 -0700 (In reply to comment #12) > I don't know exactly how many cases like this are in WebKit. We can solve the problem with putting an empty ctor to this classes. What do you think, is it the right way? This is a design mistake. We don’t want a class that is noncopyable and then transformed into one that’s copyable. Lets not use the macro *or* the base class for these cases. Later we can fix them too. 68864 2010-09-26 15:59:25 -0700 2010-09-27 11:20:43 -0700 Patch bug-46589-20100926155924.patch text/plain 3590 andersca ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBmOWIxNThhZjhhOTQzNGNjZTg2MWQzN2YxYWY0ZTRlZmY1ODAwMDdlLi40 MTUwZTg4ZDdjYjg5NTA0MzMxMDA1ZjQzNGIyMzEwMGYxMjQzMWNlIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTAtMDktMjYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgV1RGX01BS0VfTk9OQ09QWUFCTEUgbWFjcm8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NTg5CisKKyAgICAgICAgKiB3dGYvTm9uY29weWFibGUu aDoKKyAgICAgICAgQWRkIGEgV1RGX01BS0VfTk9OQ09QWUFCTEUgbWFjcm8gYW5kIGdldCByaWQg b2YgTm9uY29weWFibGVDdXN0b21BbGxvY2F0ZWQuCisgICAgICAgIAorICAgICAgICAqIHJ1bnRp bWUvSlNDZWxsLmg6CisgICAgICAgICogd3RmL1JlZkNvdW50ZWQuaDoKKyAgICAgICAgRG9uJ3Qg aW5oZXJpdCBmcm9tIE5vbmNvcHlhYmxlQ3VzdG9tQWxsb2NhdGVkLiBJbnN0ZWFkLCB1c2UgV1RG X01BS0VfTk9OQ09QWUFCTEUuCisKIDIwMTAtMDktMjYgIE1hcmsgSGFobmVuYmVyZyAgPG1oYWhu ZW5iQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAt LWdpdCBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmggYi9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTQ2VsbC5oCmluZGV4IDJmZmNlOGRmNzQwNDgyNzQ5NjczOGFkMGFkYTIyNzRiM2U4 ODViZTAuLjY1M2NkOWUwNTExOTA4M2MwODcyNWJlZTVmZGExZDgyYTcyZWQwMjAgMTAwNjQ0Ci0t LSBhL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKKysrIGIvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU0NlbGwuaApAQCAtMzQsNyArMzQsOSBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAot ICAgIGNsYXNzIEpTQ2VsbCA6IHB1YmxpYyBOb25jb3B5YWJsZUN1c3RvbUFsbG9jYXRlZCB7Cisg ICAgY2xhc3MgSlNDZWxsIHsKKyAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoSlNDZWxsKTsK KwogICAgICAgICBmcmllbmQgY2xhc3MgR2V0dGVyU2V0dGVyOwogICAgICAgICBmcmllbmQgY2xh c3MgSGVhcDsKICAgICAgICAgZnJpZW5kIGNsYXNzIEpJVDsKZGlmZiAtLWdpdCBhL0phdmFTY3Jp cHRDb3JlL3d0Zi9Ob25jb3B5YWJsZS5oIGIvSmF2YVNjcmlwdENvcmUvd3RmL05vbmNvcHlhYmxl LmgKaW5kZXggNjBhNDZlMjY2OTc4N2JiMDJiN2VlMzQ1ZDZjZGVmMDdhNGM1OWRlNy4uNjFmMjUz MDIzMzAzYmE3NTM4NTcwZDMxODEwZDZhYWUzNTJiZTQyNSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlw dENvcmUvd3RmL05vbmNvcHlhYmxlLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL05vbmNvcHlh YmxlLmgKQEAgLTIxLDYgKzIxLDI2IEBACiAjaWZuZGVmIFdURl9Ob25jb3B5YWJsZV9oCiAjZGVm aW5lIFdURl9Ob25jb3B5YWJsZV9oCiAKKyNpZm5kZWYgX19oYXNfZmVhdHVyZQorICAgICNkZWZp bmUgX19oYXNfZmVhdHVyZSh4KSAwCisjZW5kaWYKKworI2lmIF9faGFzX2ZlYXR1cmUoY3h4X2Rl bGV0ZWRfZnVuY3Rpb25zKQorICAgICNkZWZpbmUgV1RGX01BS0VfTk9OQ09QWUFCTEUoQ2xhc3NO YW1lKSBcCisgICAgICAgIF9QcmFnbWEoImNsYW5nIGRpYWdub3N0aWMgcHVzaCIpIFwKKyAgICAg ICAgX1ByYWdtYSgiY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkIFwiLVd1bmtub3duLXByYWdtYXNc IiIpIFwKKyAgICAgICAgX1ByYWdtYSgiY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkIFwiLVdjKysw eC1leHRlbnNpb25zXCIiKSBcCisgICAgICAgIHByaXZhdGU6IFwKKyAgICAgICAgICAgIENsYXNz TmFtZShjb25zdCBDbGFzc05hbWUmKSA9IGRlbGV0ZTsgXAorICAgICAgICAgICAgQ2xhc3NOYW1l JiBvcGVyYXRvcj0oY29uc3QgQ2xhc3NOYW1lJikgPSBkZWxldGU7IFwKKyAgICAgICAgX1ByYWdt YSgiY2xhbmcgZGlhZ25vc3RpYyBwb3AiKQorI2Vsc2UKKyAgICAjZGVmaW5lIFdURl9NQUtFX05P TkNPUFlBQkxFKENsYXNzTmFtZSkgXAorICAgICAgICBwcml2YXRlOiBcCisgICAgICAgICAgICBD bGFzc05hbWUoY29uc3QgQ2xhc3NOYW1lJik7IFwKKyAgICAgICAgICAgIENsYXNzTmFtZSYgb3Bl cmF0b3I9KGNvbnN0IENsYXNzTmFtZSYpOworI2VuZGlmCisKIC8vIFdlIGRvbid0IHdhbnQgYXJn dW1lbnQtZGVwZW5kZW50IGxvb2t1cCB0byBwdWxsIGluIGV2ZXJ5dGhpbmcgZnJvbSB0aGUgV1RG CiAvLyBuYW1lc3BhY2Ugd2hlbiB5b3UgdXNlIE5vbmNvcHlhYmxlLCBzbyBwdXQgaXQgaW4gaXRz IG93biBuYW1lc3BhY2UuCiAKQEAgLTM2LDE3ICs1Niw4IEBAIG5hbWVzcGFjZSBXVEZOb25jb3B5 YWJsZSB7CiAgICAgICAgIH5Ob25jb3B5YWJsZSgpIHsgfQogICAgIH07CiAKLSAgICBjbGFzcyBO b25jb3B5YWJsZUN1c3RvbUFsbG9jYXRlZCB7Ci0gICAgICAgIE5vbmNvcHlhYmxlQ3VzdG9tQWxs b2NhdGVkKGNvbnN0IE5vbmNvcHlhYmxlQ3VzdG9tQWxsb2NhdGVkJik7Ci0gICAgICAgIE5vbmNv cHlhYmxlQ3VzdG9tQWxsb2NhdGVkJiBvcGVyYXRvcj0oY29uc3QgTm9uY29weWFibGVDdXN0b21B bGxvY2F0ZWQmKTsKLSAgICBwcm90ZWN0ZWQ6Ci0gICAgICAgIE5vbmNvcHlhYmxlQ3VzdG9tQWxs b2NhdGVkKCkgeyB9Ci0gICAgICAgIH5Ob25jb3B5YWJsZUN1c3RvbUFsbG9jYXRlZCgpIHsgfQot ICAgIH07Ci0KIH0gLy8gbmFtZXNwYWNlIFdURk5vbmNvcHlhYmxlCiAKIHVzaW5nIFdURk5vbmNv cHlhYmxlOjpOb25jb3B5YWJsZTsKLXVzaW5nIFdURk5vbmNvcHlhYmxlOjpOb25jb3B5YWJsZUN1 c3RvbUFsbG9jYXRlZDsKIAogI2VuZGlmIC8vIFdURl9Ob25jb3B5YWJsZV9oCmRpZmYgLS1naXQg YS9KYXZhU2NyaXB0Q29yZS93dGYvUmVmQ291bnRlZC5oIGIvSmF2YVNjcmlwdENvcmUvd3RmL1Jl ZkNvdW50ZWQuaAppbmRleCBkODVjNDdlOTA2ZDcwM2VhYjk1NDQyZDgzMTIxNTNiYTA3OWU5ZDNk Li44ZDhiMzAyY2RhY2JlNmExN2VjZWRiYzE2NGYwN2ZiMGY3ZWMxY2EyIDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS93dGYvUmVmQ291bnRlZC5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9S ZWZDb3VudGVkLmgKQEAgLTE0NSw3ICsxNDUsOSBAQCBwcm90ZWN0ZWQ6CiAgICAgfQogfTsKIAot dGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgUmVmQ291bnRlZEN1c3RvbUFsbG9jYXRlZCA6IHB1 YmxpYyBSZWZDb3VudGVkQmFzZSwgcHVibGljIE5vbmNvcHlhYmxlQ3VzdG9tQWxsb2NhdGVkIHsK K3RlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFJlZkNvdW50ZWRDdXN0b21BbGxvY2F0ZWQgOiBw dWJsaWMgUmVmQ291bnRlZEJhc2UgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlZkNvdW50 ZWRDdXN0b21BbGxvY2F0ZWQpOworCiBwdWJsaWM6CiAgICAgdm9pZCBkZXJlZigpCiAgICAgewo= 68934 2010-09-27 11:20:47 -0700 2010-09-27 11:27:31 -0700 Patch bug-46589-20100927112045.patch text/plain 4114 andersca ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBmOWIxNThhZjhhOTQzNGNjZTg2MWQzN2YxYWY0ZTRlZmY1ODAwMDdlLi41 NzhmZTZhNTA3MjMzN2FiNDZlODFlNWE2MWJjNDg5OWNhMzUzMGExIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjQgQEAKKzIwMTAtMDktMjYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgV1RGX01BS0VfTk9OQ09QWUFCTEUgbWFjcm8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NTg5CisKKyAgICAgICAgR29pbmcgZm9yd2FyZCwgd2Un ZCBsaWtlIHRvIGdldCByaWQgb2YgdGhlIE5vbmNvcHlhYmxlIGFuZCBGYXN0QWxsb2NCYXNlIGNs YXNzZXMuIFRoZQorICAgICAgICByZWFzb24gZm9yIHRoaXMgaXMgdGhhdCB0aGUgSXRhbml1bSBD KysgQUJJIHN0YXRlcyB0aGF0IG5vIGVtcHR5IGNsYXNzZXMgb2YgdGhlIHNhbWUgdHlwZQorICAg ICAgICBjYW4gYmUgbGFpZCBvdXQgYXQgdGhlIHNhbWUgb2Zmc2V0IGluIHRoZSBjbGFzcy4gVGhp cyBjYW4gcmVzdWx0IGluIG9iamVjdHMgZ2V0dGluZyBsYXJnZXIKKyAgICAgICAgd2hpY2ggbGVh ZHMgdG8gbWVtb3J5IHJlZ3Jlc3Npb25zLiAoT25lIGV4YW1wbGUgb2YgdGhpcyBpcyB0aGUgU3Ry aW5nIGNsYXNzIHdoaWNoIGdyZXcgYnkKKyAgICAgICAgc2l6ZW9mKHZvaWQqKSB3aGVuIGJvdGgg aXRzIGJhc2UgY2xhc3MgYW5kIGl0cyBmaXJzdCBtZW1iZXIgdmFyaWFibGUgaW5oZXJpdGVkIGlu ZGlyZWN0bHkKKyAgICAgICAgZnJvbSBGYXN0QWxsb2NCYXNlKS4KKworICAgICAgICAqIHd0Zi9O b25jb3B5YWJsZS5oOgorICAgICAgICBBZGQgYSBXVEZfTUFLRV9OT05DT1BZQUJMRSBtYWNybyBh bmQgZ2V0IHJpZCBvZiBOb25jb3B5YWJsZUN1c3RvbUFsbG9jYXRlZC4KKyAgICAgICAgCisgICAg ICAgICogcnVudGltZS9KU0NlbGwuaDoKKyAgICAgICAgKiB3dGYvUmVmQ291bnRlZC5oOgorICAg ICAgICBEb24ndCBpbmhlcml0IGZyb20gTm9uY29weWFibGVDdXN0b21BbGxvY2F0ZWQuIEluc3Rl YWQsIHVzZSBXVEZfTUFLRV9OT05DT1BZQUJMRS4KKwogMjAxMC0wOS0yNiAgTWFyayBIYWhuZW5i ZXJnICA8bWhhaG5lbmJAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBI dW50LgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaCBiL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKaW5kZXggMmZmY2U4ZGY3NDA0ODI3NDk2NzM4YWQw YWRhMjI3NGIzZTg4NWJlMC4uNjUzY2Q5ZTA1MTE5MDgzYzA4NzI1YmVlNWZkYTFkODJhNzJlZDAy MCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAorKysgYi9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5oCkBAIC0zNCw3ICszNCw5IEBACiAKIG5hbWVzcGFj ZSBKU0MgewogCi0gICAgY2xhc3MgSlNDZWxsIDogcHVibGljIE5vbmNvcHlhYmxlQ3VzdG9tQWxs b2NhdGVkIHsKKyAgICBjbGFzcyBKU0NlbGwgeworICAgICAgICBXVEZfTUFLRV9OT05DT1BZQUJM RShKU0NlbGwpOworCiAgICAgICAgIGZyaWVuZCBjbGFzcyBHZXR0ZXJTZXR0ZXI7CiAgICAgICAg IGZyaWVuZCBjbGFzcyBIZWFwOwogICAgICAgICBmcmllbmQgY2xhc3MgSklUOwpkaWZmIC0tZ2l0 IGEvSmF2YVNjcmlwdENvcmUvd3RmL05vbmNvcHlhYmxlLmggYi9KYXZhU2NyaXB0Q29yZS93dGYv Tm9uY29weWFibGUuaAppbmRleCA2MGE0NmUyNjY5Nzg3YmIwMmI3ZWUzNDVkNmNkZWYwN2E0YzU5 ZGU3Li42MWYyNTMwMjMzMDNiYTc1Mzg1NzBkMzE4MTBkNmFhZTM1MmJlNDI1IDEwMDY0NAotLS0g YS9KYXZhU2NyaXB0Q29yZS93dGYvTm9uY29weWFibGUuaAorKysgYi9KYXZhU2NyaXB0Q29yZS93 dGYvTm9uY29weWFibGUuaApAQCAtMjEsNiArMjEsMjYgQEAKICNpZm5kZWYgV1RGX05vbmNvcHlh YmxlX2gKICNkZWZpbmUgV1RGX05vbmNvcHlhYmxlX2gKIAorI2lmbmRlZiBfX2hhc19mZWF0dXJl CisgICAgI2RlZmluZSBfX2hhc19mZWF0dXJlKHgpIDAKKyNlbmRpZgorCisjaWYgX19oYXNfZmVh dHVyZShjeHhfZGVsZXRlZF9mdW5jdGlvbnMpCisgICAgI2RlZmluZSBXVEZfTUFLRV9OT05DT1BZ QUJMRShDbGFzc05hbWUpIFwKKyAgICAgICAgX1ByYWdtYSgiY2xhbmcgZGlhZ25vc3RpYyBwdXNo IikgXAorICAgICAgICBfUHJhZ21hKCJjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgXCItV3Vua25v d24tcHJhZ21hc1wiIikgXAorICAgICAgICBfUHJhZ21hKCJjbGFuZyBkaWFnbm9zdGljIGlnbm9y ZWQgXCItV2MrKzB4LWV4dGVuc2lvbnNcIiIpIFwKKyAgICAgICAgcHJpdmF0ZTogXAorICAgICAg ICAgICAgQ2xhc3NOYW1lKGNvbnN0IENsYXNzTmFtZSYpID0gZGVsZXRlOyBcCisgICAgICAgICAg ICBDbGFzc05hbWUmIG9wZXJhdG9yPShjb25zdCBDbGFzc05hbWUmKSA9IGRlbGV0ZTsgXAorICAg ICAgICBfUHJhZ21hKCJjbGFuZyBkaWFnbm9zdGljIHBvcCIpCisjZWxzZQorICAgICNkZWZpbmUg V1RGX01BS0VfTk9OQ09QWUFCTEUoQ2xhc3NOYW1lKSBcCisgICAgICAgIHByaXZhdGU6IFwKKyAg ICAgICAgICAgIENsYXNzTmFtZShjb25zdCBDbGFzc05hbWUmKTsgXAorICAgICAgICAgICAgQ2xh c3NOYW1lJiBvcGVyYXRvcj0oY29uc3QgQ2xhc3NOYW1lJik7CisjZW5kaWYKKwogLy8gV2UgZG9u J3Qgd2FudCBhcmd1bWVudC1kZXBlbmRlbnQgbG9va3VwIHRvIHB1bGwgaW4gZXZlcnl0aGluZyBm cm9tIHRoZSBXVEYKIC8vIG5hbWVzcGFjZSB3aGVuIHlvdSB1c2UgTm9uY29weWFibGUsIHNvIHB1 dCBpdCBpbiBpdHMgb3duIG5hbWVzcGFjZS4KIApAQCAtMzYsMTcgKzU2LDggQEAgbmFtZXNwYWNl IFdURk5vbmNvcHlhYmxlIHsKICAgICAgICAgfk5vbmNvcHlhYmxlKCkgeyB9CiAgICAgfTsKIAot ICAgIGNsYXNzIE5vbmNvcHlhYmxlQ3VzdG9tQWxsb2NhdGVkIHsKLSAgICAgICAgTm9uY29weWFi bGVDdXN0b21BbGxvY2F0ZWQoY29uc3QgTm9uY29weWFibGVDdXN0b21BbGxvY2F0ZWQmKTsKLSAg ICAgICAgTm9uY29weWFibGVDdXN0b21BbGxvY2F0ZWQmIG9wZXJhdG9yPShjb25zdCBOb25jb3B5 YWJsZUN1c3RvbUFsbG9jYXRlZCYpOwotICAgIHByb3RlY3RlZDoKLSAgICAgICAgTm9uY29weWFi bGVDdXN0b21BbGxvY2F0ZWQoKSB7IH0KLSAgICAgICAgfk5vbmNvcHlhYmxlQ3VzdG9tQWxsb2Nh dGVkKCkgeyB9Ci0gICAgfTsKLQogfSAvLyBuYW1lc3BhY2UgV1RGTm9uY29weWFibGUKIAogdXNp bmcgV1RGTm9uY29weWFibGU6Ok5vbmNvcHlhYmxlOwotdXNpbmcgV1RGTm9uY29weWFibGU6Ok5v bmNvcHlhYmxlQ3VzdG9tQWxsb2NhdGVkOwogCiAjZW5kaWYgLy8gV1RGX05vbmNvcHlhYmxlX2gK ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9SZWZDb3VudGVkLmggYi9KYXZhU2NyaXB0 Q29yZS93dGYvUmVmQ291bnRlZC5oCmluZGV4IGQ4NWM0N2U5MDZkNzAzZWFiOTU0NDJkODMxMjE1 M2JhMDc5ZTlkM2QuLjhkOGIzMDJjZGFjYmU2YTE3ZWNlZGJjMTY0ZjA3ZmIwZjdlYzFjYTIgMTAw NjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9SZWZDb3VudGVkLmgKKysrIGIvSmF2YVNjcmlw dENvcmUvd3RmL1JlZkNvdW50ZWQuaApAQCAtMTQ1LDcgKzE0NSw5IEBAIHByb3RlY3RlZDoKICAg ICB9CiB9OwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBSZWZDb3VudGVkQ3VzdG9tQWxs b2NhdGVkIDogcHVibGljIFJlZkNvdW50ZWRCYXNlLCBwdWJsaWMgTm9uY29weWFibGVDdXN0b21B bGxvY2F0ZWQgewordGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgUmVmQ291bnRlZEN1c3RvbUFs bG9jYXRlZCA6IHB1YmxpYyBSZWZDb3VudGVkQmFzZSB7CisgICAgV1RGX01BS0VfTk9OQ09QWUFC TEUoUmVmQ291bnRlZEN1c3RvbUFsbG9jYXRlZCk7CisKIHB1YmxpYzoKICAgICB2b2lkIGRlcmVm KCkKICAgICB7Cg==