62242 2011-06-07 15:41:20 -0700 Compiling Chromium port under GCC 4.6 produces warnings about nullptr 2011-06-08 11:04:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 rsleevi webkit-unassigned abarth thakis tony webkit.review.bot oldest_to_newest 416860 0 rsleevi 2011-06-07 15:41:20 -0700 When compiling the Chromium port with GCC 4.6, GCC warns about the use of nullptr being a reserved keyword in c++0x. This is emitted when files include Source/JavaScriptCore/wtf/Nullptr.h This warning should be suppressed, as it is in the QT port, as the usage of nullptr is forwards-compatible when compiling in c++0x mode. 416877 1 96320 rsleevi 2011-06-07 15:56:58 -0700 Created attachment 96320 Patch 416880 2 thakis 2011-06-07 15:59:41 -0700 Shouldn't we rather be changing the names to not conflict with c++0x? 416882 3 thakis 2011-06-07 15:59:55 -0700 (Note: I'm not a webkit reviewer.) 416883 4 rsleevi 2011-06-07 16:01:02 -0700 See http://trac.webkit.org/browser/trunk/Source/JavaScriptCore/JavaScriptCore.pro for an example of how QT does it. Note that they add it for >= 4.6. This just adds for == 4.6. It also doesn't check for existing c++0x-compile; none of the Chromium code currently passes c++0x AFAICT, so I didn't believe that check was relevant (yet). 416888 5 rsleevi 2011-06-07 16:02:48 -0700 Nico: If you check the header file, it's actually setup to use the c++0x symbol when compiling in c++0x. However, if --std=c++0x wasn't passed (for GCC), then it falls back to implementing an equivalent functionality (in the std:: namespace, which is technically undefined) The issue is GCC 4.6 doesn't realize that the code *is* setup for c++0x compilation already, and thus emits the warning in non-c++0x mode. 416893 6 rsleevi 2011-06-07 16:04:05 -0700 http://trac.webkit.org/browser/trunk/Source/JavaScriptCore/wtf/NullPtr.h is the file that causes the warnings, specifically. 416896 7 tony 2011-06-07 16:16:43 -0700 Can we just put this in build/common.gypi rather than having to add it to each .gyp file? 416899 8 rsleevi 2011-06-07 16:19:30 -0700 I went with the per-file based on evanm's suggestion for a related GCC 4.6 suppression ( http://codereview.chromium.org/7111026/ ). His preference, if I understand correctly, is to place the suppression as close to the offending code as possible. I don't think we'd necessarily want to suppress the warning for other code (eg: third-party libs, Chromium proper, etc), even though there weren't any other incidents that I could tell. 416939 9 96320 tony 2011-06-07 17:02:45 -0700 Comment on attachment 96320 Patch Evan tells me he sees an argument for either way. I'm guess I'm fine with either way as well. 417025 10 96320 webkit.review.bot 2011-06-07 19:31:48 -0700 Comment on attachment 96320 Patch Rejecting attachment 96320 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-01', '--port..." exit_code: 2 Last 500 characters of output: contain OOPS: trunk/Source/WebCore/ChangeLog Please don't ever say "OOPS" in a ChangeLog file. at /usr/lib/git-core/git-svn line 572 Failed to run "[u'git', u'svn', u'dcommit']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Updating OpenSource Current branch master is up to date. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/8777422 417033 11 96362 rsleevi 2011-06-07 19:41:19 -0700 Created attachment 96362 Patch 417350 12 96362 webkit.review.bot 2011-06-08 11:04:54 -0700 Comment on attachment 96362 Patch Clearing flags on attachment: 96362 Committed r88360: <http://trac.webkit.org/changeset/88360> 417351 13 webkit.review.bot 2011-06-08 11:04:59 -0700 All reviewed patches have been landed. Closing bug. 96320 2011-06-07 15:56:58 -0700 2011-06-07 19:41:12 -0700 Patch bug-62242-20110607185656.patch text/plain 4752 rsleevi U3VidmVyc2lvbiBSZXZpc2lvbjogODgyMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY0 NzA2MzcyN2I3OTQ2ZGQyNTBkMzM4ZjM3NjYzZDFjM2MyMTFhNjMuLmQ3MWNlODYyNzhmNTIwNzJm YmE1ZWJlMWI0NDBjYzhlYjM1ZjQyYTIgMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDExLTA2LTA3ICBSeWFuIFNsZWV2aSAgPHJzbGVldmlAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN1cHBy ZXNzIEMrKzB4IGNvbXBhdCB3YXJuaW5ncyB3aGVuIGNvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHdp dGggR0NDIDQuNgorCisgICAgICAgIENvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHVuZGVyIEdDQyA0 LjYgcHJvZHVjZXMgd2FybmluZ3MgYWJvdXQgbnVsbHB0cgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyNDIKKworICAgICAgICAqIEphdmFTY3JpcHRD b3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6CisKIDIwMTEtMDYtMDYgIEphbWVzIFNpbW9uc2Vu ICA8c2ltb25qYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJv Ymluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3Jl Lmd5cC9KYXZhU2NyaXB0Q29yZS5neXAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cAppbmRleCBiMDRjNTlhYjYwZWE0YzcyYWZjZjFi NmEyY2U0OTIxNWNiYzViMzUzLi5lNDI4MThiNjZlYWRkMmJhMjg4MzJiZWY2Yjg4NjViODYzNGY0 MDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lw L0phdmFTY3JpcHRDb3JlLmd5cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cApAQCAtNDcsNiArNDcsMTUgQEAKICAgICAgIH1d LAogICAgIF0sCiAgIH0sCisgICdjb25kaXRpb25zJzogWworICAgIFsnb3NfcG9zaXggPT0gMSBh bmQgT1MgIT0gIm1hYyIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKKyAgICAgICd0YXJnZXRfZGVm YXVsdHMnOiB7CisgICAgICAgICMgRGlzYWJsZSB3YXJuaW5ncyBhYm91dCBjKysweCBjb21wYXRp YmlsaXR5LCBhcyBzb21lIG5hbWVzIChzdWNoIGFzIG51bGxwdHIpIGNvbmZsaWN0CisgICAgICAg ICMgd2l0aCB1cGNvbWluZyBjKysweCB0eXBlcy4KKyAgICAgICAgJ2NmbGFnc19jYyc6IFsnLVdu by1jKysweC1jb21wYXQnXSwKKyAgICAgIH0sCisgICAgfV0sCisgIF0sCiAgICd0YXJnZXRzJzog WwogICAgIHsKICAgICAgICMgVGhpcyB0YXJnZXQgc2V0cyB1cCBkZWZpbmVzIGFuZCBpbmNsdWRl cyB0aGF0IGFyZSByZXF1aXJlZCBieSBXVEYgYW5kCkBAIC0yMzYsMyArMjQ1LDkgQEAKICAgICB9 LAogICBdLCAjIHRhcmdldHMKIH0KKworIyBMb2NhbCBWYXJpYWJsZXM6CisjIHRhYi13aWR0aDoy CisjIGluZGVudC10YWJzLW1vZGU6bmlsCisjIEVuZDoKKyMgdmltOiBzZXQgZXhwYW5kdGFiIHRh YnN0b3A9MiBzaGlmdHdpZHRoPTI6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdjNTk5NDZkZmZjOGQxMzJjM2U0 ZjlkZTY1MGRlZTI1OGIzN2JjMC4uNDY4MTlkNGVlYjYxODdkZjQwN2UzM2NkZTJhYzU4MTA0ZWE5 OWRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTA2LTA3ICBSeWFuIFNsZWV2 aSAgPHJzbGVldmlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN1cHByZXNzIEMrKzB4IGNvbXBhdCB3YXJuaW5ncyB3aGVuIGNv bXBpbGluZyBDaHJvbWl1bSBwb3J0IHdpdGggR0NDIDQuNgorCisgICAgICAgIENvbXBpbGluZyBD aHJvbWl1bSBwb3J0IHVuZGVyIEdDQyA0LjYgcHJvZHVjZXMgd2FybmluZ3MgYWJvdXQgbnVsbHB0 cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyNDIK KworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIFdlYkNvcmUuZ3lw L1dlYkNvcmUuZ3lwOgorCiAyMDExLTA2LTA2ICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCAxZWEyMzM0YzdlZDYzZDdmM2E5NmY4ZDg3Yjk0NWE4 NDFiZTViZGU1Li43NjIzNDczNzE0MTAzMWUwMDM4Njk1YjNkODk0ODcyYjIzOTk2MzA0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMTA2LDYgKzEwNiwxMyBAQAog ICAgICAgICAnY2ZsYWdzISc6IFsnLWcnXSwKICAgICAgIH0sCiAgICAgfV0sCisgICAgWydvc19w b3NpeD09MSBhbmQgT1MhPSJtYWMiIGFuZCBnY2NfdmVyc2lvbj09NDYnLCB7CisgICAgICAndGFy Z2V0X2RlZmF1bHRzJzogeworICAgICAgICAjIERpc2FibGUgd2FybmluZ3MgYWJvdXQgYysrMHgg Y29tcGF0aWJpbGl0eSwgYXMgc29tZSBuYW1lcyAoc3VjaCBhcyBudWxscHRyKSBjb25mbGljdAor ICAgICAgICAjIHdpdGggdXBjb21pbmcgYysrMHggdHlwZXMuCisgICAgICAgICdjZmxhZ3NfY2Mn OiBbJy1Xbm8tYysrMHgtY29tcGF0J10sCisgICAgICB9LAorICAgIH1dLAogICAgIFsnT1M9PSJs aW51eCIgYW5kIHRhcmdldF9hcmNoPT0iYXJtIicsIHsKICAgICAgICMgRHVlIHRvIGEgYnVnIGlu IGdjYyBhcm0sIHdlIGdldCB3YXJuaW5ncyBhYm91dCB1bmluaXRpYWxpemVkIHRpbWVzTmV3Um9t YW4udW5zdGF0aWMuMzI1OAogICAgICAgIyBhbmQgY29sb3JUcmFuc3BhcmVudC51bnN0YXRpYy40 ODc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA5OTU0ZDUxYzhlZTA0MzEyNDUxMmMy OWE0ZjYwYWI5ODc2ZDg5M2U0Li5kMzc0MmM0ZTk3NDdlMTlkZDAyOGYzZWIwMDdmNWEzZWNkOGEw ZWJjIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA2 LTA3ICBSeWFuIFNsZWV2aSAgPHJzbGVldmlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN1cHByZXNzIEMrKzB4IGNvbXBhdCB3 YXJuaW5ncyB3aGVuIGNvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHdpdGggR0NDIDQuNgorCisgICAg ICAgIENvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHVuZGVyIEdDQyA0LjYgcHJvZHVjZXMgd2Fybmlu Z3MgYWJvdXQgbnVsbHB0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjIyNDIKKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTEtMDYtMDYgIE5p Y28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEph bWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IGEzNTE0NmE5Njgy ZDIwMTc2MDQ3ZmZhMDUwYWU3MGRjMTEzYmZmZDQuLjA4MGI3MzM4Y2M2ODdlNTEwZjkxMDRmMjQ0 MzlmNjdmYTA1NmU4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0 Lmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTEyMDUsNiAr MTIwNSwxMyBAQAogICAgICAgICAgICAgICAgICdzb3VyY2VzJzogWycuLi8uLi8uLi9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0SGVscGVyV2luLmNwcCddLAogICAgICAg ICAgICAgfV0sCiAgICAgICAgIH1dLAorICAgICAgICBbJ29zX3Bvc2l4PT0xIGFuZCBPUyE9Im1h YyIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKKyAgICAgICAgICAgICd0YXJnZXRfZGVmYXVsdHMn OiB7CisgICAgICAgICAgICAgICAgIyBEaXNhYmxlIHdhcm5pbmdzIGFib3V0IGMrKzB4IGNvbXBh dGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1Y2gKKyAgICAgICAgICAgICAgICAjIGFzIG51bGxw dHIpIGNvbmZsaWN0IHdpdGggdXBjb21pbmcgYysrMHggdHlwZXMuCisgICAgICAgICAgICAgICAg J2NmbGFnc19jYyc6IFsnLVduby1jKysweC1jb21wYXQnXSwKKyAgICAgICAgICAgIH0sCisgICAg ICAgIH1dLAogICAgICAgICBbJ09TPT0ibWFjIicsIHsKICAgICAgICAgICAgICd0YXJnZXRzJzog WwogICAgICAgICAgICAgICAgIHsK 96362 2011-06-07 19:41:19 -0700 2011-06-08 11:04:54 -0700 Patch bug-62242-20110607224118.patch text/plain 4719 rsleevi U3VidmVyc2lvbiBSZXZpc2lvbjogODgyMjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY0 NzA2MzcyN2I3OTQ2ZGQyNTBkMzM4ZjM3NjYzZDFjM2MyMTFhNjMuLmQ3MWNlODYyNzhmNTIwNzJm YmE1ZWJlMWI0NDBjYzhlYjM1ZjQyYTIgMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDExLTA2LTA3ICBSeWFuIFNsZWV2aSAgPHJzbGVldmlAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN1cHBy ZXNzIEMrKzB4IGNvbXBhdCB3YXJuaW5ncyB3aGVuIGNvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHdp dGggR0NDIDQuNgorCisgICAgICAgIENvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHVuZGVyIEdDQyA0 LjYgcHJvZHVjZXMgd2FybmluZ3MgYWJvdXQgbnVsbHB0cgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyNDIKKworICAgICAgICAqIEphdmFTY3JpcHRD b3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXA6CisKIDIwMTEtMDYtMDYgIEphbWVzIFNpbW9uc2Vu ICA8c2ltb25qYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJv Ymluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3Jl Lmd5cC9KYXZhU2NyaXB0Q29yZS5neXAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cAppbmRleCBiMDRjNTlhYjYwZWE0YzcyYWZjZjFi NmEyY2U0OTIxNWNiYzViMzUzLi5lNDI4MThiNjZlYWRkMmJhMjg4MzJiZWY2Yjg4NjViODYzNGY0 MDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lw L0phdmFTY3JpcHRDb3JlLmd5cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cApAQCAtNDcsNiArNDcsMTUgQEAKICAgICAgIH1d LAogICAgIF0sCiAgIH0sCisgICdjb25kaXRpb25zJzogWworICAgIFsnb3NfcG9zaXggPT0gMSBh bmQgT1MgIT0gIm1hYyIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKKyAgICAgICd0YXJnZXRfZGVm YXVsdHMnOiB7CisgICAgICAgICMgRGlzYWJsZSB3YXJuaW5ncyBhYm91dCBjKysweCBjb21wYXRp YmlsaXR5LCBhcyBzb21lIG5hbWVzIChzdWNoIGFzIG51bGxwdHIpIGNvbmZsaWN0CisgICAgICAg ICMgd2l0aCB1cGNvbWluZyBjKysweCB0eXBlcy4KKyAgICAgICAgJ2NmbGFnc19jYyc6IFsnLVdu by1jKysweC1jb21wYXQnXSwKKyAgICAgIH0sCisgICAgfV0sCisgIF0sCiAgICd0YXJnZXRzJzog WwogICAgIHsKICAgICAgICMgVGhpcyB0YXJnZXQgc2V0cyB1cCBkZWZpbmVzIGFuZCBpbmNsdWRl cyB0aGF0IGFyZSByZXF1aXJlZCBieSBXVEYgYW5kCkBAIC0yMzYsMyArMjQ1LDkgQEAKICAgICB9 LAogICBdLCAjIHRhcmdldHMKIH0KKworIyBMb2NhbCBWYXJpYWJsZXM6CisjIHRhYi13aWR0aDoy CisjIGluZGVudC10YWJzLW1vZGU6bmlsCisjIEVuZDoKKyMgdmltOiBzZXQgZXhwYW5kdGFiIHRh YnN0b3A9MiBzaGlmdHdpZHRoPTI6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdjNTk5NDZkZmZjOGQxMzJjM2U0 ZjlkZTY1MGRlZTI1OGIzN2JjMC4uMjVhZGZkOTBmZTNiNmExNTNkMGNlN2JmNTYzNzM4YzQ5NDIy OWNhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA2LTA3ICBSeWFuIFNsZWV2 aSAgPHJzbGVldmlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN1cHByZXNzIEMrKzB4IGNvbXBhdCB3YXJuaW5ncyB3aGVuIGNv bXBpbGluZyBDaHJvbWl1bSBwb3J0IHdpdGggR0NDIDQuNgorCisgICAgICAgIENvbXBpbGluZyBD aHJvbWl1bSBwb3J0IHVuZGVyIEdDQyA0LjYgcHJvZHVjZXMgd2FybmluZ3MgYWJvdXQgbnVsbHB0 cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyNDIK KworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwOgorCiAyMDExLTA2LTA2ICBOaWNv IFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFt IEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5n eXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCAxZWEyMzM0 YzdlZDYzZDdmM2E5NmY4ZDg3Yjk0NWE4NDFiZTViZGU1Li43NjIzNDczNzE0MTAzMWUwMDM4Njk1 YjNkODk0ODcyYjIzOTk2MzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5 cApAQCAtMTA2LDYgKzEwNiwxMyBAQAogICAgICAgICAnY2ZsYWdzISc6IFsnLWcnXSwKICAgICAg IH0sCiAgICAgfV0sCisgICAgWydvc19wb3NpeD09MSBhbmQgT1MhPSJtYWMiIGFuZCBnY2NfdmVy c2lvbj09NDYnLCB7CisgICAgICAndGFyZ2V0X2RlZmF1bHRzJzogeworICAgICAgICAjIERpc2Fi bGUgd2FybmluZ3MgYWJvdXQgYysrMHggY29tcGF0aWJpbGl0eSwgYXMgc29tZSBuYW1lcyAoc3Vj aCBhcyBudWxscHRyKSBjb25mbGljdAorICAgICAgICAjIHdpdGggdXBjb21pbmcgYysrMHggdHlw ZXMuCisgICAgICAgICdjZmxhZ3NfY2MnOiBbJy1Xbm8tYysrMHgtY29tcGF0J10sCisgICAgICB9 LAorICAgIH1dLAogICAgIFsnT1M9PSJsaW51eCIgYW5kIHRhcmdldF9hcmNoPT0iYXJtIicsIHsK ICAgICAgICMgRHVlIHRvIGEgYnVnIGluIGdjYyBhcm0sIHdlIGdldCB3YXJuaW5ncyBhYm91dCB1 bmluaXRpYWxpemVkIHRpbWVzTmV3Um9tYW4udW5zdGF0aWMuMzI1OAogICAgICAgIyBhbmQgY29s b3JUcmFuc3BhcmVudC51bnN0YXRpYy40ODc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRl eCA5OTU0ZDUxYzhlZTA0MzEyNDUxMmMyOWE0ZjYwYWI5ODc2ZDg5M2U0Li5kMzc0MmM0ZTk3NDdl MTlkZDAyOGYzZWIwMDdmNWEzZWNkOGEwZWJjIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE0IEBACisyMDExLTA2LTA3ICBSeWFuIFNsZWV2aSAgPHJzbGVldmlAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFN1cHByZXNzIEMrKzB4IGNvbXBhdCB3YXJuaW5ncyB3aGVuIGNvbXBpbGluZyBDaHJvbWl1bSBw b3J0IHdpdGggR0NDIDQuNgorCisgICAgICAgIENvbXBpbGluZyBDaHJvbWl1bSBwb3J0IHVuZGVy IEdDQyA0LjYgcHJvZHVjZXMgd2FybmluZ3MgYWJvdXQgbnVsbHB0cgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyNDIKKworICAgICAgICAqIFdlYktp dC5neXA6CisKIDIwMTEtMDYtMDYgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwCmluZGV4IGEzNTE0NmE5NjgyZDIwMTc2MDQ3ZmZhMDUwYWU3MGRjMTEzYmZmZDQuLjA4 MGI3MzM4Y2M2ODdlNTEwZjkxMDRmMjQ0MzlmNjdmYTA1NmU4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKQEAgLTEyMDUsNiArMTIwNSwxMyBAQAogICAgICAgICAgICAgICAgICdzb3Vy Y2VzJzogWycuLi8uLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0 SGVscGVyV2luLmNwcCddLAogICAgICAgICAgICAgfV0sCiAgICAgICAgIH1dLAorICAgICAgICBb J29zX3Bvc2l4PT0xIGFuZCBPUyE9Im1hYyIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKKyAgICAg ICAgICAgICd0YXJnZXRfZGVmYXVsdHMnOiB7CisgICAgICAgICAgICAgICAgIyBEaXNhYmxlIHdh cm5pbmdzIGFib3V0IGMrKzB4IGNvbXBhdGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1Y2gKKyAg ICAgICAgICAgICAgICAjIGFzIG51bGxwdHIpIGNvbmZsaWN0IHdpdGggdXBjb21pbmcgYysrMHgg dHlwZXMuCisgICAgICAgICAgICAgICAgJ2NmbGFnc19jYyc6IFsnLVduby1jKysweC1jb21wYXQn XSwKKyAgICAgICAgICAgIH0sCisgICAgICAgIH1dLAogICAgICAgICBbJ09TPT0ibWFjIicsIHsK ICAgICAgICAgICAgICd0YXJnZXRzJzogWwogICAgICAgICAgICAgICAgIHsK