Bug 68409 - Refactor Heap allocation logic into separate AllocationSpace class
Summary: Refactor Heap allocation logic into separate AllocationSpace class
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Oliver Hunt
URL:
Keywords:
Depends on: 68418
Blocks:
  Show dependency tree / graph
 
Reported: 2011-09-19 16:01 PDT by Oliver Hunt
Modified: 2011-09-20 11:31 PDT (History)
1 user (show)

See Also:

Attachments
Patch (40.33 KB, patch)
2011-09-19 16:05 PDT, Oliver Hunt 		no flags Details | Formatted Diff | Diff
Patch (39.90 KB, patch)
2011-09-20 10:24 PDT, Oliver Hunt 		no flags Details | Formatted Diff | Diff
Patch (40.96 KB, patch)
2011-09-20 10:32 PDT, Oliver Hunt 		no flags Details | Formatted Diff | Diff
Patch (41.04 KB, patch)
2011-09-20 11:28 PDT, Oliver Hunt 		no flags Details | Formatted Diff | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Oliver Hunt 2011-09-19 16:01:51 PDT 
Refactor Heap allocation logic into separate AllocationSpace class
Comment 1 Oliver Hunt 2011-09-19 16:05:25 PDT 
Created attachment 107937 [details]
Patch
Comment 2 Oliver Hunt 2011-09-19 16:14:31 PDT 
Committed r95493: <http://trac.webkit.org/changeset/95493>
Comment 3 Ryosuke Niwa 2011-09-19 16:44:00 PDT 
It seems like this patch broke JSC on Windows:

2>   Creating library C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\lib\JavaScriptCore.lib and object C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\lib\JavaScriptCore.exp
2>JavaScriptCore.exp : error LNK2001: unresolved external symbol "public: void * __thiscall JSC::Heap::allocate(struct JSC::MarkedSpace::SizeClass &)" (?allocate@Heap@JSC@@QAEPAXAAUSizeClass@MarkedSpace@2@@Z)
2>JavaScriptCore.exp : error LNK2001: unresolved external symbol "private: void * __thiscall JSC::Heap::allocateSlowCase(struct JSC::MarkedSpace::SizeClass &)" (?allocateSlowCase@Heap@JSC@@AAEPAXAAUSizeClass@MarkedSpace@2@@Z)
2>C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\bin\JavaScriptCore.dll : fatal error LNK1120: 2 unresolved externals
2>Build log was saved at "file://C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\obj\JavaScriptCore\BuildLog.htm"
Comment 4 Ryosuke Niwa 2011-09-19 18:44:25 PDT 
Thanks for http://trac.webkit.org/changeset/95496.

But it's still failing to build for whatever reason :(

http://build.webkit.org/builders/Windows%20Release%20%28Build%29/builds/21105/steps/compile-webkit/logs/stdio

2>JavaScriptCore.exp : error LNK2001: unresolved external symbol "public: void * __thiscall JSC::AllocationSpace::allocate(struct JSC::MarkedSpace::SizeClass &)" (?allocate@AllocationSpace@JSC@@QAEPAXAAUSizeCla

It seems like cl.exe is getting confused by two overloaded allocate functions.  I tried moving function definitions into the class definition but didn't help.

Per IRC discussion with gbarra, I'm rolling out the patch for now.
Comment 5 Oliver Hunt 2011-09-20 10:24:56 PDT 
Created attachment 108019 [details]
Patch
Comment 6 Ryosuke Niwa 2011-09-20 10:28:25 PDT 
Comment on attachment 108019 [details]
Patch

It seems like you'd have to modify JavaScriptCore.def as in http://trac.webkit.org/changeset/95496/trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def ?
Comment 7 Oliver Hunt 2011-09-20 10:29:44 PDT 
(In reply to comment #6)
> (From update of attachment 108019 [details])
> It seems like you'd have to modify JavaScriptCore.def as in http://trac.webkit.org/changeset/95496/trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def ?

I'm waiting for the win ews to turn, then i'll remove the bogus export, then wait for it to turn again, and add the correct one.
Comment 8 Oliver Hunt 2011-09-20 10:32:10 PDT 
Created attachment 108021 [details]
Patch

Remove the known bad exports
Comment 9 Oliver Hunt 2011-09-20 11:28:08 PDT 
Created attachment 108031 [details]
Patch

Add missing export
Comment 10 Oliver Hunt 2011-09-20 11:31:55 PDT 
Committed r95559: <http://trac.webkit.org/changeset/95559>