116189 2013-05-15 14:57:16 -0700 FTL memory allocator should be able to allocate data sections in non-executable memory 2013-10-07 15:45:37 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112840 122318 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 889542 0 fpizlo 2013-05-15 14:57:16 -0700 Patch forthcoming, eventually. 937238 1 213621 fpizlo 2013-10-07 15:22:35 -0700 Created attachment 213621 the patch 937243 2 213621 sam 2013-10-07 15:27:35 -0700 Comment on attachment 213621 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=213621&action=review > Source/JavaScriptCore/ftl/FTLJITCode.h:61 > const Vector<RefPtr<ExecutableMemoryHandle> >& handles() const { return m_handles; } > + const Vector<RefCountedArray<LSectionWord> >& dataSections() const { return m_dataSections; } You don't need the space between the > >. > Source/JavaScriptCore/ftl/FTLJITCode.h:73 > + Vector<RefCountedArray<LSectionWord> > m_dataSections; > Vector<RefPtr<ExecutableMemoryHandle> > m_handles; You don't need the space between the > >. 937247 3 fpizlo 2013-10-07 15:44:30 -0700 (In reply to comment #2) > (From update of attachment 213621 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=213621&action=review > > > Source/JavaScriptCore/ftl/FTLJITCode.h:61 > > const Vector<RefPtr<ExecutableMemoryHandle> >& handles() const { return m_handles; } > > + const Vector<RefCountedArray<LSectionWord> >& dataSections() const { return m_dataSections; } > > You don't need the space between the > >. > > > Source/JavaScriptCore/ftl/FTLJITCode.h:73 > > + Vector<RefCountedArray<LSectionWord> > m_dataSections; > > Vector<RefPtr<ExecutableMemoryHandle> > m_handles; > > You don't need the space between the > >. Fixed. 937248 4 fpizlo 2013-10-07 15:45:37 -0700 Landed in http://trac.webkit.org/changeset/157062 213621 2013-10-07 15:22:35 -0700 2013-10-07 15:27:34 -0700 the patch blah.patch text/plain 5103 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU3MDU5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDEzLTEwLTA3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RlRMIG1lbW9yeSBhbGxvY2F0b3Igc2hvdWxkIGJlIGFibGUgdG8gYWxsb2NhdGUgZGF0YSBzZWN0 aW9ucyBpbiBub24tZXhlY3V0YWJsZSBtZW1vcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjE4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVXNlIGEgUmVmQ291bnRlZEFycmF5PGludDY0 X3Q+IGZvciBkYXRhIHNlY3Rpb25zLiBUaGlzIHdvcmtzIG91dCBncmVhdCBiZWNhdXNlCisgICAg ICAgIFJlZkNvdW50ZWRBcnJheTw+IGtub3dzIGl0cyBvd24gc2l6ZSBhbmQgYmVjYXVzZSB0aGUg cmVmZXJlbmNlIGNvdW50aW5nIG1ha2VzIHBhc3NpbmcKKyAgICAgICAgaXQgYXJvdW5kIHZlcnkg ZWFzeSAoeW91IGRvbid0IGhhdmUgdG8gc3RyZXNzIG91dCBhYm91dCBvd25lcnNoaXApLgorCisg ICAgICAgICogZnRsL0ZUTENvbXBpbGUuY3BwOgorICAgICAgICAoSlNDOjpGVEw6Om1tQWxsb2Nh dGVEYXRhU2VjdGlvbik6CisgICAgICAgIChKU0M6OkZUTDo6Y29tcGlsZSk6CisgICAgICAgICog ZnRsL0ZUTEpJVENvZGUuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkpJVENvZGU6OmFkZERhdGFT ZWN0aW9uKToKKyAgICAgICAgKiBmdGwvRlRMSklUQ29kZS5oOgorICAgICAgICAoSlNDOjpGVEw6 OkpJVENvZGU6OmRhdGFTZWN0aW9ucyk6CisKIDIwMTMtMTAtMDcgIE5hZGF2IFJvdGVtICA8bnJv dGVtQGFwcGxlLmNvbT4KIAogICAgICAgICBGVEw6IE9wdGltaXplIElzU3RyaW5nKEAyPFN0cmlu Zz4pIC0+IEpTQ29uc3QodHJ1ZSkgKyBQaGFudG9tKCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMQ29tcGlsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExDb21waWxlLmNwcAkocmV2aXNpb24gMTU3MDU4KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExDb21waWxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsMTEgKzY1 LDIwIEBAIHN0YXRpYyB1aW50OF90KiBtbUFsbG9jYXRlRGF0YVNlY3Rpb24oCiAgICAgdm9pZCog b3BhcXVlU3RhdGUsIHVpbnRwdHJfdCBzaXplLCB1bnNpZ25lZCBhbGlnbm1lbnQsIHVuc2lnbmVk IHNlY3Rpb25JRCwKICAgICBjb25zdCBjaGFyKiBzZWN0aW9uTmFtZSwgTExWTUJvb2wgaXNSZWFk T25seSkKIHsKLSAgICAvLyBGSVhNRTogZm91cnRoVGllcjogRlRMIG1lbW9yeSBhbGxvY2F0b3Ig c2hvdWxkIGJlIGFibGUgdG8gYWxsb2NhdGUgZGF0YQotICAgIC8vIHNlY3Rpb25zIGluIG5vbi1l eGVjdXRhYmxlIG1lbW9yeS4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE2MTg5CisgICAgVU5VU0VEX1BBUkFNKHNlY3Rpb25JRCk7CisgICAgVU5VU0VE X1BBUkFNKHNlY3Rpb25OYW1lKTsKICAgICBVTlVTRURfUEFSQU0oaXNSZWFkT25seSk7Ci0gICAg cmV0dXJuIG1tQWxsb2NhdGVDb2RlU2VjdGlvbihvcGFxdWVTdGF0ZSwgc2l6ZSwgYWxpZ25tZW50 LCBzZWN0aW9uSUQsIHNlY3Rpb25OYW1lKTsKKworICAgIFN0YXRlJiBzdGF0ZSA9ICpzdGF0aWNf Y2FzdDxTdGF0ZSo+KG9wYXF1ZVN0YXRlKTsKKyAgICAKKyAgICBSRUxFQVNFX0FTU0VSVChhbGln bm1lbnQgPD0gc2l6ZW9mKExTZWN0aW9uV29yZCkpOworICAgIAorICAgIFJlZkNvdW50ZWRBcnJh eTxMU2VjdGlvbldvcmQ+IHNlY3Rpb24oCisgICAgICAgIChzaXplICsgc2l6ZW9mKExTZWN0aW9u V29yZCkgLSAxKSAvIHNpemVvZihMU2VjdGlvbldvcmQpKTsKKyAgICAKKyAgICBzdGF0ZS5qaXRD b2RlLT5hZGREYXRhU2VjdGlvbihzZWN0aW9uKTsKKyAgICAKKyAgICByZXR1cm4gYml0d2lzZV9j YXN0PHVpbnQ4X3QqPihzZWN0aW9uLmRhdGEoKSk7CiB9CiAKIHN0YXRpYyBMTFZNQm9vbCBtbUFw cGx5UGVybWlzc2lvbnModm9pZCosIGNoYXIqKikKQEAgLTE0Nyw2ICsxNTYsMTkgQEAgdm9pZCBj b21waWxlKFN0YXRlJiBzdGF0ZSkKICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlckNvZGVQ dHIoaGFuZGxlLT5zdGFydCgpKSwgaGFuZGxlLT5zaXplSW5CeXRlcygpLAogICAgICAgICAgICAg ICAgICIgICAgIiwgV1RGOjpkYXRhRmlsZSgpLCBMTFZNU3Vic2V0KTsKICAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHN0YXRlLmppdENvZGUtPmRh dGFTZWN0aW9ucygpLnNpemUoKTsgKytpKSB7CisgICAgICAgICAgICBjb25zdCBSZWZDb3VudGVk QXJyYXk8TFNlY3Rpb25Xb3JkPiYgc2VjdGlvbiA9IHN0YXRlLmppdENvZGUtPmRhdGFTZWN0aW9u cygpW2ldOworICAgICAgICAgICAgZGF0YUxvZygKKyAgICAgICAgICAgICAgICAiR2VuZXJhdGVk IExMVk0gZGF0YSBzZWN0aW9uIGZvciAiLAorICAgICAgICAgICAgICAgIENvZGVCbG9ja1dpdGhK SVRUeXBlKHN0YXRlLmdyYXBoLm1fY29kZUJsb2NrLCBKSVRDb2RlOjpERkdKSVQpLAorICAgICAg ICAgICAgICAgICIgIyIsIGksICI6XG4iKTsKKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaiA9 IDA7IGogPCBzZWN0aW9uLnNpemUoKTsgKytqKSB7CisgICAgICAgICAgICAgICAgY2hhciBidWZb MzJdOworICAgICAgICAgICAgICAgIHNucHJpbnRmKGJ1Ziwgc2l6ZW9mKGJ1ZiksICIweCVseCIs IHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmc+KGJpdHdpc2VfY2FzdDx1aW50cHRyX3Q+KHNlY3Rp b24uZGF0YSgpICsgaikpKTsKKyAgICAgICAgICAgICAgICBkYXRhTG9nRigiICAgICUxNnM6IDB4 JTAxNmxseFxuIiwgYnVmLCBzdGF0aWNfY2FzdDxsb25nIGxvbmc+KHNlY3Rpb25bal0pKTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KIH0KIApJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2Z0bC9GVExKSVRDb2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTEpJVENvZGUuY3BwCShyZXZpc2lvbiAxNTcwNTgpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTEpJVENvZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0 OSwxMSBAQCB2b2lkIEpJVENvZGU6OmFkZEhhbmRsZShQYXNzUmVmUHRyPEV4ZWN1CiAgICAgbV9o YW5kbGVzLmFwcGVuZChoYW5kbGUpOwogfQogCit2b2lkIEpJVENvZGU6OmFkZERhdGFTZWN0aW9u KFJlZkNvdW50ZWRBcnJheTxMU2VjdGlvbldvcmQ+IGRhdGFTZWN0aW9uKQoreworICAgIG1fZGF0 YVNlY3Rpb25zLmFwcGVuZChkYXRhU2VjdGlvbik7Cit9CisKIHZvaWQgSklUQ29kZTo6aW5pdGlh bGl6ZUNvZGUoQ29kZVJlZiBlbnRyeXBvaW50KQogewogICAgIG1fZW50cnlwb2ludCA9IGVudHJ5 cG9pbnQ7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTEpJVENvZGUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTEpJVENvZGUuaAkocmV2aXNp b24gMTU3MDU4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExKSVRDb2RlLmgJKHdv cmtpbmcgY29weSkKQEAgLTM0LDkgKzM0LDEyIEBACiAjaW5jbHVkZSAiRlRMT1NSRXhpdC5oIgog I2luY2x1ZGUgIkpJVENvZGUuaCIKICNpbmNsdWRlIDx3dGYvTExWTUhlYWRlcnMuaD4KKyNpbmNs dWRlIDx3dGYvUmVmQ291bnRlZEFycmF5Lmg+CiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2Ug RlRMIHsKIAordHlwZWRlZiBpbnQ2NF90IExTZWN0aW9uV29yZDsgLy8gV2UgcmVmZXIgdG8gTExW TSBkYXRhIHNlY3Rpb25zIHVzaW5nIExTZWN0aW9uV29yZCosIGp1c3QgdG8gYmUgY2xlYXIgYWJv dXQgb3VyIGludGVuZGVkIGFsaWdubWVudCByZXN0cmljdGlvbnMuCisKIGNsYXNzIEpJVENvZGUg OiBwdWJsaWMgSlNDOjpKSVRDb2RlIHsKIHB1YmxpYzoKICAgICBKSVRDb2RlKCk7CkBAIC01MSw5 ICs1NCwxMSBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBpbml0aWFsaXplRXhpdFRodW5rcyhD b2RlUmVmKTsKICAgICB2b2lkIGFkZEhhbmRsZShQYXNzUmVmUHRyPEV4ZWN1dGFibGVNZW1vcnlI YW5kbGU+KTsKKyAgICB2b2lkIGFkZERhdGFTZWN0aW9uKFJlZkNvdW50ZWRBcnJheTxMU2VjdGlv bldvcmQ+KTsKICAgICB2b2lkIGluaXRpYWxpemVDb2RlKENvZGVSZWYgZW50cnlwb2ludCk7CiAg ICAgCiAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxFeGVjdXRhYmxlTWVtb3J5SGFuZGxlPiA+JiBo YW5kbGVzKCkgY29uc3QgeyByZXR1cm4gbV9oYW5kbGVzOyB9CisgICAgY29uc3QgVmVjdG9yPFJl ZkNvdW50ZWRBcnJheTxMU2VjdGlvbldvcmQ+ID4mIGRhdGFTZWN0aW9ucygpIGNvbnN0IHsgcmV0 dXJuIG1fZGF0YVNlY3Rpb25zOyB9CiAgICAgCiAgICAgQ29kZVB0ciBleGl0VGh1bmtzKCk7CiAg ICAgCkBAIC02NCw2ICs2OSw3IEBAIHB1YmxpYzoKICAgICBTZWdtZW50ZWRWZWN0b3I8T1NSRXhp dCwgOD4gb3NyRXhpdDsKICAgICAKIHByaXZhdGU6CisgICAgVmVjdG9yPFJlZkNvdW50ZWRBcnJh eTxMU2VjdGlvbldvcmQ+ID4gbV9kYXRhU2VjdGlvbnM7CiAgICAgVmVjdG9yPFJlZlB0cjxFeGVj dXRhYmxlTWVtb3J5SGFuZGxlPiA+IG1faGFuZGxlczsKICAgICBDb2RlUmVmIG1fZW50cnlwb2lu dDsKICAgICBDb2RlUmVmIG1fZXhpdFRodW5rczsK