Commit351d369

committed

Fixed the issue where gc was triggered during the attribute search process and a hashmap was recreated.

JerryScript-DCO-1.0-Signed-off-by: tangbin 2387440390@qq.com

1 parent5020015 commit351d369Copy full SHA for 351d369

File tree

+26

-1

lines changed

+26

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2109,6 +2109,7 @@ ecma_gc_free_object (ecma_object_t object_p) /< object to free /`
`2109`	`2109`	`void`
`2110`	`2110`	`ecma_gc_run (void)`
`2111`	`2111`	`{`
	`2112`	`+JERRY_CONTEXT(running_gc_count)++;`
`2112`	`2113`	`#if (JERRY_GC_MARK_LIMIT!=0)`
`2113`	`2114`	`JERRY_ASSERT (JERRY_CONTEXT (ecma_gc_mark_recursion_limit)==JERRY_GC_MARK_LIMIT);`
`2114`	`2115`	`#endif/* (JERRY_GC_MARK_LIMIT != 0) */`
`@@ -2235,6 +2236,7 @@ ecma_gc_run (void)`
`2235`	`2236`	`/* Free RegExp bytecodes stored in cache */`
`2236`	`2237`	`re_cache_gc ();`
`2237`	`2238`	`#endif/* JERRY_BUILTIN_REGEXP */`
	`2239`	`+JERRY_CONTEXT(running_gc_count)--;`
`2238`	`2240`	`}/* ecma_gc_run */`
`2239`	`2241`
`2240`	`2242`	`/**`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ ecma_find_named_property (ecma_object_t obj_p, /*< object to find property in`
`729`	`729`	`}`
`730`	`730`
`731`	`731`	`#ifJERRY_PROPERTY_HASHMAP`
`732`		`-if (steps >= (ECMA_PROPERTY_HASMAP_MINIMUM_SIZE /2))`
	`732`	`+if (steps >= (ECMA_PROPERTY_HASMAP_MINIMUM_SIZE /2)&&JERRY_CONTEXT(running_gc_count)==0)`
`733`	`733`	`{`
`734`	`734`	`ecma_property_hashmap_create (obj_p);`
`735`	`735`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ struct jerry_context_t`
`156`	`156`	`jerry_external_string_free_cb_texternal_string_free_callback_p;/*< free callback for external strings /`
`157`	`157`	`voiderror_object_created_callback_user_p;/< user pointer for error_object_update_callback_p /`
`158`	`158`	`jerry_error_object_created_cb_terror_object_created_callback_p;/*< decorator callback for Error objects /`
	`159`	`+uint32_trunning_gc_count;/*< The current status of gc /`
`159`	`160`	`size_tecma_gc_objects_number;/*< number of currently allocated objects /`
`160`	`161`	`size_tecma_gc_new_objects;/*< number of newly allocated objects since last GC session /`
`161`	`162`	`size_tjmem_heap_allocated_size;/*< size of allocated regions /`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ jmem_heap_init (void)`
`103`	`103`	`JMEM_VALGRIND_NOACCESS_SPACE (JERRY_HEAP_CONTEXT (area),JMEM_HEAP_AREA_SIZE);`
`104`	`104`
`105`	`105`	`#endif/* !JERRY_SYSTEM_ALLOCATOR */`
	`106`	`+JERRY_CONTEXT(running_gc_count)=0;`
`106`	`107`	`JMEM_HEAP_STAT_INIT ();`
`107`	`108`	`}/* jmem_heap_init */`
`108`	`109`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+// Copyright JS Foundation and other contributors, http://js.foundation`
	`2`	`+//`
	`3`	`+// Licensed under the Apache License, Version 2.0 (the "License");`
	`4`	`+// you may not use this file except in compliance with the License.`
	`5`	`+// You may obtain a copy of the License at`
	`6`	`+//`
	`7`	`+// http://www.apache.org/licenses/LICENSE-2.0`
	`8`	`+//`
	`9`	`+// Unless required by applicable law or agreed to in writing, software`
	`10`	`+// distributed under the License is distributed on an "AS IS" BASIS`
	`11`	`+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
	`12`	`+// See the License for the specific language governing permissions and`
	`13`	`+// limitations under the License.`
	`14`	`+`
	`15`	`+vara=[];`
	`16`	`+for(varv=0;v<256;v++){`
	`17`	`+varn=Object.create(null);`
	`18`	`+a.push(n,a);`
	`19`	`+n=newWeakSet(a);`
	`20`	`+n.o=1;`
	`21`	`+}`

Comments

(0)