Summary: | [iOS] Fix GCController::releaseExecutableMemory | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Joseph Pecoraro <joepeck> | ||||
Component: | WebKit Misc. | Assignee: | Nobody <webkit-unassigned> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | joepeck, mark.lam, oliver, psolanki | ||||
Priority: | P2 | ||||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | Unspecified | ||||||
OS: | Unspecified | ||||||
Attachments: |
|
Description
Joseph Pecoraro
2014-01-10 21:07:16 PST
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.
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)! 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) 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! |