126805 2014-01-10 21:07:16 -0800 [iOS] Fix GCController::releaseExecutableMemory 2014-01-10 22:53:47 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned joepeck mark.lam oliver psolanki oldest_to_newest 966746 0 joepeck 2014-01-10 21:07:16 -0800 GCController::releaseExecutableMemory uses JSDOMWindow::commonVM()->dynamicGlobalObject which no longer exists. It moved to VMEntryScope->globalObject. Can the same trick still be applied? 966747 1 220919 joepeck 2014-01-10 21:10:01 -0800 Created attachment 220919 [PATCH] Proposed Fix JSC folks, does this look correct? Should I be null checking JSDOMWindow::commonVM()->entryScope now instead of JSDOMWindow::commonVM()->entryScope->globalObject()? This is one of the iOS in OpenSource build errors. 966751 2 220919 sam 2014-01-10 21:43:55 -0800 Comment on attachment 220919 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=220919&action=review > Source/WebCore/bindings/js/GCController.cpp:37 > > +#if PLATFORM(IOS) > +#include <runtime/VMEntryScope.h> > +#endif Seems like while you are here, you might as well make this function not iOS specific as it seems generally useful (and you can remove the #ifdefs)! 966753 3 220919 mark.lam 2014-01-10 21:56:39 -0800 Comment on attachment 220919 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=220919&action=review r=me with the needed fixes. > Source/WebCore/bindings/js/GCController.cpp:120 > + ASSERT(!JSDOMWindow::commonVM()->entryScope->globalObject()); This is not right. The entryScope will be NULL if we haven’t entered the VM to run any JS code. Hence, the assertion you want is: ASSERT(!JSDOMWindow::commonVM()->entryScope); > Source/WebCore/bindings/js/GCController.cpp:123 > + if (JSDOMWindow::commonVM()->entryScope->globalObject()) Similarly here, what you want is: if (JSDOMDOMWindow::commonVM()->entryScope) 966758 4 joepeck 2014-01-10 22:53:47 -0800 Landed in <http://trac.webkit.org/changeset/161747>. And follow fix to in <http://trac.webkit.org/changeset/161748> cause even though I thought I tested building Mac, my terminal tricked me into thinking it compiled! 220919 2014-01-10 21:10:01 -0800 2014-01-10 21:56:39 -0800 [PATCH] Proposed Fix fix.patch text/plain 2073 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMGE5NmUxLi40ZTI4ODFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTQtMDEtMTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBbaU9TXSBGaXggR0NDb250cm9sbGVyOjpyZWxlYXNlRXhlY3V0YWJsZU1lbW9yeQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2ODA1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9HQ0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R0NDb250cm9sbGVyOjpy ZWxlYXNlRXhlY3V0YWJsZU1lbW9yeSk6CisKKzIwMTQtMDEtMTAgIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBGaXggR3JhcGhpY3NMYXllckNBLm8gZm9y IGlPUy4gVW5yZXZpZXdlZCBidWlsZCBmaXguCiAKICAgICAgICAgVXNlIG9mIHN5c3RlbU1lbW9y eUxldmVsIHdhcyBtaXNzaW5nIGluY2x1ZGUgb2YgU3lzdGVtTWVtb3J5LmguCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9HQ0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvR0NDb250cm9sbGVyLmNwcAppbmRleCBkYjY5MDFlLi45NGU2Mzdk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9HQ0NvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0dDQ29udHJvbGxlci5jcHAKQEAgLTIw LDcgKzIwLDcgQEAKICAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKICAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAogICogKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLiAKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgpA QCAtMzIsNiArMzIsMTAgQEAKICNpbmNsdWRlIDxoZWFwL0hlYXAuaD4KICNpbmNsdWRlIDx3dGYv U3RkTGliRXh0cmFzLmg+CiAKKyNpZiBQTEFURk9STShJT1MpCisjaW5jbHVkZSA8cnVudGltZS9W TUVudHJ5U2NvcGUuaD4KKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CkBAIC0xMTMsMTAgKzExNywxMCBAQCB2b2lkIEdDQ29udHJvbGxlcjo6cmVs ZWFzZUV4ZWN1dGFibGVNZW1vcnkoKQogCiAgICAgLy8gV2Ugc2hvdWxkbid0IGhhdmUgYW55IGph dmFzY3JpcHQgcnVubmluZyBvbiBvdXIgc3RhY2sgd2hlbiB0aGlzIGZ1bmN0aW9uIGlzIGNhbGxl ZC4gVGhlCiAgICAgLy8gZm9sbG93aW5nIGxpbmUgYXNzZXJ0cyB0aGF0LgotICAgIEFTU0VSVCgh SlNET01XaW5kb3c6OmNvbW1vblZNKCktPmR5bmFtaWNHbG9iYWxPYmplY3QpOworICAgIEFTU0VS VCghSlNET01XaW5kb3c6OmNvbW1vblZNKCktPmVudHJ5U2NvcGUtPmdsb2JhbE9iamVjdCgpKTsK IAogICAgIC8vIEJ1dCBiZSBzYWZlIGluIHJlbGVhc2UgYnVpbGRzIGp1c3QgaW4gY2FzZS4uLgot ICAgIGlmIChKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKS0+ZHluYW1pY0dsb2JhbE9iamVjdCkKKyAg ICBpZiAoSlNET01XaW5kb3c6OmNvbW1vblZNKCktPmVudHJ5U2NvcGUtPmdsb2JhbE9iamVjdCgp KQogICAgICAgICByZXR1cm47CiAKICAgICBKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKS0+cmVsZWFz ZUV4ZWN1dGFibGVNZW1vcnkoKTsK