111871 2013-03-08 10:35:49 -0800 Cleanup of DFG and Baseline JIT debugging code 2013-03-15 13:26:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 1 msaboff msaboff buildbot rniwa webkit.review.bot oldest_to_newest 851317 0 msaboff 2013-03-08 10:35:49 -0800 While debugging a problem in the JSC JIT code, I came across three changes that needed to be made for the code to compile and/or run. The issues were An unsafe cast to a double* in dfg/DFGOperations.cpp::debugOperationPrintSpeculationFailure() Missing case labels in dfg/DFGSpeculativeJIT.cpp:SpeculativeJIT::checkConsistency() Possible dereferencing a null pointer in jit/JITCall32_64.cpp:JIT::privateCompileClosureCall() These need to be fixed, with the last issue also needing to be addressed in jit/JITCall.cpp 851386 1 192260 msaboff 2013-03-08 11:54:36 -0800 Created attachment 192260 Patch 851397 2 webkit.review.bot 2013-03-08 12:02:55 -0800 Attachment 192260 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/dfg/DFGOperations.cpp', u'Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp', u'Source/JavaScriptCore/jit/JITCall.cpp', u'Source/JavaScriptCore/jit/JITCall32_64.cpp']" exit_code: 1 Source/JavaScriptCore/jit/JITCall.cpp:260: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 851525 3 192260 fpizlo 2013-03-08 14:44:42 -0800 Comment on attachment 192260 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192260&action=review > Source/JavaScriptCore/dfg/DFGOperations.cpp:1634 > - double value = *reinterpret_cast_ptr<double*>(scratchPointer); > + double value = static_cast<double>(bits); Should fix the scratch buffer to allocate 8-byte aligned. > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp:1124 > + case DataFormatOSRMarker: > + case DataFormatDead: > + case DataFormatArguments: These should be RELEASE_ASSERT_NOT_REACHED(). > Source/JavaScriptCore/jit/JITCall32_64.cpp:340 > - toCString(*calleeCodeBlock).data())), > + calleeCodeBlock ? toCString(*calleeCodeBlock).data() : "Null")), Can also be written as: toCString(PointerDump(calleeCodeBlock)).data() >> Source/JavaScriptCore/jit/JITCall.cpp:260 >> - toCString(*calleeCodeBlock).data())), >> + calleeCodeBlock ? toCString(*calleeCodeBlock).data() : "Null")), > > Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Ditto 853865 4 192826 msaboff 2013-03-12 15:42:37 -0700 Created attachment 192826 Updated patch addressing reviewer comments 854050 5 192826 buildbot 2013-03-12 21:45:38 -0700 Comment on attachment 192826 Updated patch addressing reviewer comments Attachment 192826 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/17190214 New failing tests: editing/selection/selection-modify-crash.html 856099 6 193337 msaboff 2013-03-15 10:51:44 -0700 Created attachment 193337 Added: changed handling of calleeCodeBlock to use pointerDump() in dfg/DFGRepatch.cpp::dfgLinkClosureCall Couldn't get editing/selection/selection-modify-crash.html to crash in my environment. 856101 7 193337 ggaren 2013-03-15 10:54:44 -0700 Comment on attachment 193337 Added: changed handling of calleeCodeBlock to use pointerDump() in dfg/DFGRepatch.cpp::dfgLinkClosureCall Looks like Phil's comments have been addressed. r=me 856243 8 msaboff 2013-03-15 13:26:56 -0700 Committed r145933: <http://trac.webkit.org/changeset/145933> 192260 2013-03-08 11:54:36 -0800 2013-03-12 15:42:37 -0700 Patch 111871.patch text/plain 4100 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ1MjUwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDEzLTAzLTA4ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENsZWFudXAgb2YgREZHIGFuZCBCYXNlbGluZSBKSVQgZGVidWdnaW5nIGNvZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTg3MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHZhcmlvdXMg ZGVidWcgcmVsYXRlZCBpc3N1ZSBpbiBiYXNlbGluZSBhbmQgREZHIEpJVHMuICBTZWUgYmVsb3cu CisKKyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 ZGVidWdPcGVyYXRpb25QcmludFNwZWN1bGF0aW9uRmFpbHVyZSk6IENhbid0IGNhc3QgYW4gYXJi aXRyYXJ5IHBvaW50IHRvIGEgZG91YmxlKiBvbgorICAgICAgICBhbGwgcGxhdGZvcm1zLiAgSW5z dGVhZCBjYXN0IHRoZSB1aW50NjRfdCB2YWx1ZSB3ZSBhbHJlYWR5IGxvYWRlZCB0byBhIGRvdWJs ZS4KKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpE Rkc6OlNwZWN1bGF0aXZlSklUOjpjaGVja0NvbnNpc3RlbmN5KTogQWRkZWQgbWlzc2luZyBjYXNl IGxhYmVscyBmb3IgRGF0YUZvcm1hdE9TUk1hcmtlciwKKyAgICAgICAgRGF0YUZvcm1hdERlYWQs IGFuZCBEYXRhRm9ybWF0QXJndW1lbnRzLgorICAgICAgICAqIGppdC9KSVRDYWxsLmNwcDoKKyAg ICAgICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGlsZUNsb3N1cmVDYWxsKTogSWYgY2FsbGVlQ29k ZUJsb2NrIGlzIG51bGwsIGp1c3Qgb3V0cHV0ICJOdWxsIi4KKyAgICAgICAgKiBqaXQvSklUQ2Fs bDMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGlsZUNsb3N1cmVDYWxs KTogSWYgY2FsbGVlQ29kZUJsb2NrIGlzIG51bGwsIGp1c3Qgb3V0cHV0ICJOdWxsIi4KKwogMjAx My0wMy0wOCAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAgIE1h a2VmaWxlIGZpeGVzLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRp b25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJh dGlvbnMuY3BwCShyZXZpc2lvbiAxNDUxNDkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR09wZXJhdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjMxLDcgKzE2MzEsNyBAQCB2 b2lkIERGR19PUEVSQVRJT04gZGVidWdPcGVyYXRpb25QcmludFNwCiAgICAgICAgIEZQUlJlZyBm cHIgPSBGUFJJbmZvOjp0b1JlZ2lzdGVyKGkpOwogICAgICAgICBkYXRhTG9nKCIgIiwgRlBSSW5m bzo6ZGVidWdOYW1lKGZwciksICI6Iik7CiAgICAgICAgIHVpbnQ2NF90IGJpdHMgPSAqcmVpbnRl cnByZXRfY2FzdF9wdHI8dWludDY0X3QqPihzY3JhdGNoUG9pbnRlcik7Ci0gICAgICAgIGRvdWJs ZSB2YWx1ZSA9ICpyZWludGVycHJldF9jYXN0X3B0cjxkb3VibGUqPihzY3JhdGNoUG9pbnRlcik7 CisgICAgICAgIGRvdWJsZSB2YWx1ZSA9IHN0YXRpY19jYXN0PGRvdWJsZT4oYml0cyk7CiAgICAg ICAgIGRhdGFMb2dGKCIlbGx4OiVsZiIsIHN0YXRpY19jYXN0PGxvbmcgbG9uZz4oYml0cyksIHZh bHVlKTsKICAgICAgICAgc2NyYXRjaFBvaW50ZXIgKz0gc2l6ZW9mKEVuY29kZWRKU1ZhbHVlKTsK ICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklU LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklULmNwcAkocmV2aXNpb24gMTQ1MTQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMTksNiArMTExOSw5 IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNoZWNrQ29uc2lzdGVuY3koKQogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIHN3aXRjaCAoaW5mby5yZWdpc3RlckZvcm1hdCgpKSB7CiAgICAg ICAgIGNhc2UgRGF0YUZvcm1hdE5vbmU6CisgICAgICAgIGNhc2UgRGF0YUZvcm1hdE9TUk1hcmtl cjoKKyAgICAgICAgY2FzZSBEYXRhRm9ybWF0RGVhZDoKKyAgICAgICAgY2FzZSBEYXRhRm9ybWF0 QXJndW1lbnRzOgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRGF0YUZvcm1hdEpT OgogICAgICAgICBjYXNlIERhdGFGb3JtYXRKU0ludGVnZXI6CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVENhbGwzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRDYWxsMzJfNjQuY3BwCShyZXZpc2lvbiAxNDUxNDkpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENhbGwzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMzNyw3ICszMzcsNyBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVDbG9zdXJlQ2FsbChDYWxs CiAgICAgICAgICAgICAgICAgdG9DU3RyaW5nKCptX2NvZGVCbG9jaykuZGF0YSgpLAogICAgICAg ICAgICAgICAgIGNhbGxMaW5rSW5mby0+aG90UGF0aE90aGVyLmxhYmVsQXRPZmZzZXQoMCkuZXhl Y3V0YWJsZUFkZHJlc3MoKSwKICAgICAgICAgICAgICAgICBjb2RlUHRyLmV4ZWN1dGFibGVBZGRy ZXNzKCksCi0gICAgICAgICAgICAgICAgdG9DU3RyaW5nKCpjYWxsZWVDb2RlQmxvY2spLmRhdGEo KSkpLAorICAgICAgICAgICAgICAgIGNhbGxlZUNvZGVCbG9jayA/IHRvQ1N0cmluZygqY2FsbGVl Q29kZUJsb2NrKS5kYXRhKCkgOiAiTnVsbCIpKSwKICAgICAgICAgKm1fZ2xvYmFsRGF0YSwgbV9j b2RlQmxvY2stPm93bmVyRXhlY3V0YWJsZSgpLCBleHBlY3RlZFN0cnVjdHVyZSwgZXhwZWN0ZWRF eGVjdXRhYmxlLAogICAgICAgICBjYWxsTGlua0luZm8tPmNvZGVPcmlnaW4pKTsKICAgICAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAkocmV2aXNpb24gMTQ1MTQ5KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjU3LDcgKzI1Nyw3IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUNsb3N1cmVDYWxsKENh bGwKICAgICAgICAgICAgICAgICB0b0NTdHJpbmcoKm1fY29kZUJsb2NrKS5kYXRhKCksCiAgICAg ICAgICAgICAgICAgY2FsbExpbmtJbmZvLT5ob3RQYXRoT3RoZXIubGFiZWxBdE9mZnNldCgwKS5l eGVjdXRhYmxlQWRkcmVzcygpLAogICAgICAgICAgICAgICAgIGNvZGVQdHIuZXhlY3V0YWJsZUFk ZHJlc3MoKSwKLSAgICAgICAgICAgICAgICB0b0NTdHJpbmcoKmNhbGxlZUNvZGVCbG9jaykuZGF0 YSgpKSksCisgICAgICAgICAgICAgY2FsbGVlQ29kZUJsb2NrID8gdG9DU3RyaW5nKCpjYWxsZWVD b2RlQmxvY2spLmRhdGEoKSA6ICJOdWxsIikpLAogICAgICAgICAqbV9nbG9iYWxEYXRhLCBtX2Nv ZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCksIGV4cGVjdGVkU3RydWN0dXJlLCBleHBlY3RlZEV4 ZWN1dGFibGUsCiAgICAgICAgIGNhbGxMaW5rSW5mby0+Y29kZU9yaWdpbikpOwogICAgIAo= 192826 2013-03-12 15:42:37 -0700 2013-03-15 10:51:44 -0700 Updated patch addressing reviewer comments 111871-2.patch text/plain 6399 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ1NTkxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDEzLTAzLTEyICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENsZWFudXAgb2YgREZHIGFuZCBCYXNlbGluZSBKSVQgZGVidWdnaW5nIGNvZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTg3MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHZhcmlvdXMg ZGVidWcgcmVsYXRlZCBpc3N1ZSBpbiBiYXNlbGluZSBhbmQgREZHIEpJVHMuIFNlZSBiZWxvdy4K KworICAgICAgICAqIGRmZy9ERkdTY3JhdGNoUmVnaXN0ZXJBbGxvY2F0b3IuaDogTm93IHVzZSBT Y3JhdGNoQnVmZmVyOjphY3RpdmVMZW5ndGhQdHIoKSB0byBnZXQKKyAgICAgICAgcG9pbnRlciB0 byBzY3JhdGNoIHJlZ2lzdGVyIGxlbmd0aC4KKyAgICAgICAgKEpTQzo6REZHOjpTY3JhdGNoUmVn aXN0ZXJBbGxvY2F0b3I6OnByZXNlcnZlVXNlZFJlZ2lzdGVyc1RvU2NyYXRjaEJ1ZmZlcik6Cisg ICAgICAgIChKU0M6OkRGRzo6U2NyYXRjaFJlZ2lzdGVyQWxsb2NhdG9yOjpyZXN0b3JlVXNlZFJl Z2lzdGVyc0Zyb21TY3JhdGNoQnVmZmVyKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVK SVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjaGVja0NvbnNpc3Rl bmN5KTogQWRkZWQgbWlzc2luZyBjYXNlIGxhYmVscyBmb3IgRGF0YUZvcm1hdE9TUk1hcmtlciwK KyAgICAgICAgRGF0YUZvcm1hdERlYWQsIGFuZCBEYXRhRm9ybWF0QXJndW1lbnRzIGFuZCBtYWRl IHRoZW0gUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgKiBqaXQvSklUQ2Fs bC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBpbGVDbG9zdXJlQ2FsbCk6IFVz ZWQgcG9pbnRlckR1bXAoKSB0byBoYW5kbGUgd2hlbiBjYWxsZWVDb2RlQmxvY2sgaXMgTlVMTC4K KyAgICAgICAgKiBqaXQvSklUQ2FsbDMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpwcml2 YXRlQ29tcGlsZUNsb3N1cmVDYWxsKTogVXNlZCBwb2ludGVyRHVtcCgpIHRvIGhhbmRsZSB3aGVu IGNhbGxlZUNvZGVCbG9jayBpcyBOVUxMLgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxEYXRh Lmg6CisgICAgICAgIChKU0M6OlNjcmF0Y2hCdWZmZXI6OlNjcmF0Y2hCdWZmZXIpOiBGaXhlZCBi dWZmZXIgYWxsb2NhdGlvbiBhbGlnbm1lbnQgdG8KKyAgICAgICAgYmUgb24gYSBkb3VibGUgYm91 bmRhcnkuCisgICAgICAgIChKU0M6OlNjcmF0Y2hCdWZmZXI6OnNldEFjdGl2ZUxlbmd0aCk6Cisg ICAgICAgIChKU0M6OlNjcmF0Y2hCdWZmZXI6OmFjdGl2ZUxlbmd0aCk6CisgICAgICAgIChKU0M6 OlNjcmF0Y2hCdWZmZXI6OmFjdGl2ZUxlbmd0aFB0cik6CisKIDIwMTMtMDMtMTIgIEZpbGlwIFBp emxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBERkcgZ2VuZXJpYyBhcnJheSBhY2Nl c3MgY2FzZXMgc2hvdWxkIG5vdCBiZSBndWFyZGVkIGJ5IENoZWNrU3RydWN0dXJlIGV2ZW4gb2Yg dGhlIHByb2ZpbGluZyB0ZWxscyB1cyB0aGF0IGl0IGNvdWxkIGJlCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NjcmF0Y2hSZWdpc3RlckFsbG9jYXRvci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2NyYXRjaFJlZ2lzdGVyQWxsb2NhdG9y LmgJKHJldmlzaW9uIDE0NTU1MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2Ny YXRjaFJlZ2lzdGVyQWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Niw3ICsxNDYsNyBA QCBwdWJsaWM6CiAgICAgICAgIH0KICAgICAgICAgUkVMRUFTRV9BU1NFUlQoY291bnQgKiBzaXpl b2YoSlNWYWx1ZSkgPT0gZGVzaXJlZFNjcmF0Y2hCdWZmZXJTaXplKCkpOwogICAgICAgICAKLSAg ICAgICAgaml0Lm1vdmUoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJnNjcmF0Y2hCdWZm ZXItPm1fYWN0aXZlTGVuZ3RoKSwgc2NyYXRjaEdQUik7CisgICAgICAgIGppdC5tb3ZlKE1hY3Jv QXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0cigp KSwgc2NyYXRjaEdQUik7CiAgICAgICAgIGppdC5zdG9yZVB0cihNYWNyb0Fzc2VtYmxlcjo6VHJ1 c3RlZEltbVB0cihzdGF0aWNfY2FzdDxzaXplX3Q+KGNvdW50ICogc2l6ZW9mKEpTVmFsdWUpKSks IHNjcmF0Y2hHUFIpOwogICAgIH0KICAgICAKQEAgLTE2Myw3ICsxNjMsNyBAQCBwdWJsaWM6CiAg ICAgICAgIH0KICAgICAgICAgUkVMRUFTRV9BU1NFUlQoc2NyYXRjaEdQUiAhPSBJbnZhbGlkR1BS UmVnKTsKICAgICAgICAgCi0gICAgICAgIGppdC5tb3ZlKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVk SW1tUHRyKCZzY3JhdGNoQnVmZmVyLT5tX2FjdGl2ZUxlbmd0aCksIHNjcmF0Y2hHUFIpOworICAg ICAgICBqaXQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihzY3JhdGNoQnVmZmVy LT5hY3RpdmVMZW5ndGhQdHIoKSksIHNjcmF0Y2hHUFIpOwogICAgICAgICBqaXQuc3RvcmVQdHIo TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoMCksIHNjcmF0Y2hHUFIpOwogCiAgICAgICAg IC8vIFJlc3RvcmUgZG91YmxlIHJlZ2lzdGVycyBmaXJzdC4KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAxNDU1NTMp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTE0OCw2ICsxMTQ4LDExIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNo ZWNrQ29uc2lzdGVuY3koKQogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KKyAgICAgICAgY2FzZSBEYXRhRm9ybWF0T1NSTWFya2VyOgorICAgICAgICBjYXNlIERh dGFGb3JtYXREZWFkOgorICAgICAgICBjYXNlIERhdGFGb3JtYXRBcmd1bWVudHM6CisgICAgICAg ICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2Fs bDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENh bGwzMl82NC5jcHAJKHJldmlzaW9uIDE0NTU1MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUQ2FsbDMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzM3LDcgKzMzNyw3IEBAIHZv aWQgSklUOjpwcml2YXRlQ29tcGlsZUNsb3N1cmVDYWxsKENhbGwKICAgICAgICAgICAgICAgICB0 b0NTdHJpbmcoKm1fY29kZUJsb2NrKS5kYXRhKCksCiAgICAgICAgICAgICAgICAgY2FsbExpbmtJ bmZvLT5ob3RQYXRoT3RoZXIubGFiZWxBdE9mZnNldCgwKS5leGVjdXRhYmxlQWRkcmVzcygpLAog ICAgICAgICAgICAgICAgIGNvZGVQdHIuZXhlY3V0YWJsZUFkZHJlc3MoKSwKLSAgICAgICAgICAg ICAgICB0b0NTdHJpbmcoKmNhbGxlZUNvZGVCbG9jaykuZGF0YSgpKSksCisgICAgICAgICAgICAg ICAgdG9DU3RyaW5nKHBvaW50ZXJEdW1wKGNhbGxlZUNvZGVCbG9jaykpLmRhdGEoKSkpLAogICAg ICAgICAqbV9nbG9iYWxEYXRhLCBtX2NvZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCksIGV4cGVj dGVkU3RydWN0dXJlLCBleHBlY3RlZEV4ZWN1dGFibGUsCiAgICAgICAgIGNhbGxMaW5rSW5mby0+ Y29kZU9yaWdpbikpOwogICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRD YWxsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENhbGwu Y3BwCShyZXZpc2lvbiAxNDU1NTMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENh bGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTcsNyArMjU3LDcgQEAgdm9pZCBKSVQ6OnByaXZh dGVDb21waWxlQ2xvc3VyZUNhbGwoQ2FsbAogICAgICAgICAgICAgICAgIHRvQ1N0cmluZygqbV9j b2RlQmxvY2spLmRhdGEoKSwKICAgICAgICAgICAgICAgICBjYWxsTGlua0luZm8tPmhvdFBhdGhP dGhlci5sYWJlbEF0T2Zmc2V0KDApLmV4ZWN1dGFibGVBZGRyZXNzKCksCiAgICAgICAgICAgICAg ICAgY29kZVB0ci5leGVjdXRhYmxlQWRkcmVzcygpLAotICAgICAgICAgICAgICAgIHRvQ1N0cmlu ZygqY2FsbGVlQ29kZUJsb2NrKS5kYXRhKCkpKSwKKyAgICAgICAgICAgICAgICB0b0NTdHJpbmco cG9pbnRlckR1bXAoY2FsbGVlQ29kZUJsb2NrKSkuZGF0YSgpKSksCiAgICAgICAgICptX2dsb2Jh bERhdGEsIG1fY29kZUJsb2NrLT5vd25lckV4ZWN1dGFibGUoKSwgZXhwZWN0ZWRTdHJ1Y3R1cmUs IGV4cGVjdGVkRXhlY3V0YWJsZSwKICAgICAgICAgY2FsbExpbmtJbmZvLT5jb2RlT3JpZ2luKSk7 CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERhdGEu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERh dGEuaAkocmV2aXNpb24gMTQ1NTUzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNHbG9iYWxEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw4ICsxMzIsOCBAQCBuYW1lc3Bh Y2UgSlNDIHsKICNlbmRpZgogICAgIHN0cnVjdCBTY3JhdGNoQnVmZmVyIHsKICAgICAgICAgU2Ny YXRjaEJ1ZmZlcigpCi0gICAgICAgICAgICA6IG1fYWN0aXZlTGVuZ3RoKDApCiAgICAgICAgIHsK KyAgICAgICAgICAgIHUubV9hY3RpdmVMZW5ndGggPSAwOwogICAgICAgICB9CiAKICAgICAgICAg c3RhdGljIFNjcmF0Y2hCdWZmZXIqIGNyZWF0ZShzaXplX3Qgc2l6ZSkKQEAgLTE0NCwxMiArMTQ0 LDE1IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB9CiAKICAgICAgICAgc3RhdGljIHNpemVf dCBhbGxvY2F0aW9uU2l6ZShzaXplX3QgYnVmZmVyU2l6ZSkgeyByZXR1cm4gc2l6ZW9mKFNjcmF0 Y2hCdWZmZXIpICsgYnVmZmVyU2l6ZTsgfQotICAgICAgICB2b2lkIHNldEFjdGl2ZUxlbmd0aChz aXplX3QgYWN0aXZlTGVuZ3RoKSB7IG1fYWN0aXZlTGVuZ3RoID0gYWN0aXZlTGVuZ3RoOyB9Ci0g ICAgICAgIHNpemVfdCBhY3RpdmVMZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZUxlbmd0 aDsgfTsKLSAgICAgICAgc2l6ZV90KiBhY3RpdmVMZW5ndGhQdHIoKSB7IHJldHVybiAmbV9hY3Rp dmVMZW5ndGg7IH07CisgICAgICAgIHZvaWQgc2V0QWN0aXZlTGVuZ3RoKHNpemVfdCBhY3RpdmVM ZW5ndGgpIHsgdS5tX2FjdGl2ZUxlbmd0aCA9IGFjdGl2ZUxlbmd0aDsgfQorICAgICAgICBzaXpl X3QgYWN0aXZlTGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gdS5tX2FjdGl2ZUxlbmd0aDsgfTsKKyAg ICAgICAgc2l6ZV90KiBhY3RpdmVMZW5ndGhQdHIoKSB7IHJldHVybiAmdS5tX2FjdGl2ZUxlbmd0 aDsgfTsKICAgICAgICAgdm9pZCogZGF0YUJ1ZmZlcigpIHsgcmV0dXJuIG1fYnVmZmVyOyB9CiAK LSAgICAgICAgc2l6ZV90IG1fYWN0aXZlTGVuZ3RoOworICAgICAgICB1bmlvbiB7CisgICAgICAg ICAgICBzaXplX3QgbV9hY3RpdmVMZW5ndGg7CisgICAgICAgICAgICBkb3VibGUgcGFkOyAvLyBN YWtlIHN1cmUgbV9idWZmZXIgaXMgZG91YmxlIGFsaWduZWQuCisgICAgICAgIH0gdTsKICNpZiBD UFUoTUlQUykgJiYgKGRlZmluZWQgV1RGX01JUFNfQVJDSF9SRVYgJiYgV1RGX01JUFNfQVJDSF9S RVYgPT0gMikKICAgICAgICAgdm9pZCogbV9idWZmZXJbMF0gX19hdHRyaWJ1dGVfXygoYWxpZ25l ZCg4KSkpOwogI2Vsc2UK 193337 2013-03-15 10:51:44 -0700 2013-03-15 10:54:44 -0700 Added: changed handling of calleeCodeBlock to use pointerDump() in dfg/DFGRepatch.cpp::dfgLinkClosureCall 111871-3.patch text/plain 7371 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ1OTEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDEzLTAzLTE1ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENsZWFudXAgb2YgREZHIGFuZCBCYXNlbGluZSBKSVQgZGVidWdnaW5nIGNvZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTg3MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHZhcmlvdXMg ZGVidWcgcmVsYXRlZCBpc3N1ZSBpbiBiYXNlbGluZSBhbmQgREZHIEpJVHMuIFNlZSBiZWxvdy4K KworICAgICAgICAqIGRmZy9ERkdSZXBhdGNoLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpkZmdM aW5rQ2xvc3VyZUNhbGwpOiBVc2VkIHBvaW50ZXJEdW1wKCkgdG8gaGFuZGxlIHdoZW4gY2FsbGVl Q29kZUJsb2NrIGlzIE5VTEwuCisgICAgICAgICogZGZnL0RGR1NjcmF0Y2hSZWdpc3RlckFsbG9j YXRvci5oOiBOb3cgdXNlIFNjcmF0Y2hCdWZmZXI6OmFjdGl2ZUxlbmd0aFB0cigpIHRvIGdldAor ICAgICAgICBwb2ludGVyIHRvIHNjcmF0Y2ggcmVnaXN0ZXIgbGVuZ3RoLgorICAgICAgICAoSlND OjpERkc6OlNjcmF0Y2hSZWdpc3RlckFsbG9jYXRvcjo6cHJlc2VydmVVc2VkUmVnaXN0ZXJzVG9T Y3JhdGNoQnVmZmVyKToKKyAgICAgICAgKEpTQzo6REZHOjpTY3JhdGNoUmVnaXN0ZXJBbGxvY2F0 b3I6OnJlc3RvcmVVc2VkUmVnaXN0ZXJzRnJvbVNjcmF0Y2hCdWZmZXIpOgorICAgICAgICAqIGRm Zy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVK SVQ6OmNoZWNrQ29uc2lzdGVuY3kpOiBBZGRlZCBtaXNzaW5nIGNhc2UgbGFiZWxzIGZvciBEYXRh Rm9ybWF0T1NSTWFya2VyLAorICAgICAgICBEYXRhRm9ybWF0RGVhZCwgYW5kIERhdGFGb3JtYXRB cmd1bWVudHMgYW5kIG1hZGUgdGhlbSBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICAqIGppdC9KSVRDYWxsLmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGls ZUNsb3N1cmVDYWxsKTogVXNlZCBwb2ludGVyRHVtcCgpIHRvIGhhbmRsZSB3aGVuIGNhbGxlZUNv ZGVCbG9jayBpcyBOVUxMLgorICAgICAgICAqIGppdC9KSVRDYWxsMzJfNjQuY3BwOgorICAgICAg ICAoSlNDOjpKSVQ6OnByaXZhdGVDb21waWxlQ2xvc3VyZUNhbGwpOiBVc2VkIHBvaW50ZXJEdW1w KCkgdG8gaGFuZGxlIHdoZW4gY2FsbGVlQ29kZUJsb2NrIGlzIE5VTEwuCisgICAgICAgICogcnVu dGltZS9KU0dsb2JhbERhdGEuaDoKKyAgICAgICAgKEpTQzo6U2NyYXRjaEJ1ZmZlcjo6U2NyYXRj aEJ1ZmZlcik6IEZpeGVkIGJ1ZmZlciBhbGxvY2F0aW9uIGFsaWdubWVudCB0bworICAgICAgICBi ZSBvbiBhIGRvdWJsZSBib3VuZGFyeS4KKyAgICAgICAgKEpTQzo6U2NyYXRjaEJ1ZmZlcjo6c2V0 QWN0aXZlTGVuZ3RoKToKKyAgICAgICAgKEpTQzo6U2NyYXRjaEJ1ZmZlcjo6YWN0aXZlTGVuZ3Ro KToKKyAgICAgICAgKEpTQzo6U2NyYXRjaEJ1ZmZlcjo6YWN0aXZlTGVuZ3RoUHRyKToKKwogMjAx My0wMy0xNCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JF U1NJT04ocjE0NTAwMCk6IENyYXNoIGxvYWRpbmcgYXJzdGVjaG5pY2EuY29tIHdoZW4gU2FmYXJp IFdlYiBJbnNwZWN0b3IgaXMgb3BlbgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdSZXBhdGNoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1JlcGF0Y2guY3BwCShyZXZpc2lvbiAxNDU3MjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1JlcGF0Y2guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjM0LDcgKzEyMzQsNyBAQCB2 b2lkIGRmZ0xpbmtDbG9zdXJlQ2FsbChFeGVjU3RhdGUqIGV4ZWMsCiAgICAgICAgICAgICBwYXRj aEJ1ZmZlciwKICAgICAgICAgICAgICgiREZHIGNsb3N1cmUgY2FsbCBzdHViIGZvciAlcywgcmV0 dXJuIHBvaW50ICVwLCB0YXJnZXQgJXAgKCVzKSIsCiAgICAgICAgICAgICAgICAgdG9DU3RyaW5n KCpjYWxsZXJDb2RlQmxvY2spLmRhdGEoKSwgY2FsbExpbmtJbmZvLmNhbGxSZXR1cm5Mb2NhdGlv bi5sYWJlbEF0T2Zmc2V0KDApLmV4ZWN1dGFibGVBZGRyZXNzKCksCi0gICAgICAgICAgICAgICAg Y29kZVB0ci5leGVjdXRhYmxlQWRkcmVzcygpLCB0b0NTdHJpbmcoKmNhbGxlZUNvZGVCbG9jayku ZGF0YSgpKSksCisgICAgICAgICAgICAgICAgY29kZVB0ci5leGVjdXRhYmxlQWRkcmVzcygpLCB0 b0NTdHJpbmcocG9pbnRlckR1bXAoY2FsbGVlQ29kZUJsb2NrKSkuZGF0YSgpKSksCiAgICAgICAg ICpnbG9iYWxEYXRhLCBjYWxsZXJDb2RlQmxvY2stPm93bmVyRXhlY3V0YWJsZSgpLCBzdHJ1Y3R1 cmUsIGV4ZWN1dGFibGUsIGNhbGxMaW5rSW5mby5jb2RlT3JpZ2luKSk7CiAgICAgCiAgICAgUmVw YXRjaEJ1ZmZlciByZXBhdGNoQnVmZmVyKGNhbGxlckNvZGVCbG9jayk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NjcmF0Y2hSZWdpc3RlckFsbG9jYXRvci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2NyYXRjaFJlZ2lzdGVyQWxsb2Nh dG9yLmgJKHJldmlzaW9uIDE0NTcyNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U2NyYXRjaFJlZ2lzdGVyQWxsb2NhdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Niw3ICsxNDYs NyBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICAgICAgUkVMRUFTRV9BU1NFUlQoY291bnQgKiBz aXplb2YoSlNWYWx1ZSkgPT0gZGVzaXJlZFNjcmF0Y2hCdWZmZXJTaXplKCkpOwogICAgICAgICAK LSAgICAgICAgaml0Lm1vdmUoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJnNjcmF0Y2hC dWZmZXItPm1fYWN0aXZlTGVuZ3RoKSwgc2NyYXRjaEdQUik7CisgICAgICAgIGppdC5tb3ZlKE1h Y3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKHNjcmF0Y2hCdWZmZXItPmFjdGl2ZUxlbmd0aFB0 cigpKSwgc2NyYXRjaEdQUik7CiAgICAgICAgIGppdC5zdG9yZVB0cihNYWNyb0Fzc2VtYmxlcjo6 VHJ1c3RlZEltbVB0cihzdGF0aWNfY2FzdDxzaXplX3Q+KGNvdW50ICogc2l6ZW9mKEpTVmFsdWUp KSksIHNjcmF0Y2hHUFIpOwogICAgIH0KICAgICAKQEAgLTE2Myw3ICsxNjMsNyBAQCBwdWJsaWM6 CiAgICAgICAgIH0KICAgICAgICAgUkVMRUFTRV9BU1NFUlQoc2NyYXRjaEdQUiAhPSBJbnZhbGlk R1BSUmVnKTsKICAgICAgICAgCi0gICAgICAgIGppdC5tb3ZlKE1hY3JvQXNzZW1ibGVyOjpUcnVz dGVkSW1tUHRyKCZzY3JhdGNoQnVmZmVyLT5tX2FjdGl2ZUxlbmd0aCksIHNjcmF0Y2hHUFIpOwor ICAgICAgICBqaXQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihzY3JhdGNoQnVm ZmVyLT5hY3RpdmVMZW5ndGhQdHIoKSksIHNjcmF0Y2hHUFIpOwogICAgICAgICBqaXQuc3RvcmVQ dHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoMCksIHNjcmF0Y2hHUFIpOwogCiAgICAg ICAgIC8vIFJlc3RvcmUgZG91YmxlIHJlZ2lzdGVycyBmaXJzdC4KSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAxNDU3 MjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTE0OCw2ICsxMTQ4LDExIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNoZWNrQ29uc2lzdGVuY3koKQogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KKyAgICAgICAgY2FzZSBEYXRhRm9ybWF0T1NSTWFya2VyOgorICAgICAgICBjYXNl IERhdGFGb3JtYXREZWFkOgorICAgICAgICBjYXNlIERhdGFGb3JtYXRBcmd1bWVudHM6CisgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU Q2FsbDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ VENhbGwzMl82NC5jcHAJKHJldmlzaW9uIDE0NTcyNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUQ2FsbDMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzM3LDcgKzMzNyw3IEBA IHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUNsb3N1cmVDYWxsKENhbGwKICAgICAgICAgICAgICAg ICB0b0NTdHJpbmcoKm1fY29kZUJsb2NrKS5kYXRhKCksCiAgICAgICAgICAgICAgICAgY2FsbExp bmtJbmZvLT5ob3RQYXRoT3RoZXIubGFiZWxBdE9mZnNldCgwKS5leGVjdXRhYmxlQWRkcmVzcygp LAogICAgICAgICAgICAgICAgIGNvZGVQdHIuZXhlY3V0YWJsZUFkZHJlc3MoKSwKLSAgICAgICAg ICAgICAgICB0b0NTdHJpbmcoKmNhbGxlZUNvZGVCbG9jaykuZGF0YSgpKSksCisgICAgICAgICAg ICAgICAgdG9DU3RyaW5nKHBvaW50ZXJEdW1wKGNhbGxlZUNvZGVCbG9jaykpLmRhdGEoKSkpLAog ICAgICAgICAqbV9nbG9iYWxEYXRhLCBtX2NvZGVCbG9jay0+b3duZXJFeGVjdXRhYmxlKCksIGV4 cGVjdGVkU3RydWN0dXJlLCBleHBlY3RlZEV4ZWN1dGFibGUsCiAgICAgICAgIGNhbGxMaW5rSW5m by0+Y29kZU9yaWdpbikpOwogICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRDYWxsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENh bGwuY3BwCShyZXZpc2lvbiAxNDU3MjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ VENhbGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTcsNyArMjU3LDcgQEAgdm9pZCBKSVQ6OnBy aXZhdGVDb21waWxlQ2xvc3VyZUNhbGwoQ2FsbAogICAgICAgICAgICAgICAgIHRvQ1N0cmluZygq bV9jb2RlQmxvY2spLmRhdGEoKSwKICAgICAgICAgICAgICAgICBjYWxsTGlua0luZm8tPmhvdFBh dGhPdGhlci5sYWJlbEF0T2Zmc2V0KDApLmV4ZWN1dGFibGVBZGRyZXNzKCksCiAgICAgICAgICAg ICAgICAgY29kZVB0ci5leGVjdXRhYmxlQWRkcmVzcygpLAotICAgICAgICAgICAgICAgIHRvQ1N0 cmluZygqY2FsbGVlQ29kZUJsb2NrKS5kYXRhKCkpKSwKKyAgICAgICAgICAgICAgICB0b0NTdHJp bmcocG9pbnRlckR1bXAoY2FsbGVlQ29kZUJsb2NrKSkuZGF0YSgpKSksCiAgICAgICAgICptX2ds b2JhbERhdGEsIG1fY29kZUJsb2NrLT5vd25lckV4ZWN1dGFibGUoKSwgZXhwZWN0ZWRTdHJ1Y3R1 cmUsIGV4cGVjdGVkRXhlY3V0YWJsZSwKICAgICAgICAgY2FsbExpbmtJbmZvLT5jb2RlT3JpZ2lu KSk7CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbERh dGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2Jh bERhdGEuaAkocmV2aXNpb24gMTQ1NzI2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNHbG9iYWxEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw4ICsxMzIsOCBAQCBuYW1l c3BhY2UgSlNDIHsKICNlbmRpZgogICAgIHN0cnVjdCBTY3JhdGNoQnVmZmVyIHsKICAgICAgICAg U2NyYXRjaEJ1ZmZlcigpCi0gICAgICAgICAgICA6IG1fYWN0aXZlTGVuZ3RoKDApCiAgICAgICAg IHsKKyAgICAgICAgICAgIHUubV9hY3RpdmVMZW5ndGggPSAwOwogICAgICAgICB9CiAKICAgICAg ICAgc3RhdGljIFNjcmF0Y2hCdWZmZXIqIGNyZWF0ZShzaXplX3Qgc2l6ZSkKQEAgLTE0NCwxMiAr MTQ0LDE1IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB9CiAKICAgICAgICAgc3RhdGljIHNp emVfdCBhbGxvY2F0aW9uU2l6ZShzaXplX3QgYnVmZmVyU2l6ZSkgeyByZXR1cm4gc2l6ZW9mKFNj cmF0Y2hCdWZmZXIpICsgYnVmZmVyU2l6ZTsgfQotICAgICAgICB2b2lkIHNldEFjdGl2ZUxlbmd0 aChzaXplX3QgYWN0aXZlTGVuZ3RoKSB7IG1fYWN0aXZlTGVuZ3RoID0gYWN0aXZlTGVuZ3RoOyB9 Ci0gICAgICAgIHNpemVfdCBhY3RpdmVMZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZUxl bmd0aDsgfTsKLSAgICAgICAgc2l6ZV90KiBhY3RpdmVMZW5ndGhQdHIoKSB7IHJldHVybiAmbV9h Y3RpdmVMZW5ndGg7IH07CisgICAgICAgIHZvaWQgc2V0QWN0aXZlTGVuZ3RoKHNpemVfdCBhY3Rp dmVMZW5ndGgpIHsgdS5tX2FjdGl2ZUxlbmd0aCA9IGFjdGl2ZUxlbmd0aDsgfQorICAgICAgICBz aXplX3QgYWN0aXZlTGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gdS5tX2FjdGl2ZUxlbmd0aDsgfTsK KyAgICAgICAgc2l6ZV90KiBhY3RpdmVMZW5ndGhQdHIoKSB7IHJldHVybiAmdS5tX2FjdGl2ZUxl bmd0aDsgfTsKICAgICAgICAgdm9pZCogZGF0YUJ1ZmZlcigpIHsgcmV0dXJuIG1fYnVmZmVyOyB9 CiAKLSAgICAgICAgc2l6ZV90IG1fYWN0aXZlTGVuZ3RoOworICAgICAgICB1bmlvbiB7CisgICAg ICAgICAgICBzaXplX3QgbV9hY3RpdmVMZW5ndGg7CisgICAgICAgICAgICBkb3VibGUgcGFkOyAv LyBNYWtlIHN1cmUgbV9idWZmZXIgaXMgZG91YmxlIGFsaWduZWQuCisgICAgICAgIH0gdTsKICNp ZiBDUFUoTUlQUykgJiYgKGRlZmluZWQgV1RGX01JUFNfQVJDSF9SRVYgJiYgV1RGX01JUFNfQVJD SF9SRVYgPT0gMikKICAgICAgICAgdm9pZCogbV9idWZmZXJbMF0gX19hdHRyaWJ1dGVfXygoYWxp Z25lZCg4KSkpOwogI2Vsc2UK