177887 2017-10-04 11:20:36 -0700 WebAssembly: address no VM / JS follow-ups 2017-10-19 21:20:31 -0700 1 1 1 Unclassified WebKit WebAssembly WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 177473 InRadar P2 Normal --- 177473 178031 1 jfbastien jfbastien buildbot commit-queue jfbastien keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1356526 0 jfbastien 2017-10-04 11:20:36 -0700 Saam had comments in #177473 which I hadn't addressed. 1356585 1 322703 jfbastien 2017-10-04 12:33:56 -0700 Created attachment 322703 patch (In reply to Saam Barati from comment #30) > Comment on attachment 322103 [details] > > My meta comment here is I think this patch would be a lot easier to review > if you had split it up. Agreed, will do so next time. > > Source/JavaScriptCore/ChangeLog:30 > > + purpose: one to notify of memory pressure, and the other to ask for > > what do you mean by memory pressure here? When we allocate we can get told "I found space, but it's getting tight here". There's a callback for that now, as well as one for "I didn't find any space so sorry", and "I got space, all is good". > > Source/JavaScriptCore/ChangeLog:104 > > + entrypoint. This triples the space allocated per instance's imported > > + function, but there shouldn't be that many imports. This has two upsides: it > > Triples seems like a lot if there are a lot of these. I thought Emscripten > generates a *ton* of imports? No, it's functions that it has a lot of. If you look at Epic Zen Garden it has: Type start=0x0000000e end=0x000024c7 (size=0x000024b9) count: 852 Import start=0x000024cd end=0x000055cf (size=0x00003102) count: 443 Function start=0x000055d5 end=0x00021257 (size=0x0001bc82) count: 111860 Global start=0x0002125d end=0x00021290 (size=0x00000033) count: 10 Export start=0x00021296 end=0x00024fc0 (size=0x00003d2a) count: 498 Elem start=0x00024fc6 end=0x00080dd1 (size=0x0005be0b) count: 1 Code start=0x00080dd7 end=0x01749ab3 (size=0x016c8cdc) count: 111860 Data start=0x01749ab9 end=0x01d3f79c (size=0x005f5ce3) count: 8153 Custom start=0x01d3f7a2 end=0x025ae17e (size=0x0086e9dc) "name" > > Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp:388 > > + // FIXME: Because WasmToWasm call clobbers wasmContextInstance register and does not restore it, we need to restore it in the caller side. > > wasmContextInstance? Isn't that redundant? Ditto elsewhere you do this. Indeed! Right now it's just weird but context is instance, and I wanted to make that obvious. I plan to fix it as a follow-up. > > Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp:1206 > > + // FIXME: when we have trap handlers, we can just let the call fail because Signature::invalidIndex is 0. https://bugs.webkit.org/show_bug.cgi?id=177210 > > How does this have anything to do with signature index? It seems like this > only has to do with the code pointer we load. I'm not sure I understand your question. This bug just says that we don't need to do the zero check if we have trap handlers, we just need to detect that we jumped to whatever is in index entry zero (another zero presumably, or 0xc0defefe) from wasm JIT code and that's enough to know that the index was invalid. > > Source/JavaScriptCore/wasm/WasmMemory.h:99 > > + WTF::Function<void()> m_notifyMemoryPressure; > > + WTF::Function<void()> m_syncTryToReclaimMemory; > > + WTF::Function<void(PageCount, PageCount)> m_growSuccessCallback; > > Do we really want to tie these to a Memory and not a call to grow()? The call to grow doesn't know what the embedder is, but it necessarily knows the memory. That's why I want the memory to know: so I don't have to teach the code we generate. Even better: eventually we could share a memory between two embedders, and chain these callbacks (so you grow, and then both know what the new size is and update embedder-specific info). > > Source/JavaScriptCore/wasm/WasmThunks.cpp:94 > > + typedef void (*Run)(JSWebAssemblyInstance*, uint32_t); > > + Run run = OMGPlan::runForIndex; > > Is this just for documenting the type? Yeah it forces a type check. I had a bug here where I changed the signature, and the reinterpret_cast was none the wiser :-( > >> Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp:344 > >> + [&vm, jsMemory] (Wasm::PageCount oldPageCount, Wasm::PageCount newPageCount) { jsMemory->growSuccessCallback(vm, oldPageCount, newPageCount); }); > > > > That's pretty cool! > > > > The one downside is that it's hard to tell what each callback is for. One way to make this easy to read is to introduce dummy enums for each WTF::Function: > > > > enum NotifyLowMemory { NotifyLowMemoryTag } > > enum SyncTryToReclaim { SyncTryToReclaimTag } > > enum GrowMemory { GrowMemoryTag } > > > > And then this would do: > > > > RefPtr<...> memory = ...(..., > > [&vm] (NotifyLowMemory) { vm.heap.collectAsync(...); }, > > [&vm] (SyncTryToRedlaim) ... > > > > I don't feel strongly about it, but it might be nice. > > Or you could just give all these lambdas names. That's usually what I do in > this situation. The nice thing about Fil's suggestion is the type checker > will catch a bug if you provide the wrong lambda. Yeah I like the extra typecheck it gives. > > Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.h:82 > > + ImportFunctionInfo* importFunctionInfo(size_t importFunctionNum) { return &bitwise_cast<ImportFunctionInfo*>(bitwise_cast<char*>(this) + offsetOfTail())[importFunctionNum]; } > > + static size_t offsetOfTargetInstance(size_t importFunctionNum) { return offsetOfTail() + importFunctionNum * sizeof(ImportFunctionInfo) + OBJECT_OFFSETOF(ImportFunctionInfo, targetInstance); } > > + static size_t offsetOfWasmEntrypoint(size_t importFunctionNum) { return offsetOfTail() + importFunctionNum * sizeof(ImportFunctionInfo) + OBJECT_OFFSETOF(ImportFunctionInfo, wasmEntrypoint); } > > + static size_t offsetOfImportFunction(size_t importFunctionNum) { return offsetOfTail() + importFunctionNum * sizeof(ImportFunctionInfo) + OBJECT_OFFSETOF(ImportFunctionInfo, importFunction); } > > + JSObject* importFunction(unsigned importFunctionNum) { RELEASE_ASSERT(importFunctionNum < m_numImportFunctions); return importFunctionInfo(importFunctionNum)->importFunction.get(); } > > oh boy That'll go away :) > > Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp:124 > > +const Wasm::ModuleInformation& JSWebAssemblyModule::moduleInformation() const > > +{ > > + return m_module->moduleInformation(); > > +} > > + > > +SymbolTable* JSWebAssemblyModule::exportSymbolTable() const > > +{ > > + return m_exportSymbolTable.get(); > > +} > > + > > +Wasm::SignatureIndex JSWebAssemblyModule::signatureIndexFromFunctionIndexSpace(unsigned functionIndexSpace) const > > +{ > > + return m_module->signatureIndexFromFunctionIndexSpace(functionIndexSpace); > > +} > > + > > +WebAssemblyToJSCallee* JSWebAssemblyModule::callee() const > > +{ > > + return m_callee.get(); > > +} > > + > > +JSWebAssemblyCodeBlock* JSWebAssemblyModule::codeBlock(Wasm::MemoryMode mode) > > +{ > > + return m_codeBlocks[static_cast<size_t>(mode)].get(); > > +} > > + > > +Wasm::Module& JSWebAssemblyModule::module() > > +{ > > + return m_module.get(); > > +} > > these all seem like the should be inlined. Are they only called from the cpp > file? The problem is that JSWebAssemblyModule.h is included from WebCore for SerializedScriptValue.cpp, and I want to expose as few other headers as possible. Really I should have exported helpers that WebCore passes opaque pointers to, and hide all the details... 1356616 2 322703 commit-queue 2017-10-04 13:20:46 -0700 Comment on attachment 322703 patch Clearing flags on attachment: 322703 Committed r222873: <http://trac.webkit.org/changeset/222873> 1356617 3 commit-queue 2017-10-04 13:20:48 -0700 All reviewed patches have been landed. Closing bug. 1356618 4 webkit-bug-importer 2017-10-04 13:21:33 -0700 <rdar://problem/34819035> 1357757 5 commit-queue 2017-10-06 15:10:31 -0700 Re-opened since this is blocked by bug 178031 1362547 6 jfbastien 2017-10-19 21:20:31 -0700 Fixed when re-comitting #177473. *** This bug has been marked as a duplicate of bug 177473 *** 322703 2017-10-04 12:33:56 -0700 2017-10-04 13:20:46 -0700 patch 0001-WebAssembly-address-no-VM-JS-follow-ups.patch text/plain 12706 jfbastien RnJvbSA2YTE4ZDA4MzgxZjEwMWVhOTBkNWQ5NzBhZmEyZDA4NTcwMmU3MTAxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKRiBCYXN0aWVuIDxqZmJhc3RpZW5AYXBwbGUuY29tPgpEYXRl OiBXZWQsIDQgT2N0IDIwMTcgMTI6MzM6MzIgLTA3MDAKU3ViamVjdDogW1BBVENIXSBXZWJBc3Nl bWJseTogYWRkcmVzcyBubyBWTSAvIEpTIGZvbGxvdy11cHMKCi0tLQogU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgfCAyNSArKysrKysrKysrKysrKysr KysrCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHAgICB8 IDI5ICsrKysrKysrKysrKy0tLS0tLS0tLS0KIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21Db250ZXh0LmNwcCAgICAgICAgIHwgIDYgKystLS0KIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL1dhc21NZW1vcnlNb2RlLmggICAgICAgIHwgIDQgKy0tCiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9XYXNtVGFibGUuaCAgICAgICAgICAgICB8ICAzIC0tLQogLi4uL3dhc20vanMvSlNX ZWJBc3NlbWJseUluc3RhbmNlLmNwcCAgICAgICAgICAgICAgfCAgMiArLQogLi4uL0phdmFTY3Jp cHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseVRhYmxlLmNwcCAgfCAgNCArLS0KIDcgZmlsZXMg Y2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cKaW5kZXggMzRkN2MzMi4uYjk3OGQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjggQEAKKzIwMTctMTAtMDQgIEpGIEJhc3RpZW4gIDxqZmJhc3RpZW5AYXBw bGUuY29tPgorCisgICAgICAgIFdlYkFzc2VtYmx5OiBhZGRyZXNzIG5vIFZNIC8gSlMgZm9sbG93 LXVwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3 ODg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxs IG1pbm9yIGZpeGVzLCBubyBmdW5jdGlvbmFsIGNoYW5nZXMuCisKKyAgICAgICAgKiB3YXNtL1dh c21CM0lSR2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6V2FzbTo6QjNJUkdlbmVyYXRvcjo6 QjNJUkdlbmVyYXRvcik6CisgICAgICAgIChKU0M6Oldhc206OkIzSVJHZW5lcmF0b3I6OnJlc3Rv cmVXZWJBc3NlbWJseUdsb2JhbFN0YXRlKToKKyAgICAgICAgKEpTQzo6V2FzbTo6QjNJUkdlbmVy YXRvcjo6YWRkQ3VycmVudE1lbW9yeSk6CisgICAgICAgIChKU0M6Oldhc206OkIzSVJHZW5lcmF0 b3I6OmFkZENhbGwpOgorICAgICAgICAoSlNDOjpXYXNtOjpCM0lSR2VuZXJhdG9yOjphZGRDYWxs SW5kaXJlY3QpOgorICAgICAgICAqIHdhc20vV2FzbUNvbnRleHQuY3BwOgorICAgICAgICAoSlND OjpXYXNtOjpDb250ZXh0OjpzdG9yZSk6CisgICAgICAgICogd2FzbS9XYXNtTWVtb3J5TW9kZS5o OgorICAgICAgICAqIHdhc20vV2FzbVRhYmxlLmg6CisgICAgICAgICogd2FzbS9qcy9KU1dlYkFz c2VtYmx5SW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpKU1dlYkFzc2VtYmx5SW5zdGFuY2U6 OkpTV2ViQXNzZW1ibHlJbnN0YW5jZSk6CisgICAgICAgICogd2FzbS9qcy9KU1dlYkFzc2VtYmx5 VGFibGUuY3BwOgorICAgICAgICAoSlNDOjpKU1dlYkFzc2VtYmx5VGFibGU6OkpTV2ViQXNzZW1i bHlUYWJsZSk6CisgICAgICAgIChKU0M6OkpTV2ViQXNzZW1ibHlUYWJsZTo6Z3Jvdyk6CisKIDIw MTctMTAtMDQgIENhcmxvcyBBbGJlcnRvIExvcGV6IFBlcmV6ICA8Y2xvcGV6QGlnYWxpYS5jb20+ CiAKICAgICAgICAgR2VuZXJhdGUgYSBjb21waWxlIGVycm9yIGlmIHJlbGVhc2UgaXMgYnVpbHQg d2l0aG91dCBjb21waWxlciBvcHRpbWl6YXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHAKaW5kZXggYWY2Y2ZlOC4uNDIxNjRkNCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUIzSVJHZW5lcmF0b3IuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21CM0lSR2VuZXJhdG9yLmNwcApA QCAtMzY5LDcgKzM2OSwxMCBAQCBCM0lSR2VuZXJhdG9yOjpCM0lSR2VuZXJhdG9yKGNvbnN0IE1v ZHVsZUluZm9ybWF0aW9uJiBpbmZvLCBQcm9jZWR1cmUmIHByb2NlZHVyZQogICAgICAgICBjYXNl IE1lbW9yeU1vZGU6OkJvdW5kc0NoZWNraW5nOgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IGNhc2UgTWVtb3J5TW9kZTo6U2lnbmFsaW5nOgotICAgICAgICAvLyBNb3N0IG1lbW9yeSBhY2Nl c3NlcyBpbiBzaWduYWxpbmcgbW9kZSBkb24ndCBkbyBhbiBleHBsaWNpdCBleGNlcHRpb24gY2hl Y2sgYmVjYXVzZSB0aGV5IGNhbiByZWx5IG9uIGZhdWx0IGhhbmRsaW5nIHRvIGRldGVjdCBvdXQt b2YtYm91bmRzIGFjY2Vzc2VzLiBGYXVsdFNpZ25hbEhhbmRsZXIgbm9uZXRoZWxlc3MgbmVlZHMg dGhlIHRodW5rIHRvIGV4aXN0IHNvIHRoYXQgaXQgY2FuIGp1bXAgdG8gdGhhdCB0aHVuay4KKyAg ICAgICAgICAgIC8vIE1vc3QgbWVtb3J5IGFjY2Vzc2VzIGluIHNpZ25hbGluZyBtb2RlIGRvbid0 IGRvIGFuIGV4cGxpY2l0CisgICAgICAgICAgICAvLyBleGNlcHRpb24gY2hlY2sgYmVjYXVzZSB0 aGV5IGNhbiByZWx5IG9uIGZhdWx0IGhhbmRsaW5nIHRvIGRldGVjdAorICAgICAgICAgICAgLy8g b3V0LW9mLWJvdW5kcyBhY2Nlc3Nlcy4gRmF1bHRTaWduYWxIYW5kbGVyIG5vbmV0aGVsZXNzIG5l ZWRzIHRoZQorICAgICAgICAgICAgLy8gdGh1bmsgdG8gZXhpc3Qgc28gdGhhdCBpdCBjYW4ganVt cCB0byB0aGF0IHRodW5rLgogICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFUaHVua3M6OnNpbmds ZXRvbigpLnN0dWIodGhyb3dFeGNlcHRpb25Gcm9tV2FzbVRodW5rR2VuZXJhdG9yKSkpCiAgICAg ICAgICAgICAgICAgQ1JBU0goKTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtNDczLDggKzQ3Niw4 IEBAIHZvaWQgQjNJUkdlbmVyYXRvcjo6cmVzdG9yZVdlYkFzc2VtYmx5R2xvYmFsU3RhdGUoY29u c3QgTWVtb3J5SW5mb3JtYXRpb24mIG1lbW9yCiAgICAgICAgICAgICBjb25zdCBhdXRvJiBzaXpl UmVncyA9IHBpbm5lZFJlZ3MtPnNpemVSZWdpc3RlcnM7CiAgICAgICAgICAgICBBU1NFUlQoc2l6 ZVJlZ3Muc2l6ZSgpID49IDEpOwogICAgICAgICAgICAgQVNTRVJUKCFzaXplUmVnc1swXS5zaXpl T2Zmc2V0KTsgLy8gVGhlIGZvbGxvd2luZyBjb2RlIGFzc3VtZXMgd2Ugc3RhcnQgYXQgMCwgYW5k IGNhbGN1bGF0ZXMgc3Vic2VxdWVudCBzaXplIHJlZ2lzdGVycyByZWxhdGl2ZSB0byAwLgotICAg ICAgICAgICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGJhc2VNZW1vcnksIFdh c206Ok1lbW9yeTo6b2Zmc2V0T2ZTaXplKCkpLCBzaXplUmVnc1swXS5zaXplUmVnaXN0ZXIpOwot ICAgICAgICAgICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGJhc2VNZW1vcnks IFdhc206Ok1lbW9yeTo6b2Zmc2V0T2ZNZW1vcnkoKSksIGJhc2VNZW1vcnkpOworICAgICAgICAg ICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGJhc2VNZW1vcnksIE1lbW9yeTo6 b2Zmc2V0T2ZTaXplKCkpLCBzaXplUmVnc1swXS5zaXplUmVnaXN0ZXIpOworICAgICAgICAgICAg aml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGJhc2VNZW1vcnksIE1lbW9yeTo6b2Zm c2V0T2ZNZW1vcnkoKSksIGJhc2VNZW1vcnkpOwogICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBp ID0gMTsgaSA8IHNpemVSZWdzLnNpemUoKTsgKytpKQogICAgICAgICAgICAgICAgIGppdC5hZGQ2 NChDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW0zMigtc2l6ZVJlZ3NbaV0uc2l6ZU9mZnNldCksIHNp emVSZWdzWzBdLnNpemVSZWdpc3Rlciwgc2l6ZVJlZ3NbaV0uc2l6ZVJlZ2lzdGVyKTsKICAgICAg ICAgfSk7CkBAIC01ODMsOCArNTg2LDggQEAgYXV0byBCM0lSR2VuZXJhdG9yOjphZGRDdXJyZW50 TWVtb3J5KEV4cHJlc3Npb25UeXBlJiByZXN1bHQpIC0+IFBhcnRpYWxSZXN1bHQKIHsKICAgICBW YWx1ZSogbWVtb3J5T2JqZWN0ID0gbV9jdXJyZW50QmxvY2stPmFwcGVuZE5ldzxNZW1vcnlWYWx1 ZT4obV9wcm9jLCBMb2FkLCBwb2ludGVyVHlwZSgpLCBvcmlnaW4oKSwgaW5zdGFuY2VWYWx1ZSgp LCBzYWZlQ2FzdDxpbnQzMl90PihKU1dlYkFzc2VtYmx5SW5zdGFuY2U6Om9mZnNldE9mV2FzbU1l bW9yeSgpKSk7CiAKLSAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihkZWNsdHlwZShzdGF0aWNfY2Fz dDxXYXNtOjpNZW1vcnkqPihudWxscHRyKS0+c2l6ZSgpKSkgPT0gc2l6ZW9mKHVpbnQ2NF90KSwg ImNvZGVnZW4gcmVsaWVzIG9uIHRoaXMgc2l6ZSIpOwotICAgIFZhbHVlKiBzaXplID0gbV9jdXJy ZW50QmxvY2stPmFwcGVuZE5ldzxNZW1vcnlWYWx1ZT4obV9wcm9jLCBMb2FkLCBJbnQ2NCwgb3Jp Z2luKCksIG1lbW9yeU9iamVjdCwgc2FmZUNhc3Q8aW50MzJfdD4oV2FzbTo6TWVtb3J5OjpvZmZz ZXRPZlNpemUoKSkpOworICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKGRlY2x0eXBlKHN0YXRpY19j YXN0PE1lbW9yeSo+KG51bGxwdHIpLT5zaXplKCkpKSA9PSBzaXplb2YodWludDY0X3QpLCAiY29k ZWdlbiByZWxpZXMgb24gdGhpcyBzaXplIik7CisgICAgVmFsdWUqIHNpemUgPSBtX2N1cnJlbnRC bG9jay0+YXBwZW5kTmV3PE1lbW9yeVZhbHVlPihtX3Byb2MsIExvYWQsIEludDY0LCBvcmlnaW4o KSwgbWVtb3J5T2JqZWN0LCBzYWZlQ2FzdDxpbnQzMl90PihNZW1vcnk6Om9mZnNldE9mU2l6ZSgp KSk7CiAgICAgCiAgICAgY29uc3RleHByIHVpbnQzMl90IHNoaWZ0VmFsdWUgPSAxNjsKICAgICBz dGF0aWNfYXNzZXJ0KFBhZ2VDb3VudDo6cGFnZVNpemUgPT0gMXVsbCA8PCBzaGlmdFZhbHVlLCAi VGhpcyBtdXN0IGhvbGQgZm9yIHRoZSBjb2RlIGJlbG93IHRvIGJlIGNvcnJlY3QuIik7CkBAIC0x MTA3LDcgKzExMTAsNyBAQCBhdXRvIEIzSVJHZW5lcmF0b3I6OmFkZENhbGwodWludDMyX3QgZnVu Y3Rpb25JbmRleCwgY29uc3QgU2lnbmF0dXJlJiBzaWduYXR1cmUsCiAKICAgICAgICAgLy8gRklY TUU6IExldCdzIHJlbW92ZSB0aGlzIGluZGlyZWN0aW9uIGJ5IGNyZWF0aW5nIGEgUElDIGZyaWVu ZGx5IElDCiAgICAgICAgIC8vIGZvciBjYWxscyBvdXQgdG8gSlMuIFRoaXMgc2hvdWxkbid0IGJl IHRoYXQgaGFyZCB0byBkby4gV2UgY291bGQgcHJvYmFibHkKLSAgICAgICAgLy8gaW1wbGVtZW50 IHRoZSBJQyB0byBiZSBvdmVyIFdhc206OkNvbnRleHQqLgorICAgICAgICAvLyBpbXBsZW1lbnQg dGhlIElDIHRvIGJlIG92ZXIgQ29udGV4dCouCiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAzNzUKICAgICAgICAgVmFsdWUqIGNvZGVCbG9jayA9 IGlzRW1iZWRkZXJCbG9jay0+YXBwZW5kTmV3PE1lbW9yeVZhbHVlPihtX3Byb2MsCiAgICAgICAg ICAgICBMb2FkLCBwb2ludGVyVHlwZSgpLCBvcmlnaW4oKSwgaW5zdGFuY2VWYWx1ZSgpLCBzYWZl Q2FzdDxpbnQzMl90PihKU1dlYkFzc2VtYmx5SW5zdGFuY2U6Om9mZnNldE9mV2FzbUNvZGVCbG9j aygpKSk7CkBAIC0xMTc5LDExICsxMTgyLDExIEBAIGF1dG8gQjNJUkdlbmVyYXRvcjo6YWRkQ2Fs bEluZGlyZWN0KGNvbnN0IFNpZ25hdHVyZSYgc2lnbmF0dXJlLCBWZWN0b3I8RXhwcmVzc2lvCiAg ICAgICAgIEV4cHJlc3Npb25UeXBlIHRhYmxlID0gbV9jdXJyZW50QmxvY2stPmFwcGVuZE5ldzxN ZW1vcnlWYWx1ZT4obV9wcm9jLCBMb2FkLCBwb2ludGVyVHlwZSgpLCBvcmlnaW4oKSwKICAgICAg ICAgICAgIGluc3RhbmNlVmFsdWUoKSwgc2FmZUNhc3Q8aW50MzJfdD4oSlNXZWJBc3NlbWJseUlu c3RhbmNlOjpvZmZzZXRPZldhc21UYWJsZSgpKSk7CiAgICAgICAgIGNhbGxhYmxlRnVuY3Rpb25C dWZmZXIgPSBtX2N1cnJlbnRCbG9jay0+YXBwZW5kTmV3PE1lbW9yeVZhbHVlPihtX3Byb2MsIExv YWQsIHBvaW50ZXJUeXBlKCksIG9yaWdpbigpLAotICAgICAgICAgICAgdGFibGUsIHNhZmVDYXN0 PGludDMyX3Q+KFdhc206OlRhYmxlOjpvZmZzZXRPZkZ1bmN0aW9ucygpKSk7CisgICAgICAgICAg ICB0YWJsZSwgc2FmZUNhc3Q8aW50MzJfdD4oVGFibGU6Om9mZnNldE9mRnVuY3Rpb25zKCkpKTsK ICAgICAgICAgaW5zdGFuY2VzQnVmZmVyID0gbV9jdXJyZW50QmxvY2stPmFwcGVuZE5ldzxNZW1v cnlWYWx1ZT4obV9wcm9jLCBMb2FkLCBwb2ludGVyVHlwZSgpLCBvcmlnaW4oKSwKLSAgICAgICAg ICAgIHRhYmxlLCBzYWZlQ2FzdDxpbnQzMl90PihXYXNtOjpUYWJsZTo6b2Zmc2V0T2ZJbnN0YW5j ZXMoKSkpOworICAgICAgICAgICAgdGFibGUsIHNhZmVDYXN0PGludDMyX3Q+KFRhYmxlOjpvZmZz ZXRPZkluc3RhbmNlcygpKSk7CiAgICAgICAgIGNhbGxhYmxlRnVuY3Rpb25CdWZmZXJTaXplID0g bV9jdXJyZW50QmxvY2stPmFwcGVuZE5ldzxNZW1vcnlWYWx1ZT4obV9wcm9jLCBMb2FkLCBJbnQz Miwgb3JpZ2luKCksCi0gICAgICAgICAgICB0YWJsZSwgc2FmZUNhc3Q8aW50MzJfdD4oV2FzbTo6 VGFibGU6Om9mZnNldE9mU2l6ZSgpKSk7CisgICAgICAgICAgICB0YWJsZSwgc2FmZUNhc3Q8aW50 MzJfdD4oVGFibGU6Om9mZnNldE9mU2l6ZSgpKSk7CiAgICAgfQogCiAgICAgLy8gQ2hlY2sgdGhl IGluZGV4IHdlIGFyZSBsb29raW5nIGZvciBpcyB2YWxpZC4KQEAgLTEyMzIsNyArMTIzNSw3IEBA IGF1dG8gQjNJUkdlbmVyYXRvcjo6YWRkQ2FsbEluZGlyZWN0KGNvbnN0IFNpZ25hdHVyZSYgc2ln bmF0dXJlLCBWZWN0b3I8RXhwcmVzc2lvCiAgICAgewogICAgICAgICBWYWx1ZSogb2Zmc2V0ID0g bV9jdXJyZW50QmxvY2stPmFwcGVuZE5ldzxWYWx1ZT4obV9wcm9jLCBNdWwsIG9yaWdpbigpLAog ICAgICAgICAgICAgbV9jdXJyZW50QmxvY2stPmFwcGVuZE5ldzxWYWx1ZT4obV9wcm9jLCBaRXh0 MzIsIG9yaWdpbigpLCBjYWxsZWVJbmRleCksCi0gICAgICAgICAgICBjb25zdGFudChwb2ludGVy VHlwZSgpLCBzaXplb2YoV2FzbTo6SW5zdGFuY2UqKSkpOworICAgICAgICAgICAgY29uc3RhbnQo cG9pbnRlclR5cGUoKSwgc2l6ZW9mKEluc3RhbmNlKikpKTsKICAgICAgICAgVmFsdWUqIG5ld0Nv bnRleHRJbnN0YW5jZSA9IG1fY3VycmVudEJsb2NrLT5hcHBlbmROZXc8TWVtb3J5VmFsdWU+KG1f cHJvYywgTG9hZCwgcG9pbnRlclR5cGUoKSwgb3JpZ2luKCksCiAgICAgICAgICAgICBtX2N1cnJl bnRCbG9jay0+YXBwZW5kTmV3PFZhbHVlPihtX3Byb2MsIEFkZCwgb3JpZ2luKCksIGluc3RhbmNl c0J1ZmZlciwgb2Zmc2V0KSk7CiAKQEAgLTEyNjMsMTMgKzEyNjYsMTMgQEAgYXV0byBCM0lSR2Vu ZXJhdG9yOjphZGRDYWxsSW5kaXJlY3QoY29uc3QgU2lnbmF0dXJlJiBzaWduYXR1cmUsIFZlY3Rv cjxFeHByZXNzaW8KICAgICAgICAgICAgIGppdC5sb2FkUHRyKENDYWxsSGVscGVyczo6QWRkcmVz cyhvbGRDb250ZXh0SW5zdGFuY2UsIEpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6b2Zmc2V0T2ZDYWNo ZWRTdGFja0xpbWl0KCkpLCBiYXNlTWVtb3J5KTsKICAgICAgICAgICAgIGppdC5zdG9yZVB0cihi YXNlTWVtb3J5LCBDQ2FsbEhlbHBlcnM6OkFkZHJlc3MobmV3Q29udGV4dEluc3RhbmNlLCBKU1dl YkFzc2VtYmx5SW5zdGFuY2U6Om9mZnNldE9mQ2FjaGVkU3RhY2tMaW1pdCgpKSk7CiAgICAgICAg ICAgICBqaXQuc3RvcmVXYXNtQ29udGV4dEluc3RhbmNlKG5ld0NvbnRleHRJbnN0YW5jZSk7Ci0g ICAgICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3MobmV3Q29udGV4dElu c3RhbmNlLCBKU1dlYkFzc2VtYmx5SW5zdGFuY2U6Om9mZnNldE9mV2FzbU1lbW9yeSgpKSwgYmFz ZU1lbW9yeSk7IC8vIFdhc206Ok1lbW9yeSouCisgICAgICAgICAgICBqaXQubG9hZFB0cihDQ2Fs bEhlbHBlcnM6OkFkZHJlc3MobmV3Q29udGV4dEluc3RhbmNlLCBKU1dlYkFzc2VtYmx5SW5zdGFu Y2U6Om9mZnNldE9mV2FzbU1lbW9yeSgpKSwgYmFzZU1lbW9yeSk7IC8vIE1lbW9yeSouCiAgICAg ICAgICAgICBBU1NFUlQoc2l6ZVJlZ3Muc2l6ZSgpID09IDEpOwogICAgICAgICAgICAgQVNTRVJU KHNpemVSZWdzWzBdLnNpemVSZWdpc3RlciAhPSBiYXNlTWVtb3J5KTsKICAgICAgICAgICAgIEFT U0VSVChzaXplUmVnc1swXS5zaXplUmVnaXN0ZXIgIT0gbmV3Q29udGV4dEluc3RhbmNlKTsKICAg ICAgICAgICAgIEFTU0VSVCghc2l6ZVJlZ3NbMF0uc2l6ZU9mZnNldCk7Ci0gICAgICAgICAgICBq aXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3MoYmFzZU1lbW9yeSwgV2FzbTo6TWVtb3J5 OjpvZmZzZXRPZlNpemUoKSksIHNpemVSZWdzWzBdLnNpemVSZWdpc3Rlcik7IC8vIE1lbW9yeSBz aXplLgotICAgICAgICAgICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKGJhc2VN ZW1vcnksIFdhc206Ok1lbW9yeTo6b2Zmc2V0T2ZNZW1vcnkoKSksIGJhc2VNZW1vcnkpOyAvLyBX YXNtOjpNZW1vcnk6OnZvaWQqLgorICAgICAgICAgICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJz OjpBZGRyZXNzKGJhc2VNZW1vcnksIE1lbW9yeTo6b2Zmc2V0T2ZTaXplKCkpLCBzaXplUmVnc1sw XS5zaXplUmVnaXN0ZXIpOyAvLyBNZW1vcnkgc2l6ZS4KKyAgICAgICAgICAgIGppdC5sb2FkUHRy KENDYWxsSGVscGVyczo6QWRkcmVzcyhiYXNlTWVtb3J5LCBNZW1vcnk6Om9mZnNldE9mTWVtb3J5 KCkpLCBiYXNlTWVtb3J5KTsgLy8gTWVtb3J5Ojp2b2lkKi4KICAgICAgICAgfSk7CiAgICAgICAg IGRvQ29udGV4dFN3aXRjaC0+YXBwZW5kTmV3Q29udHJvbFZhbHVlKG1fcHJvYywgSnVtcCwgb3Jp Z2luKCksIGNvbnRpbnVhdGlvbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL1dhc21Db250ZXh0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21D b250ZXh0LmNwcAppbmRleCBlMDU5ZmMxLi5jZjM0ODUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9XYXNtQ29udGV4dC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vV2FzbUNvbnRleHQuY3BwCkBAIC01NCwxMyArNTQsMTMgQEAgSlNXZWJBc3NlbWJs eUluc3RhbmNlKiBDb250ZXh0Ojpsb2FkKCkgY29uc3QKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9 CiAKLXZvaWQgQ29udGV4dDo6c3RvcmUoSlNXZWJBc3NlbWJseUluc3RhbmNlKiBpLCB2b2lkKiBz b2Z0U3RhY2tMaW1pdCkKK3ZvaWQgQ29udGV4dDo6c3RvcmUoSlNXZWJBc3NlbWJseUluc3RhbmNl KiBpbnN0LCB2b2lkKiBzb2Z0U3RhY2tMaW1pdCkKIHsKICNpZiBFTkFCTEUoRkFTVF9UTFNfSklU KQogICAgIGlmICh1c2VGYXN0VExTKCkpCi0gICAgICAgIF9wdGhyZWFkX3NldHNwZWNpZmljX2Rp cmVjdChXVEZfV0FTTV9DT05URVhUX0tFWSwgYml0d2lzZV9jYXN0PHZvaWQqPihpKSk7CisgICAg ICAgIF9wdGhyZWFkX3NldHNwZWNpZmljX2RpcmVjdChXVEZfV0FTTV9DT05URVhUX0tFWSwgYml0 d2lzZV9jYXN0PHZvaWQqPihpbnN0KSk7CiAjZW5kaWYKLSAgICBpbnN0YW5jZSA9IGk7CisgICAg aW5zdGFuY2UgPSBpbnN0OwogICAgIGlmIChpbnN0YW5jZSkKICAgICAgICAgaW5zdGFuY2UtPnNl dENhY2hlZFN0YWNrTGltaXQoc29mdFN0YWNrTGltaXQpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1lbW9yeU1vZGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS93YXNtL1dhc21NZW1vcnlNb2RlLmgKaW5kZXggMTRmYzg5Ni4uMGEyODU1YSAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1lbW9yeU1vZGUuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTWVtb3J5TW9kZS5oCkBAIC0yOSw5ICsyOSw3 IEBACiAKICNpbmNsdWRlICJKU0V4cG9ydE1hY3Jvcy5oIgogCi1uYW1lc3BhY2UgSlNDIHsKLQot bmFtZXNwYWNlIFdhc20geworbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBXYXNtIHsKIAogLy8g RklYTUU6IFdlIHNob3VsZCBzdXBwb3J0IG90aGVyIG1vZGVzLiBzZWU6IGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjI2OTMKIGVudW0gY2xhc3MgTWVtb3J5TW9kZSA6 IHVpbnQ4X3QgewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbVRh YmxlLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtVGFibGUuaAppbmRleCBiOTA4 ZWM4Li5hOTJhOWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNt VGFibGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtVGFibGUuaApAQCAt NDIsOSArNDIsNiBAQCBuYW1lc3BhY2UgV2FzbSB7CiAKIGNsYXNzIFRhYmxlIDogcHVibGljIFRo cmVhZFNhZmVSZWZDb3VudGVkPFRhYmxlPiB7CiBwdWJsaWM6Ci0gICAgZW51bSBjbGFzcyBDcmVh dGVGYWlsIHsKLSAgICAgICAgSW52YWxpZFNpemUsCi0gICAgfTsKICAgICBzdGF0aWMgUmVmUHRy PFRhYmxlPiBjcmVhdGUodWludDMyX3QgaW5pdGlhbCwgc3RkOjpvcHRpb25hbDx1aW50MzJfdD4g bWF4aW11bSk7CiAKICAgICBKU19FWFBPUlRfUFJJVkFURSB+VGFibGUoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5SW5zdGFuY2UuY3Bw CmluZGV4IDcyYWEwYTAuLmJiMmI1ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNwcApAQCAtNTksNyArNTksNyBA QCBKU1dlYkFzc2VtYmx5SW5zdGFuY2U6OkpTV2ViQXNzZW1ibHlJbnN0YW5jZShWTSYgdm0sIFN0 cnVjdHVyZSogc3RydWN0dXJlLCB1bnNpZwogICAgICwgbV9udW1JbXBvcnRGdW5jdGlvbnMobnVt SW1wb3J0RnVuY3Rpb25zKQogewogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX251bUlt cG9ydEZ1bmN0aW9uczsgKytpKQotICAgICAgICBuZXcgKGltcG9ydEZ1bmN0aW9uSW5mbyhpKSkg SW1wb3J0RnVuY3Rpb25JbmZvKCk7CisgICAgICAgIGRlZmF1bHRfY29uc3RydWN0X2F0KGltcG9y dEZ1bmN0aW9uSW5mbyhpKSk7CiB9CiAKIHZvaWQgSlNXZWJBc3NlbWJseUluc3RhbmNlOjpmaW5p c2hDcmVhdGlvbihWTSYgdm0sIEpTV2ViQXNzZW1ibHlNb2R1bGUqIG1vZHVsZSwgSlNNb2R1bGVO YW1lc3BhY2VPYmplY3QqIG1vZHVsZU5hbWVzcGFjZU9iamVjdCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlUYWJsZS5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5VGFibGUuY3BwCmluZGV4IGFkYWE3 NDkuLjk5YmUwNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pT V2ViQXNzZW1ibHlUYWJsZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMv SlNXZWJBc3NlbWJseVRhYmxlLmNwcApAQCAtNjIsNyArNjIsNyBAQCBKU1dlYkFzc2VtYmx5VGFi bGU6OkpTV2ViQXNzZW1ibHlUYWJsZShWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlLCBSZWY8 V2FzbTo6VAogICAgIC8vIEJ1dCBmb3Igbm93LCB3ZSdyZSBub3QgZG9pbmcgdGhhdC4KICAgICBt X2pzRnVuY3Rpb25zID0gTWFsbG9jUHRyPFdyaXRlQmFycmllcjxKU09iamVjdD4+OjptYWxsb2Mo c2l6ZW9mKFdyaXRlQmFycmllcjxKU09iamVjdD4pICogc3RhdGljX2Nhc3Q8c2l6ZV90PihzaXpl KCkpKTsKICAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgc2l6ZSgpOyArK2kpCi0gICAgICAg IG5ldyAoJm1fanNGdW5jdGlvbnMuZ2V0KClbaV0pIFdyaXRlQmFycmllcjxKU09iamVjdD4oKTsK KyAgICAgICAgZGVmYXVsdF9jb25zdHJ1Y3RfYXQoJm1fanNGdW5jdGlvbnMuZ2V0KClbaV0pOwog fQogCiB2b2lkIEpTV2ViQXNzZW1ibHlUYWJsZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtKQpAQCAt MTAyLDcgKzEwMiw3IEBAIGJvb2wgSlNXZWJBc3NlbWJseVRhYmxlOjpncm93KHVpbnQzMl90IGRl bHRhKQogICAgIG1fanNGdW5jdGlvbnMucmVhbGxvYyhzaXplb2YoV3JpdGVCYXJyaWVyPEpTT2Jq ZWN0PikgKiBuZXdTaXplKTsKIAogICAgIGZvciAoc2l6ZV90IGkgPSBvbGRTaXplOyBpIDwgbmV3 U2l6ZTsgKytpKQotICAgICAgICBuZXcgKCZtX2pzRnVuY3Rpb25zLmdldCgpW2ldKSBXcml0ZUJh cnJpZXI8SlNPYmplY3Q+KCk7CisgICAgICAgIGRlZmF1bHRfY29uc3RydWN0X2F0KCZtX2pzRnVu Y3Rpb25zLmdldCgpW2ldKTsKIAogICAgIHJldHVybiB0cnVlOwogfQotLSAKMi45LjMKCg==