Bug 126805 – [iOS] Fix GCController::releaseExecutableMemory

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Joseph Pecoraro]

GCController::releaseExecutableMemory uses JSDOMWindow::commonVM()->dynamicGlobalObject which no longer exists. It moved to VMEntryScope->globalObject. Can the same trick still be applied?

[Joseph Pecoraro]

Created attachment 220919 [details]
[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.

[Sam Weinig]

Comment on attachment 220919 [details]
[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)!

[Mark Lam]

Comment on attachment 220919 [details]
[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)

[Joseph Pecoraro]

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!