Backed out changeset 31682547b6f1 - bug 517199 has shown persistent failure on Windows tinderboxes.
This commit is contained in:
@@ -443,8 +443,8 @@ js_string_uninterner(JSDHashTable *table, JSDHashEntryHdr *hdr,
|
||||
uint32 number, void *arg)
|
||||
{
|
||||
JSAtomHashEntry *entry = TO_ATOM_ENTRY(hdr);
|
||||
JSRuntime *rt = (JSRuntime *) arg;
|
||||
JSString *str = (JSString *) ATOM_ENTRY_KEY(entry);
|
||||
JSRuntime *rt = (JSRuntime *)arg;
|
||||
JSString *str;
|
||||
|
||||
/*
|
||||
* Any string entry that remains at this point must be initialized, as the
|
||||
@@ -452,7 +452,10 @@ js_string_uninterner(JSDHashTable *table, JSDHashEntryHdr *hdr,
|
||||
*/
|
||||
JS_ASSERT(IS_STRING_TABLE(table));
|
||||
JS_ASSERT(entry->keyAndFlags != 0);
|
||||
js_FinalizeStringRT(rt, str);
|
||||
str = (JSString *)ATOM_ENTRY_KEY(entry);
|
||||
|
||||
/* Pass null as context. */
|
||||
js_FinalizeStringRT(rt, str, js_GetExternalStringGCType(str), NULL);
|
||||
return JS_DHASH_NEXT;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user