135299 2014-07-25 11:56:54 -0700 Fix 32-bit build breakage for type profiling 2014-07-25 13:29:05 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam webkit-unassigned commit-queue mhahnenberg oldest_to_newest 1024876 0 saam 2014-07-25 11:56:54 -0700 32-bit builds currently break because global variable id's for high fidelity type profiling are int64_t. Change this to intptr_t so that it's 32 bits on 32-bit platforms and 64-bits on 64-bit platforms. 1024896 1 235538 saam 2014-07-25 12:43:05 -0700 Created attachment 235538 patch 32-bit builds currently break because global variable IDs for high fidelity type profiling are int64_t. Change this to intptr_t so that it's 32 bits on 32-bit platforms and 64 bits on 64-bit platforms. 1024897 2 235538 mhahnenberg 2014-07-25 12:52:58 -0700 Comment on attachment 235538 patch r=me 1024898 3 235538 commit-queue 2014-07-25 12:54:25 -0700 Comment on attachment 235538 patch Rejecting attachment 235538 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 235538, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: |+++ Source/JavaScriptCore/runtime/TypeLocationCache.h (working copy) -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file Source/JavaScriptCore/runtime/VM.h Hunk #1 FAILED at 521. Hunk #2 FAILED at 573. 2 out of 2 hunks FAILED -- saving rejects to file Source/JavaScriptCore/runtime/VM.h.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Mark Hahnenberg']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5589563628060672 1024899 4 mhahnenberg 2014-07-25 13:01:52 -0700 Oops, commit queue only knows about trunk. 1024903 5 mhahnenberg 2014-07-25 13:29:05 -0700 Landed manually in http://trac.webkit.org/changeset/171611 235538 2014-07-25 12:43:05 -0700 2014-07-25 13:01:17 -0700 patch patch.diff text/plain 9027 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcxNjA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBA CisyMDE0LTA3LTI1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEZpeCAzMi1iaXQgYnVpbGQgYnJlYWthZ2UgZm9yIHR5cGUgcHJvZmlsaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Byb2Nlc3NfYnVnLmNnaQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDMyLWJpdCBidWlsZHMgY3VycmVudGx5IGJy ZWFrIGJlY2F1c2UgZ2xvYmFsIHZhcmlhYmxlIElEcyBmb3IgaGlnaAorICAgICAgICBmaWRlbGl0 eSB0eXBlIHByb2ZpbGluZyBhcmUgaW50NjRfdC4gQ2hhbmdlIHRoaXMgdG8gaW50cHRyX3Qgc28g dGhhdAorICAgICAgICBpdCdzIDMyIGJpdHMgb24gMzItYml0IHBsYXRmb3JtcyBhbmQgNjQgYml0 cyBvbiA2NC1iaXQgcGxhdGZvcm1zLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNw cDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpDb2RlQmxvY2spOgorICAgICAgICAoSlNDOjpD b2RlQmxvY2s6OnNjb3BlRGVwZW5kZW50UHJvZmlsZSk6CisgICAgICAgICogYnl0ZWNvZGUvVHlw ZUxvY2F0aW9uLmg6CisgICAgICAgICogcnVudGltZS9TeW1ib2xUYWJsZS5jcHA6CisgICAgICAg IChKU0M6OlN5bWJvbFRhYmxlOjp1bmlxdWVJREZvclZhcmlhYmxlKToKKyAgICAgICAgKEpTQzo6 U3ltYm9sVGFibGU6OnVuaXF1ZUlERm9yUmVnaXN0ZXIpOgorICAgICAgICAqIHJ1bnRpbWUvU3lt Ym9sVGFibGUuaDoKKyAgICAgICAgKiBydW50aW1lL1R5cGVMb2NhdGlvbkNhY2hlLmNwcDoKKyAg ICAgICAgKEpTQzo6VHlwZUxvY2F0aW9uQ2FjaGU6OmdldFR5cGVMb2NhdGlvbik6CisgICAgICAg ICogcnVudGltZS9UeXBlTG9jYXRpb25DYWNoZS5oOgorICAgICAgICAqIHJ1bnRpbWUvVk0uaDoK KyAgICAgICAgKEpTQzo6Vk06OmdldE5leHRVbmlxdWVWYXJpYWJsZUlEKToKKwogMjAxNC0wNy0y MyAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJl ZmFjdG9yIG91ciBjdXJyZW50IGltcGxlbWVudGF0aW9uIG9mIGZvci1pbgpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE3MTYw NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMDU3LDcgKzIwNTcsNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhTY3Jp cHRFeGVjdXRhYmxlKiBvCiAgICAgICAgIGNhc2Ugb3BfcHJvZmlsZV90eXBlc193aXRoX2hpZ2hf ZmlkZWxpdHk6IHsKICAgICAgICAgICAgIHNpemVfdCBpbnN0cnVjdGlvbk9mZnNldCA9IGkgKyBv cExlbmd0aCAtIDE7CiAgICAgICAgICAgICB1bnNpZ25lZCBkaXZvdFN0YXJ0LCBkaXZvdEVuZDsK LSAgICAgICAgICAgIGludHB0cl90IGdsb2JhbFZhcmlhYmxlSUQ7CisgICAgICAgICAgICBHbG9i YWxWYXJpYWJsZUlEIGdsb2JhbFZhcmlhYmxlSUQ7CiAgICAgICAgICAgICBSZWZQdHI8VHlwZVNl dD4gZ2xvYmFsVHlwZVNldDsKICAgICAgICAgICAgIGJvb2wgc2hvdWxkQW5hbHl6ZSA9IG1fdW5s aW5rZWRDb2RlLT5oaWdoRmlkZWxpdHlUeXBlUHJvZmlsZUV4cHJlc3Npb25JbmZvRm9yQnl0ZWNv ZGVPZmZzZXQoaW5zdHJ1Y3Rpb25PZmZzZXQsIGRpdm90U3RhcnQsIGRpdm90RW5kKTsKICAgICAg ICAgICAgIFZpcnR1YWxSZWdpc3RlciB2aXJ0dWFsUmVnaXN0ZXIocGNbMV0udS5vcGVyYW5kKTsK QEAgLTM5OTMsNyArMzk5Myw3IEBAIFR5cGVMb2NhdGlvbiogQ29kZUJsb2NrOjpzY29wZURlcGVu ZGVudFAKIHsKICAgICB1bnNpZ25lZCBkaXZvdFN0YXJ0LCBkaXZvdEVuZDsKICAgICBib29sIHNo b3VsZEFuYWx5emUgPSBtX3VubGlua2VkQ29kZS0+aGlnaEZpZGVsaXR5VHlwZVByb2ZpbGVFeHBy ZXNzaW9uSW5mb0ZvckJ5dGVjb2RlT2Zmc2V0KGluc3RydWN0aW9uT2Zmc2V0LCBkaXZvdFN0YXJ0 LCBkaXZvdEVuZCk7Ci0gICAgaW50cHRyX3QgZ2xvYmFsVmFyaWFibGVJRDsKKyAgICBHbG9iYWxW YXJpYWJsZUlEIGdsb2JhbFZhcmlhYmxlSUQ7CiAgICAgUmVmUHRyPFR5cGVTZXQ+IGdsb2JhbFR5 cGVTZXQ7CiAKICAgICAvLyBGSVhNRTogaGFuZGxlIG90aGVyIHZhbHVlcyBmb3Igb3AudHlwZSBo ZXJlLCBhbmQgYWxzbyBjb25zaWRlciB3aGF0IHRvIGRvIHdoZW4gd2UgY2FuJ3Qgc3RhdGljYWxs eSBkZXRlcm1pbmUgdGhlIGdsb2JhbElECkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvVHlwZUxvY2F0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL1R5cGVMb2NhdGlvbi5oCShyZXZpc2lvbiAxNzE2MDUpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvVHlwZUxvY2F0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3 LDYgKzM3LDggQEAgZW51bSBIaWdoRmlkZWxpdHlHbG9iYWxJREZsYWdzIHsKICAgICBIaWdoRmlk ZWxpdHlUaGlzU3RhdGVtZW50ID0gLTQKIH07CiAKK3R5cGVkZWYgaW50cHRyX3QgR2xvYmFsVmFy aWFibGVJRDsKKwogY2xhc3MgVHlwZUxvY2F0aW9uIHsKIHB1YmxpYzoKICAgICBUeXBlTG9jYXRp b24oKSAKQEAgLTQ2LDcgKzQ4LDcgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKLSAgICBpbnQ2 NF90IG1fZ2xvYmFsVmFyaWFibGVJRDsKKyAgICBHbG9iYWxWYXJpYWJsZUlEIG1fZ2xvYmFsVmFy aWFibGVJRDsKICAgICBpbnRwdHJfdCBtX3NvdXJjZUlEOwogICAgIHVuc2lnbmVkIG1fZGl2b3RT dGFydDsKICAgICB1bnNpZ25lZCBtX2Rpdm90RW5kOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU3ltYm9sVGFibGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1N5bWJvbFRhYmxlLmNwcAkocmV2aXNpb24gMTcxNjA1KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3ltYm9sVGFibGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xOTIsMTMgKzE5MiwxMyBAQCBTeW1ib2xUYWJsZSogU3ltYm9sVGFibGU6OmNsb25lQ2Fw dHVyZWROCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotaW50NjRfdCBTeW1ib2xUYWJsZTo6dW5p cXVlSURGb3JWYXJpYWJsZShjb25zdCBDb25jdXJyZW50SklUTG9ja2VyJiwgU3RyaW5nSW1wbCog a2V5LCBWTSYgdm0pCitHbG9iYWxWYXJpYWJsZUlEIFN5bWJvbFRhYmxlOjp1bmlxdWVJREZvclZh cmlhYmxlKGNvbnN0IENvbmN1cnJlbnRKSVRMb2NrZXImLCBTdHJpbmdJbXBsKiBrZXksIFZNJiB2 bSkKIHsKICAgICBhdXRvIGl0ZXIgPSBtX3VuaXF1ZUlETWFwLT5maW5kKGtleSk7CiAgICAgYXV0 byBlbmQgPSBtX3VuaXF1ZUlETWFwLT5lbmQoKTsKICAgICBBU1NFUlRfVU5VU0VEKGVuZCwgaXRl ciAhPSBlbmQpOwogCi0gICAgaW50NjRfdCYgaWQgPSBpdGVyLT52YWx1ZTsKKyAgICBHbG9iYWxW YXJpYWJsZUlEJiBpZCA9IGl0ZXItPnZhbHVlOwogICAgIGlmIChpZCA9PSBIaWdoRmlkZWxpdHlO ZWVkc1VuaXF1ZUlER2VuZXJhdGlvbikgewogICAgICAgICBpZCA9IHZtLmdldE5leHRVbmlxdWVW YXJpYWJsZUlEKCk7CiAgICAgICAgIG1fdW5pcXVlVHlwZVNldE1hcC0+c2V0KGtleSwgVHlwZVNl dDo6Y3JlYXRlKCkpOyAvL21ha2UgYSBuZXcgZ2xvYmFsIHR5cGVzZXQgZm9yIHRoZSBJRApAQCAt MjA3LDcgKzIwNyw3IEBAIGludDY0X3QgU3ltYm9sVGFibGU6OnVuaXF1ZUlERm9yVmFyaWFibGUK ICAgICByZXR1cm4gaWQ7CiB9CiAKLWludDY0X3QgU3ltYm9sVGFibGU6OnVuaXF1ZUlERm9yUmVn aXN0ZXIoY29uc3QgQ29uY3VycmVudEpJVExvY2tlciYgbG9ja2VyLCBpbnQgcmVnaXN0ZXJJbmRl eCwgVk0mIHZtKQorR2xvYmFsVmFyaWFibGVJRCBTeW1ib2xUYWJsZTo6dW5pcXVlSURGb3JSZWdp c3Rlcihjb25zdCBDb25jdXJyZW50SklUTG9ja2VyJiBsb2NrZXIsIGludCByZWdpc3RlckluZGV4 LCBWTSYgdm0pCiB7CiAgICAgYXV0byBpdGVyID0gbV9yZWdpc3RlclRvVmFyaWFibGVNYXAtPmZp bmQocmVnaXN0ZXJJbmRleCk7CiAgICAgYXV0byBlbmQgPSBtX3JlZ2lzdGVyVG9WYXJpYWJsZU1h cC0+ZW5kKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TeW1ib2xUYWJs ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N5bWJvbFRh YmxlLmgJKHJldmlzaW9uIDE3MTYwNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1N5bWJvbFRhYmxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMzNyw3ICszMzcsNyBAQCBwdWJsaWM6 CiAgICAgdHlwZWRlZiBKU0NlbGwgQmFzZTsKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8 U3RyaW5nSW1wbD4sIFN5bWJvbFRhYmxlRW50cnksIElkZW50aWZpZXJSZXBIYXNoLCBIYXNoVHJh aXRzPFJlZlB0cjxTdHJpbmdJbXBsPj4sIFN5bWJvbFRhYmxlSW5kZXhIYXNoVHJhaXRzPiBNYXA7 Ci0gICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxTdHJpbmdJbXBsPiwgaW50NjRfdD4gVW5pcXVl SURNYXA7CisgICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxTdHJpbmdJbXBsPiwgR2xvYmFsVmFy aWFibGVJRD4gVW5pcXVlSURNYXA7CiAgICAgdHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxTdHJpbmdJ bXBsPiwgUmVmUHRyPFR5cGVTZXQ+PiBVbmlxdWVUeXBlU2V0TWFwOwogICAgIHR5cGVkZWYgSGFz aE1hcDxpbnQsIFJlZlB0cjxTdHJpbmdJbXBsPiwgV1RGOjpJbnRIYXNoPGludD4sIFdURjo6VW5z aWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8aW50Pj4gUmVnaXN0ZXJUb1ZhcmlhYmxlTWFwOwog CkBAIC00NTgsOCArNDU4LDggQEAgcHVibGljOgogICAgICAgICByZXR1cm4gY29udGFpbnMobG9j a2VyLCBrZXkpOwogICAgIH0KICAgICAKLSAgICBpbnQ2NF90IHVuaXF1ZUlERm9yVmFyaWFibGUo Y29uc3QgQ29uY3VycmVudEpJVExvY2tlciYsIFN0cmluZ0ltcGwqIGtleSwgVk0mIHZtKTsKLSAg ICBpbnQ2NF90IHVuaXF1ZUlERm9yUmVnaXN0ZXIoY29uc3QgQ29uY3VycmVudEpJVExvY2tlciYg bG9ja2VyLCBpbnQgcmVnaXN0ZXJJbmRleCwgVk0mIHZtKTsKKyAgICBHbG9iYWxWYXJpYWJsZUlE IHVuaXF1ZUlERm9yVmFyaWFibGUoY29uc3QgQ29uY3VycmVudEpJVExvY2tlciYsIFN0cmluZ0lt cGwqIGtleSwgVk0mIHZtKTsKKyAgICBHbG9iYWxWYXJpYWJsZUlEIHVuaXF1ZUlERm9yUmVnaXN0 ZXIoY29uc3QgQ29uY3VycmVudEpJVExvY2tlciYgbG9ja2VyLCBpbnQgcmVnaXN0ZXJJbmRleCwg Vk0mIHZtKTsKICAgICBSZWZQdHI8VHlwZVNldD4gZ2xvYmFsVHlwZVNldEZvclJlZ2lzdGVyKGNv bnN0IENvbmN1cnJlbnRKSVRMb2NrZXImIGxvY2tlciwgaW50IHJlZ2lzdGVySW5kZXgsIFZNJiB2 bSk7CiAgICAgUmVmUHRyPFR5cGVTZXQ+IGdsb2JhbFR5cGVTZXRGb3JWYXJpYWJsZShjb25zdCBD b25jdXJyZW50SklUTG9ja2VyJiBsb2NrZXIsIFN0cmluZ0ltcGwqIGtleSwgVk0mIHZtKTsKIApJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZUxvY2F0aW9uQ2FjaGUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVMb2NhdGlv bkNhY2hlLmNwcAkocmV2aXNpb24gMTcxNjA1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvVHlwZUxvY2F0aW9uQ2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3 IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi1zdGQ6OnBhaXI8VHlwZUxvY2F0aW9uKiwgYm9vbD4g VHlwZUxvY2F0aW9uQ2FjaGU6OmdldFR5cGVMb2NhdGlvbihpbnQ2NF90IGdsb2JhbFZhcmlhYmxl SUQsIGludHB0cl90IHNvdXJjZUlELCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kLCBQYXNz UmVmUHRyPFR5cGVTZXQ+IGdsb2JhbFR5cGVTZXQsIFZNKiB2bSkKK3N0ZDo6cGFpcjxUeXBlTG9j YXRpb24qLCBib29sPiBUeXBlTG9jYXRpb25DYWNoZTo6Z2V0VHlwZUxvY2F0aW9uKEdsb2JhbFZh cmlhYmxlSUQgZ2xvYmFsVmFyaWFibGVJRCwgaW50cHRyX3Qgc291cmNlSUQsIHVuc2lnbmVkIHN0 YXJ0LCB1bnNpZ25lZCBlbmQsIFBhc3NSZWZQdHI8VHlwZVNldD4gZ2xvYmFsVHlwZVNldCwgVk0q IHZtKQogewogICAgIExvY2F0aW9uS2V5IGtleTsKICAgICBrZXkubV9nbG9iYWxWYXJpYWJsZUlE ID0gZ2xvYmFsVmFyaWFibGVJRDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1R5cGVMb2NhdGlvbkNhY2hlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvVHlwZUxvY2F0aW9uQ2FjaGUuaAkocmV2aXNpb24gMTcxNjA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlwZUxvY2F0aW9uQ2FjaGUuaAkod29ya2luZyBjb3B5 KQpAQCAtNTEsMTMgKzUxLDEzIEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybiBtX2dsb2Jh bFZhcmlhYmxlSUQgKyBtX3NvdXJjZUlEICsgbV9zdGFydCArIG1fZW5kOwogICAgICAgICB9CiAK LSAgICAgICAgaW50NjRfdCBtX2dsb2JhbFZhcmlhYmxlSUQ7CisgICAgICAgIEdsb2JhbFZhcmlh YmxlSUQgbV9nbG9iYWxWYXJpYWJsZUlEOwogICAgICAgICBpbnRwdHJfdCBtX3NvdXJjZUlEOwog ICAgICAgICB1bnNpZ25lZCBtX3N0YXJ0OwogICAgICAgICB1bnNpZ25lZCBtX2VuZDsKICAgICB9 OwogCi0gICAgc3RkOjpwYWlyPFR5cGVMb2NhdGlvbiosIGJvb2w+IGdldFR5cGVMb2NhdGlvbihp bnQ2NF90LCBpbnRwdHJfdCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVuZCwgUGFzc1JlZlB0 cjxUeXBlU2V0PiwgVk0qKTsKKyAgICBzdGQ6OnBhaXI8VHlwZUxvY2F0aW9uKiwgYm9vbD4gZ2V0 VHlwZUxvY2F0aW9uKEdsb2JhbFZhcmlhYmxlSUQsIGludHB0cl90LCB1bnNpZ25lZCBzdGFydCwg dW5zaWduZWQgZW5kLCBQYXNzUmVmUHRyPFR5cGVTZXQ+LCBWTSopOwogcHJpdmF0ZTogICAgIAog ICAgIHR5cGVkZWYgc3RkOjp1bm9yZGVyZWRfbWFwPExvY2F0aW9uS2V5LCBUeXBlTG9jYXRpb24q LCBIYXNoTWV0aG9kPExvY2F0aW9uS2V5Pj4gTG9jYXRpb25NYXA7CiAgICAgTG9jYXRpb25NYXAg bV9sb2NhdGlvbk1hcDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAkocmV2aXNp b24gMTcxNjA1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAkod29ya2lu ZyBjb3B5KQpAQCAtNTIxLDcgKzUyMSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBIaWdo RmlkZWxpdHlUeXBlUHJvZmlsZXIqIGhpZ2hGaWRlbGl0eVR5cGVQcm9maWxlcigpIHsgcmV0dXJu IG1faGlnaEZpZGVsaXR5VHlwZVByb2ZpbGVyLmdldCgpOyB9CiAgICAgICAgIFR5cGVMb2NhdGlv biogbmV4dExvY2F0aW9uKCkgeyByZXR1cm4gbV9sb2NhdGlvbkluZm8uYWRkKCk7IH0gLy9UT0RP OiBwb3NzaWJsZSBvcHRtaXphdGlvbjogd2hlbiBjb2RlYmxvY2tzIGRpZSwgcmVwb3J0IHdoaWNo IGxvY2F0aW9ucyBhcmUgbm8gbG9uZ2VyIGJlaW5nIGNoYW5nZWQgc28gd2UgZG9uJ3Qgd2FsayBv dmVyIHRoZW0KICAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBkdW1wSGlnaEZpZGVsaXR5 UHJvZmlsaW5nVHlwZXMoKTsKLSAgICAgICAgaW50NjRfdCBnZXROZXh0VW5pcXVlVmFyaWFibGVJ RCgpIHsgcmV0dXJuIG1fbmV4dFVuaXF1ZVZhcmlhYmxlSUQrKzsgfQorICAgICAgICBHbG9iYWxW YXJpYWJsZUlEIGdldE5leHRVbmlxdWVWYXJpYWJsZUlEKCkgeyByZXR1cm4gbV9uZXh0VW5pcXVl VmFyaWFibGVJRCsrOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgTExJ bnRPZmZzZXRzRXh0cmFjdG9yOwpAQCAtNTczLDcgKzU3Myw3IEBAIG5hbWVzcGFjZSBKU0Mgewog ICAgICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFdhdGNocG9pbnRTZXQ+PiBtX2ltcHVyZVBy b3BlcnR5V2F0Y2hwb2ludFNldHM7CiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxIaWdoRmlkZWxp dHlUeXBlUHJvZmlsZXI+IG1faGlnaEZpZGVsaXR5VHlwZVByb2ZpbGVyOwogICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8SGlnaEZpZGVsaXR5TG9nPiBtX2hpZ2hGaWRlbGl0eUxvZzsKLSAgICAgICAg aW50NjRfdCBtX25leHRVbmlxdWVWYXJpYWJsZUlEOworICAgICAgICBHbG9iYWxWYXJpYWJsZUlE IG1fbmV4dFVuaXF1ZVZhcmlhYmxlSUQ7CiAgICAgICAgIEJhZzxUeXBlTG9jYXRpb24+IG1fbG9j YXRpb25JbmZvOwogICAgIH07CiAK