25467 2009-04-29 13:40:17 -0700 JavaScript debugger should use function.displayName as the function's name in the call stack 2009-05-15 14:59:27 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 1 aroben aroben timothy tolmasky oldest_to_newest 119330 0 aroben 2009-04-29 13:40:17 -0700 r42478 added a displayName property to functions, which, if it exists, is used in the JavaScript profiler as the function's name. This is especially useful for anonymous functions, which don't otherwise have an intelligible name to be displayed. We should use the displayName property when deciding what name to show for a function in the JavaScript debugger's call stack, too. 119331 1 aroben 2009-04-29 13:40:54 -0700 <rdar://problem/6840007> 119922 2 30010 tolmasky 2009-05-04 22:20:44 -0700 Created attachment 30010 Adds check of displayName Basically did the same thing we do in profilenodes and checked the displayName of a function as well. 119923 3 30010 aroben 2009-05-04 22:34:07 -0700 Comment on attachment 30010 Adds check of displayName > Index: JavaScriptCore/ChangeLog > =================================================================== > --- JavaScriptCore/ChangeLog (revision 43204) > +++ JavaScriptCore/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2009-05-04 Francisco Tolmasky <francisco@280north.com> > + > + BUG 25467: JavaScript debugger should use function.displayName as the function's name in the call stack > + <https://bugs.webkit.org/show_bug.cgi?id=25467> > + > + Reviewed by NOBODY (OOPS!). > + > + * JavaScriptCore.exp: Added calculatedFunctionName > + * debugger/DebuggerCallFrame.cpp: Added calculatedFunctionName to match existing one in ProfileNode. > + (JSC::DebuggerCallFrame::calculatedFunctionName): > + * debugger/DebuggerCallFrame.h: Added calculatedFunctionName to match existing one in ProfileNode. > + > 2009-05-03 Steve Falkenburg <sfalken@apple.com> > > Windows build fix. > Index: JavaScriptCore/JavaScriptCore.exp > =================================================================== > --- JavaScriptCore/JavaScriptCore.exp (revision 43202) > +++ JavaScriptCore/JavaScriptCore.exp (working copy) > @@ -328,6 +328,7 @@ __ZNK3JSC16JSVariableObject16isVariableO > __ZNK3JSC16JSVariableObject21getPropertyAttributesEPNS_9ExecStateERKNS_10IdentifierERj > __ZNK3JSC17DebuggerCallFrame10thisObjectEv > __ZNK3JSC17DebuggerCallFrame12functionNameEv > +__ZNK3JSC17DebuggerCallFrame22calculatedFunctionNameEv > __ZNK3JSC17DebuggerCallFrame4typeEv > __ZNK3JSC17DebuggerCallFrame8evaluateERKNS_7UStringERNS_7JSValueE > __ZNK3JSC4Heap10statisticsEv > Index: JavaScriptCore/debugger/DebuggerCallFrame.cpp > =================================================================== > --- JavaScriptCore/debugger/DebuggerCallFrame.cpp (revision 43202) > +++ JavaScriptCore/debugger/DebuggerCallFrame.cpp (working copy) > @@ -46,6 +46,17 @@ const UString* DebuggerCallFrame::functi > return 0; > return &function->name(&m_callFrame->globalData()); > } > + > +const UString DebuggerCallFrame::calculatedFunctionName() const The "const" on the return type isn't doing you any good, since callers will just be copying the string anyway. > +static const char* AnonymousFunction = "(anonymous function)"; We use a lowercase first letter for variable names, even global variables and constants. > @@ -64,11 +66,11 @@ String JavaScriptCallFrame::functionName > { > ASSERT(m_isValid); > if (!m_isValid) > - return String(); > - const UString* functionName = m_debuggerCallFrame.functionName(); > - if (!functionName) > - return String(); > - return *functionName; > + return AnonymousFunction; > + const UString functionName = m_debuggerCallFrame.calculatedFunctionName(); > + if (functionName.isEmpty()) > + return AnonymousFunction; > + return functionName; > } > > DebuggerCallFrame::Type JavaScriptCallFrame::type() const > Index: WebCore/inspector/front-end/CallStackSidebarPane.js > =================================================================== > --- WebCore/inspector/front-end/CallStackSidebarPane.js (revision 43202) > +++ WebCore/inspector/front-end/CallStackSidebarPane.js (working copy) > @@ -51,7 +51,7 @@ WebInspector.CallStackSidebarPane.protot > do { > switch (callFrame.type) { > case "function": > - title = callFrame.functionName || WebInspector.UIString("(anonymous function)"); > + title = callFrame.functionName; Why are you moving the "(anonymous function)" string out of JavaScript? This change has made that string unlocalizable, which seems like a step in the wrong direction. If we really do want it to be unlocalizable, we should remove it from localizedStrings.js, too. Thanks for working on this! r- until we figure out the localized string issue. 119924 4 30011 tolmasky 2009-05-04 22:44:49 -0700 Created attachment 30011 Removed const, put anonymous string back in js 119925 5 30011 ggaren 2009-05-04 23:03:22 -0700 Comment on attachment 30011 Removed const, put anonymous string back in js > +UString DebuggerCallFrame::calculatedFunctionName() const > +{ > + if (!m_callFrame->codeBlock()) > + return 0; > + > + JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee()); > + if (!function) > + return 0; > + return function->calculatedDisplayName(&m_callFrame->globalData()); > +} The best way to make a null string is "UString()", rather than "0". > + UString functionName = m_debuggerCallFrame.calculatedFunctionName(); > + if (functionName.isEmpty()) > return String(); > - return *functionName; > + return functionName; > } Just plain "return m_debuggerCallFrame.calculatedFunctionName();" should work. 119926 6 30011 aroben 2009-05-04 23:04:49 -0700 Comment on attachment 30011 Removed const, put anonymous string back in js This patch as-is will break the Windows build. We'll need to modify JavaScriptCore[_debug].def to fix it. r=me 121454 7 eric 2009-05-15 00:40:32 -0700 Assigning to aroben, since I can't land this w/o breaking the windows build. 121497 8 timothy 2009-05-15 06:21:43 -0700 Adam, can you land this today? 121544 9 aroben 2009-05-15 11:13:41 -0700 Landed as r43774 121587 10 ddkilzer 2009-05-15 14:59:27 -0700 http://trac.webkit.org/changeset/43774 No changes to inspector/front-end/CallStackSidebarPane.js were included in the last patch: + * inspector/front-end/CallStackSidebarPane.js: Remove "|| anonymous function" since it is handled internally just like in profiles + (WebInspector.CallStackSidebarPane.prototype.update): I guess this part of the ChangeLog entry should have been removed. 30010 2009-05-04 22:20:44 -0700 2009-05-04 22:44:49 -0700 Adds check of displayName debugger.patch text/plain 5797 tolmasky SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQzMjA0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMDQgIEZyYW5jaXNj byBUb2xtYXNreSAgPGZyYW5jaXNjb0AyODBub3J0aC5jb20+CisKKyAgICAgICAgQlVHIDI1NDY3 OiBKYXZhU2NyaXB0IGRlYnVnZ2VyIHNob3VsZCB1c2UgZnVuY3Rpb24uZGlzcGxheU5hbWUgYXMg dGhlIGZ1bmN0aW9uJ3MgbmFtZSBpbiB0aGUgY2FsbCBzdGFjaworICAgICAgICA8aHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDY3PgorICAgICAgICAKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5l eHA6IEFkZGVkIGNhbGN1bGF0ZWRGdW5jdGlvbk5hbWUKKyAgICAgICAgKiBkZWJ1Z2dlci9EZWJ1 Z2dlckNhbGxGcmFtZS5jcHA6IEFkZGVkIGNhbGN1bGF0ZWRGdW5jdGlvbk5hbWUgdG8gbWF0Y2gg ZXhpc3Rpbmcgb25lIGluIFByb2ZpbGVOb2RlLgorICAgICAgICAoSlNDOjpEZWJ1Z2dlckNhbGxG cmFtZTo6Y2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSk6CisgICAgICAgICogZGVidWdnZXIvRGVidWdn ZXJDYWxsRnJhbWUuaDogQWRkZWQgY2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSB0byBtYXRjaCBleGlz dGluZyBvbmUgaW4gUHJvZmlsZU5vZGUuCisKIDIwMDktMDUtMDMgIFN0ZXZlIEZhbGtlbmJ1cmcg IDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBXaW5kb3dzIGJ1aWxkIGZpeC4KSW5kZXg6 IEphdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHJldmlzaW9uIDQzMjAyKQorKysgSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjgsNiArMzI4LDcg QEAgX19aTkszSlNDMTZKU1ZhcmlhYmxlT2JqZWN0MTZpc1ZhcmlhYmxlTwogX19aTkszSlNDMTZK U1ZhcmlhYmxlT2JqZWN0MjFnZXRQcm9wZXJ0eUF0dHJpYnV0ZXNFUE5TXzlFeGVjU3RhdGVFUktO U18xMElkZW50aWZpZXJFUmoKIF9fWk5LM0pTQzE3RGVidWdnZXJDYWxsRnJhbWUxMHRoaXNPYmpl Y3RFdgogX19aTkszSlNDMTdEZWJ1Z2dlckNhbGxGcmFtZTEyZnVuY3Rpb25OYW1lRXYKK19fWk5L M0pTQzE3RGVidWdnZXJDYWxsRnJhbWUyMmNhbGN1bGF0ZWRGdW5jdGlvbk5hbWVFdgogX19aTksz SlNDMTdEZWJ1Z2dlckNhbGxGcmFtZTR0eXBlRXYKIF9fWk5LM0pTQzE3RGVidWdnZXJDYWxsRnJh bWU4ZXZhbHVhdGVFUktOU183VVN0cmluZ0VSTlNfN0pTVmFsdWVFCiBfX1pOSzNKU0M0SGVhcDEw c3RhdGlzdGljc0V2CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxG cmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXJD YWxsRnJhbWUuY3BwCShyZXZpc2lvbiA0MzIwMikKKysrIEphdmFTY3JpcHRDb3JlL2RlYnVnZ2Vy L0RlYnVnZ2VyQ2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsMTcgQEAg Y29uc3QgVVN0cmluZyogRGVidWdnZXJDYWxsRnJhbWU6OmZ1bmN0aQogICAgICAgICByZXR1cm4g MDsKICAgICByZXR1cm4gJmZ1bmN0aW9uLT5uYW1lKCZtX2NhbGxGcmFtZS0+Z2xvYmFsRGF0YSgp KTsKIH0KKyAgICAKK2NvbnN0IFVTdHJpbmcgRGVidWdnZXJDYWxsRnJhbWU6OmNhbGN1bGF0ZWRG dW5jdGlvbk5hbWUoKSBjb25zdAoreworICAgIGlmICghbV9jYWxsRnJhbWUtPmNvZGVCbG9jaygp KQorICAgICAgICByZXR1cm4gMDsKKyAgICAKKyAgICBKU0Z1bmN0aW9uKiBmdW5jdGlvbiA9IHN0 YXRpY19jYXN0PEpTRnVuY3Rpb24qPihtX2NhbGxGcmFtZS0+Y2FsbGVlKCkpOworICAgIGlmICgh ZnVuY3Rpb24pCisgICAgICAgIHJldHVybiAwOworICAgIHJldHVybiBmdW5jdGlvbi0+Y2FsY3Vs YXRlZERpc3BsYXlOYW1lKCZtX2NhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpKTsKK30KIAogRGVidWdn ZXJDYWxsRnJhbWU6OlR5cGUgRGVidWdnZXJDYWxsRnJhbWU6OnR5cGUoKSBjb25zdAogewpJbmRl eDogSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXJDYWxsRnJhbWUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBKYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxGcmFtZS5oCShyZXZpc2lv biA0MzIwMikKKysrIEphdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0RlYnVnZ2VyQ2FsbEZyYW1lLmgJ KHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IEpTR2xvYmFsT2JqZWN0KiBkeW5hbWljR2xvYmFsT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gbV9j YWxsRnJhbWUtPmR5bmFtaWNHbG9iYWxPYmplY3QoKTsgfQogICAgICAgICBjb25zdCBTY29wZUNo YWluTm9kZSogc2NvcGVDaGFpbigpIGNvbnN0IHsgcmV0dXJuIG1fY2FsbEZyYW1lLT5zY29wZUNo YWluKCk7IH0KICAgICAgICAgY29uc3QgVVN0cmluZyogZnVuY3Rpb25OYW1lKCkgY29uc3Q7Cisg ICAgICAgIGNvbnN0IFVTdHJpbmcgY2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSgpIGNvbnN0OwogICAg ICAgICBUeXBlIHR5cGUoKSBjb25zdDsKICAgICAgICAgSlNPYmplY3QqIHRoaXNPYmplY3QoKSBj b25zdDsKICAgICAgICAgSlNWYWx1ZSBldmFsdWF0ZShjb25zdCBVU3RyaW5nJiwgSlNWYWx1ZSYg ZXhjZXB0aW9uKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA0MzIwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMDQgIEZyYW5jaXNjbyBU b2xtYXNreSAgPGZyYW5jaXNjb0AyODBub3J0aC5jb20+CisKKyAgICAgICAgQlVHIDI1NDY3OiBK YXZhU2NyaXB0IGRlYnVnZ2VyIHNob3VsZCB1c2UgZnVuY3Rpb24uZGlzcGxheU5hbWUgYXMgdGhl IGZ1bmN0aW9uJ3MgbmFtZSBpbiB0aGUgY2FsbCBzdGFjaworICAgICAgICA8aHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDY3PgorICAgICAgICAKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSmF2YVNjcmlw dENhbGxGcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKYXZhU2NyaXB0Q2FsbEZyYW1lOjpm dW5jdGlvbk5hbWUpOiBVc2UgY2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSB3aGljaCB0YWtlcyBpbnRv IGFjY291bnQgZGlzcGxheU5hbWUKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxT dGFja1NpZGViYXJQYW5lLmpzOiBSZW1vdmUgInx8IGFub255bW91cyBmdW5jdGlvbiIgc2luY2Ug aXQgaXMgaGFuZGxlZCBpbnRlcm5hbGx5IGp1c3QgbGlrZSBpbiBwcm9maWxlcworICAgICAgICAo V2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorCiAy MDA5LTA1LTA0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTYW0gJ1RoZSBCZWxseScgV2VpbmlnCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rv ci9KYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rv ci9KYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAkocmV2aXNpb24gNDMyMDIpCisrKyBXZWJDb3JlL2lu c3BlY3Rvci9KYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNiAr MzgsOCBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0 YXRpYyBjb25zdCBjaGFyKiBBbm9ueW1vdXNGdW5jdGlvbiA9ICIoYW5vbnltb3VzIGZ1bmN0aW9u KSI7CisgICAgCiBKYXZhU2NyaXB0Q2FsbEZyYW1lOjpKYXZhU2NyaXB0Q2FsbEZyYW1lKGNvbnN0 IERlYnVnZ2VyQ2FsbEZyYW1lJiBkZWJ1Z2dlckNhbGxGcmFtZSwgUGFzc1JlZlB0cjxKYXZhU2Ny aXB0Q2FsbEZyYW1lPiBjYWxsZXIsIGludHB0cl90IHNvdXJjZUlELCBpbnQgbGluZSkKICAgICA6 IG1fZGVidWdnZXJDYWxsRnJhbWUoZGVidWdnZXJDYWxsRnJhbWUpCiAgICAgLCBtX2NhbGxlcihj YWxsZXIpCkBAIC02NCwxMSArNjYsMTEgQEAgU3RyaW5nIEphdmFTY3JpcHRDYWxsRnJhbWU6OmZ1 bmN0aW9uTmFtZQogewogICAgIEFTU0VSVChtX2lzVmFsaWQpOwogICAgIGlmICghbV9pc1ZhbGlk KQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAgY29uc3QgVVN0cmluZyogZnVuY3Rpb25O YW1lID0gbV9kZWJ1Z2dlckNhbGxGcmFtZS5mdW5jdGlvbk5hbWUoKTsKLSAgICBpZiAoIWZ1bmN0 aW9uTmFtZSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIHJldHVybiAqZnVuY3Rpb25O YW1lOworICAgICAgICByZXR1cm4gQW5vbnltb3VzRnVuY3Rpb247CisgICAgY29uc3QgVVN0cmlu ZyBmdW5jdGlvbk5hbWUgPSBtX2RlYnVnZ2VyQ2FsbEZyYW1lLmNhbGN1bGF0ZWRGdW5jdGlvbk5h bWUoKTsKKyAgICBpZiAoZnVuY3Rpb25OYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIEFu b255bW91c0Z1bmN0aW9uOworICAgIHJldHVybiBmdW5jdGlvbk5hbWU7CiB9CiAKIERlYnVnZ2Vy Q2FsbEZyYW1lOjpUeXBlIEphdmFTY3JpcHRDYWxsRnJhbWU6OnR5cGUoKSBjb25zdApJbmRleDog V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFu ZS5qcwkocmV2aXNpb24gNDMyMDIpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2Fs bFN0YWNrU2lkZWJhclBhbmUuanMJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAgV2Vi SW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdAogICAgICAgICBkbyB7CiAgICAg ICAgICAgICBzd2l0Y2ggKGNhbGxGcmFtZS50eXBlKSB7CiAgICAgICAgICAgICBjYXNlICJmdW5j dGlvbiI6Ci0gICAgICAgICAgICAgICAgdGl0bGUgPSBjYWxsRnJhbWUuZnVuY3Rpb25OYW1lIHx8 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKGFub255bW91cyBmdW5jdGlvbikiKTsKKyAgICAgICAg ICAgICAgICB0aXRsZSA9IGNhbGxGcmFtZS5mdW5jdGlvbk5hbWU7CiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICBjYXNlICJwcm9ncmFtIjoKICAgICAgICAgICAgICAgICB0aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7Cg== 30011 2009-05-04 22:44:49 -0700 2009-05-04 23:04:49 -0700 Removed const, put anonymous string back in js debugger.patch text/plain 4969 tolmasky SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQzMjA0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMDQgIEZyYW5jaXNj byBUb2xtYXNreSAgPGZyYW5jaXNjb0AyODBub3J0aC5jb20+CisKKyAgICAgICAgQlVHIDI1NDY3 OiBKYXZhU2NyaXB0IGRlYnVnZ2VyIHNob3VsZCB1c2UgZnVuY3Rpb24uZGlzcGxheU5hbWUgYXMg dGhlIGZ1bmN0aW9uJ3MgbmFtZSBpbiB0aGUgY2FsbCBzdGFjaworICAgICAgICA8aHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDY3PgorICAgICAgICAKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5l eHA6IEFkZGVkIGNhbGN1bGF0ZWRGdW5jdGlvbk5hbWUKKyAgICAgICAgKiBkZWJ1Z2dlci9EZWJ1 Z2dlckNhbGxGcmFtZS5jcHA6IEFkZGVkIGNhbGN1bGF0ZWRGdW5jdGlvbk5hbWUgdG8gbWF0Y2gg ZXhpc3Rpbmcgb25lIGluIFByb2ZpbGVOb2RlLgorICAgICAgICAoSlNDOjpEZWJ1Z2dlckNhbGxG cmFtZTo6Y2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSk6CisgICAgICAgICogZGVidWdnZXIvRGVidWdn ZXJDYWxsRnJhbWUuaDogQWRkZWQgY2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSB0byBtYXRjaCBleGlz dGluZyBvbmUgaW4gUHJvZmlsZU5vZGUuCisKIDIwMDktMDUtMDMgIFN0ZXZlIEZhbGtlbmJ1cmcg IDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBXaW5kb3dzIGJ1aWxkIGZpeC4KSW5kZXg6 IEphdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHJldmlzaW9uIDQzMjAyKQorKysgSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjgsNiArMzI4LDcg QEAgX19aTkszSlNDMTZKU1ZhcmlhYmxlT2JqZWN0MTZpc1ZhcmlhYmxlTwogX19aTkszSlNDMTZK U1ZhcmlhYmxlT2JqZWN0MjFnZXRQcm9wZXJ0eUF0dHJpYnV0ZXNFUE5TXzlFeGVjU3RhdGVFUktO U18xMElkZW50aWZpZXJFUmoKIF9fWk5LM0pTQzE3RGVidWdnZXJDYWxsRnJhbWUxMHRoaXNPYmpl Y3RFdgogX19aTkszSlNDMTdEZWJ1Z2dlckNhbGxGcmFtZTEyZnVuY3Rpb25OYW1lRXYKK19fWk5L M0pTQzE3RGVidWdnZXJDYWxsRnJhbWUyMmNhbGN1bGF0ZWRGdW5jdGlvbk5hbWVFdgogX19aTksz SlNDMTdEZWJ1Z2dlckNhbGxGcmFtZTR0eXBlRXYKIF9fWk5LM0pTQzE3RGVidWdnZXJDYWxsRnJh bWU4ZXZhbHVhdGVFUktOU183VVN0cmluZ0VSTlNfN0pTVmFsdWVFCiBfX1pOSzNKU0M0SGVhcDEw c3RhdGlzdGljc0V2CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxG cmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXJD YWxsRnJhbWUuY3BwCShyZXZpc2lvbiA0MzIwMikKKysrIEphdmFTY3JpcHRDb3JlL2RlYnVnZ2Vy L0RlYnVnZ2VyQ2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsMTcgQEAg Y29uc3QgVVN0cmluZyogRGVidWdnZXJDYWxsRnJhbWU6OmZ1bmN0aQogICAgICAgICByZXR1cm4g MDsKICAgICByZXR1cm4gJmZ1bmN0aW9uLT5uYW1lKCZtX2NhbGxGcmFtZS0+Z2xvYmFsRGF0YSgp KTsKIH0KKyAgICAKK1VTdHJpbmcgRGVidWdnZXJDYWxsRnJhbWU6OmNhbGN1bGF0ZWRGdW5jdGlv bk5hbWUoKSBjb25zdAoreworICAgIGlmICghbV9jYWxsRnJhbWUtPmNvZGVCbG9jaygpKQorICAg ICAgICByZXR1cm4gMDsKKyAgICAKKyAgICBKU0Z1bmN0aW9uKiBmdW5jdGlvbiA9IHN0YXRpY19j YXN0PEpTRnVuY3Rpb24qPihtX2NhbGxGcmFtZS0+Y2FsbGVlKCkpOworICAgIGlmICghZnVuY3Rp b24pCisgICAgICAgIHJldHVybiAwOworICAgIHJldHVybiBmdW5jdGlvbi0+Y2FsY3VsYXRlZERp c3BsYXlOYW1lKCZtX2NhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpKTsKK30KIAogRGVidWdnZXJDYWxs RnJhbWU6OlR5cGUgRGVidWdnZXJDYWxsRnJhbWU6OnR5cGUoKSBjb25zdAogewpJbmRleDogSmF2 YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdnZXJDYWxsRnJhbWUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBK YXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxGcmFtZS5oCShyZXZpc2lvbiA0MzIw MikKKysrIEphdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0RlYnVnZ2VyQ2FsbEZyYW1lLmgJKHdvcmtp bmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIEpTR2xv YmFsT2JqZWN0KiBkeW5hbWljR2xvYmFsT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gbV9jYWxsRnJh bWUtPmR5bmFtaWNHbG9iYWxPYmplY3QoKTsgfQogICAgICAgICBjb25zdCBTY29wZUNoYWluTm9k ZSogc2NvcGVDaGFpbigpIGNvbnN0IHsgcmV0dXJuIG1fY2FsbEZyYW1lLT5zY29wZUNoYWluKCk7 IH0KICAgICAgICAgY29uc3QgVVN0cmluZyogZnVuY3Rpb25OYW1lKCkgY29uc3Q7CisgICAgICAg IFVTdHJpbmcgY2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSgpIGNvbnN0OwogICAgICAgICBUeXBlIHR5 cGUoKSBjb25zdDsKICAgICAgICAgSlNPYmplY3QqIHRoaXNPYmplY3QoKSBjb25zdDsKICAgICAg ICAgSlNWYWx1ZSBldmFsdWF0ZShjb25zdCBVU3RyaW5nJiwgSlNWYWx1ZSYgZXhjZXB0aW9uKSBj b25zdDsKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hh bmdlTG9nCShyZXZpc2lvbiA0MzIwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMDQgIEZyYW5jaXNjbyBUb2xtYXNreSAgPGZy YW5jaXNjb0AyODBub3J0aC5jb20+CisKKyAgICAgICAgQlVHIDI1NDY3OiBKYXZhU2NyaXB0IGRl YnVnZ2VyIHNob3VsZCB1c2UgZnVuY3Rpb24uZGlzcGxheU5hbWUgYXMgdGhlIGZ1bmN0aW9uJ3Mg bmFtZSBpbiB0aGUgY2FsbCBzdGFjaworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI1NDY3PgorICAgICAgICAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSmF2YVNjcmlwdENhbGxGcmFtZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpKYXZhU2NyaXB0Q2FsbEZyYW1lOjpmdW5jdGlvbk5hbWUp OiBVc2UgY2FsY3VsYXRlZEZ1bmN0aW9uTmFtZSB3aGljaCB0YWtlcyBpbnRvIGFjY291bnQgZGlz cGxheU5hbWUKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQ YW5lLmpzOiBSZW1vdmUgInx8IGFub255bW91cyBmdW5jdGlvbiIgc2luY2UgaXQgaXMgaGFuZGxl ZCBpbnRlcm5hbGx5IGp1c3QgbGlrZSBpbiBwcm9maWxlcworICAgICAgICAoV2ViSW5zcGVjdG9y LkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorCiAyMDA5LTA1LTA0ICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT YW0gJ1RoZSBCZWxseScgV2VpbmlnCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9KYXZhU2NyaXB0 Q2FsbEZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9KYXZhU2NyaXB0 Q2FsbEZyYW1lLmNwcAkocmV2aXNpb24gNDMyMDIpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9KYXZh U2NyaXB0Q2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQAogdXNp bmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewotCisgICAgCiBKYXZhU2Ny aXB0Q2FsbEZyYW1lOjpKYXZhU2NyaXB0Q2FsbEZyYW1lKGNvbnN0IERlYnVnZ2VyQ2FsbEZyYW1l JiBkZWJ1Z2dlckNhbGxGcmFtZSwgUGFzc1JlZlB0cjxKYXZhU2NyaXB0Q2FsbEZyYW1lPiBjYWxs ZXIsIGludHB0cl90IHNvdXJjZUlELCBpbnQgbGluZSkKICAgICA6IG1fZGVidWdnZXJDYWxsRnJh bWUoZGVidWdnZXJDYWxsRnJhbWUpCiAgICAgLCBtX2NhbGxlcihjYWxsZXIpCkBAIC02NSwxMCAr NjUsMTAgQEAgU3RyaW5nIEphdmFTY3JpcHRDYWxsRnJhbWU6OmZ1bmN0aW9uTmFtZQogICAgIEFT U0VSVChtX2lzVmFsaWQpOwogICAgIGlmICghbV9pc1ZhbGlkKQogICAgICAgICByZXR1cm4gU3Ry aW5nKCk7Ci0gICAgY29uc3QgVVN0cmluZyogZnVuY3Rpb25OYW1lID0gbV9kZWJ1Z2dlckNhbGxG cmFtZS5mdW5jdGlvbk5hbWUoKTsKLSAgICBpZiAoIWZ1bmN0aW9uTmFtZSkKKyAgICBVU3RyaW5n IGZ1bmN0aW9uTmFtZSA9IG1fZGVidWdnZXJDYWxsRnJhbWUuY2FsY3VsYXRlZEZ1bmN0aW9uTmFt ZSgpOworICAgIGlmIChmdW5jdGlvbk5hbWUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gU3Ry aW5nKCk7Ci0gICAgcmV0dXJuICpmdW5jdGlvbk5hbWU7CisgICAgcmV0dXJuIGZ1bmN0aW9uTmFt ZTsKIH0KIAogRGVidWdnZXJDYWxsRnJhbWU6OlR5cGUgSmF2YVNjcmlwdENhbGxGcmFtZTo6dHlw ZSgpIGNvbnN0Cg==