This commit is contained in:
@@ -1154,6 +1154,85 @@ PH7_PRIVATE sxi32 PH7_HashmapDup(ph7_hashmap *pSrc, ph7_hashmap *pDest) {
|
||||
pDest->bIdxExhausted = pSrc->bIdxExhausted;
|
||||
return SXRET_OK;
|
||||
}
|
||||
/*
|
||||
* Recoverable declaration snapshots. Ordinary array stores recursively copy
|
||||
* through the execution allocator; registration must also handle a failed
|
||||
* allocation before a node has been linked, without invoking the VM fatal path.
|
||||
*/
|
||||
PH7_PRIVATE sxi32 PH7_MemObjSnapshot(ph7_value *pSrc, ph7_value *pDest) {
|
||||
ph7_vm *pVm = pDest->pVm;
|
||||
ph7_hashmap *pSrcMap, *pMap;
|
||||
ph7_hashmap_node *pEntry;
|
||||
sxi32 rc;
|
||||
if((pSrc->nType & MEMOBJ_HASHMAP) == 0 || pSrc->x.pOther == 0) {
|
||||
return PH7_MemObjStore(pSrc, pDest);
|
||||
}
|
||||
pSrcMap = (ph7_hashmap *)pSrc->x.pOther;
|
||||
pMap = PH7_NewHashmap(pVm, 0, 0);
|
||||
if(pMap == 0) {
|
||||
return SXERR_MEM;
|
||||
}
|
||||
pDest->x.pOther = pMap;
|
||||
pDest->nType = pSrc->nType;
|
||||
pDest->nDeclaredType = pSrc->nDeclaredType;
|
||||
for(pEntry = pSrcMap->pFirst; pEntry; pEntry = pEntry->pPrev) {
|
||||
ph7_value sCopy, *pValue;
|
||||
ph7_hashmap_node *pNode;
|
||||
sxu32 nIdx, nHash;
|
||||
PH7_MemObjInit(pVm, &sCopy);
|
||||
rc = PH7_MemObjSnapshot(HashmapExtractNodeValue(pEntry), &sCopy);
|
||||
if(rc != SXRET_OK) {
|
||||
PH7_MemObjRelease(&sCopy);
|
||||
return rc;
|
||||
}
|
||||
pValue = PH7_ReserveMemObj(pVm);
|
||||
if(pValue == 0) {
|
||||
PH7_MemObjRelease(&sCopy);
|
||||
return SXERR_MEM;
|
||||
}
|
||||
nIdx = pValue->nIdx;
|
||||
/* Transfer the owned snapshot; do not trigger another recursive copy. */
|
||||
PH7_MemObjLoad(&sCopy, pValue);
|
||||
/* Strings loaded read-only must outlive sCopy. */
|
||||
if(SyBlobLength(&sCopy.sBlob)) {
|
||||
SyBlobRelease(&pValue->sBlob);
|
||||
rc = SyBlobDup(&sCopy.sBlob, &pValue->sBlob);
|
||||
}
|
||||
PH7_MemObjRelease(&sCopy);
|
||||
if(rc != SXRET_OK) {
|
||||
PH7_VmDestroyMemObj(pVm, pValue);
|
||||
return rc;
|
||||
}
|
||||
if(pEntry->iType == HASHMAP_BLOB_NODE) {
|
||||
nHash = pMap->xBlobHash(SyBlobData(&pEntry->xKey.sKey), SyBlobLength(&pEntry->xKey.sKey));
|
||||
pNode = HashmapNewBlobNode(pMap, SyBlobData(&pEntry->xKey.sKey), SyBlobLength(&pEntry->xKey.sKey), nHash, nIdx);
|
||||
} else {
|
||||
nHash = pMap->xIntHash(pEntry->xKey.iKey);
|
||||
pNode = HashmapNewIntNode(pMap, pEntry->xKey.iKey, nHash, nIdx);
|
||||
}
|
||||
rc = pNode && (pNode->iType != HASHMAP_BLOB_NODE ||
|
||||
SyBlobLength(&pNode->xKey.sKey) == SyBlobLength(&pEntry->xKey.sKey)) ?
|
||||
HashmapGrowBucket(pMap) : SXERR_MEM;
|
||||
if(rc == SXRET_OK) {
|
||||
rc = PH7_VmRefObjInstall(pVm, nIdx, 0, pNode, 0);
|
||||
}
|
||||
if(rc != SXRET_OK) {
|
||||
if(pNode) {
|
||||
if(pNode->iType == HASHMAP_BLOB_NODE) {
|
||||
SyBlobRelease(&pNode->xKey.sKey);
|
||||
}
|
||||
SyMemBackendPoolFree(&pVm->sAllocator, pNode);
|
||||
}
|
||||
PH7_VmDestroyMemObj(pVm, (ph7_value *)SySetAt(&pVm->aMemObj, nIdx));
|
||||
return rc;
|
||||
}
|
||||
HashmapNodeLink(pMap, pNode, nHash & (pMap->nSize - 1));
|
||||
}
|
||||
pMap->iNextIdx = pSrcMap->iNextIdx;
|
||||
pMap->bIdxExhausted = pSrcMap->bIdxExhausted;
|
||||
pMap->nDeclaredType = pSrcMap->nDeclaredType;
|
||||
return SXRET_OK;
|
||||
}
|
||||
/*
|
||||
* Perform the union of two hashmaps.
|
||||
* This operation is performed only if the user uses the '+' operator
|
||||
|
||||
Reference in New Issue
Block a user