corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1033442 - Remove non-pod malloc from MallocProvider and AllocPolicy; r=jonco

Browse Source
This commit is contained in:
Terrence Cole
2014-08-08 13:22:39 -07:00
parent cb3f1f30ae
commit 141bb16882
30 changed files with 193 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/jsiter.cpp
View File

@@ -381,7 +381,7 @@ js::VectorToIdArray(JSContext *cx, AutoIdVector &props, JSIdArray **idap)
size_t len = props.length();
size_t idsz = len * sizeof(jsid);
size_t sz = (sizeof(JSIdArray) - sizeof(jsid)) + idsz;
JSIdArray *ida = static_cast<JSIdArray *>(cx->malloc_(sz));
JSIdArray *ida = reinterpret_cast<JSIdArray *>(cx->zone()->pod_malloc<uint8_t>(sz));
if (!ida)
return false;
@@ -499,12 +499,14 @@ NativeIterator *
NativeIterator::allocateIterator(JSContext *cx, uint32_t slength, const AutoIdVector &props)
{
size_t plength = props.length();
NativeIterator *ni = (NativeIterator *)
cx->malloc_(sizeof(NativeIterator)
+ plength * sizeof(JSString *)
+ slength * sizeof(Shape *));
if (!ni)
size_t nbytes = sizeof(NativeIterator) +
plength * sizeof(JSString *) +
slength * sizeof(Shape *);
uint8_t *bytes = cx->zone()->pod_malloc<uint8_t>(nbytes);
if (!bytes)
return nullptr;
NativeIterator *ni = (NativeIterator *)bytes;
AutoValueVector strings(cx);
ni->props_array = ni->props_cursor = (HeapPtrFlatString *) (ni + 1);
ni->props_end = ni->props_array + plength;