* variable.c (rb_global_entry): not add global entry until
initialized to avoid accessing it while GC. [ruby-dev:18514] * variable.c (rb_alias_variable): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
eddaabb165
commit
2ba2dba5be
@ -1,3 +1,10 @@
|
|||||||
|
Wed Oct 16 13:36:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
|
* variable.c (rb_global_entry): not add global entry until
|
||||||
|
initialized to avoid accessing it while GC. [ruby-dev:18514]
|
||||||
|
|
||||||
|
* variable.c (rb_alias_variable): ditto.
|
||||||
|
|
||||||
Sat Oct 12 23:44:11 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
Sat Oct 12 23:44:11 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
* win32/win32.c (rb_w32_putc): wrong condition to fill or flush on
|
* win32/win32.c (rb_w32_putc): wrong condition to fill or flush on
|
||||||
|
@ -354,7 +354,6 @@ rb_global_entry(id)
|
|||||||
if (!st_lookup(rb_global_tbl, id, &entry)) {
|
if (!st_lookup(rb_global_tbl, id, &entry)) {
|
||||||
struct global_variable *var;
|
struct global_variable *var;
|
||||||
entry = ALLOC(struct global_entry);
|
entry = ALLOC(struct global_entry);
|
||||||
st_add_direct(rb_global_tbl, id, entry);
|
|
||||||
var = ALLOC(struct global_variable);
|
var = ALLOC(struct global_variable);
|
||||||
entry->id = id;
|
entry->id = id;
|
||||||
entry->var = var;
|
entry->var = var;
|
||||||
@ -366,6 +365,7 @@ rb_global_entry(id)
|
|||||||
|
|
||||||
var->block_trace = 0;
|
var->block_trace = 0;
|
||||||
var->trace = 0;
|
var->trace = 0;
|
||||||
|
st_add_direct(rb_global_tbl, id, entry);
|
||||||
}
|
}
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
@ -768,8 +768,8 @@ rb_alias_variable(name1, name2)
|
|||||||
entry2 = rb_global_entry(name2);
|
entry2 = rb_global_entry(name2);
|
||||||
if (!st_lookup(rb_global_tbl, name1, &entry1)) {
|
if (!st_lookup(rb_global_tbl, name1, &entry1)) {
|
||||||
entry1 = ALLOC(struct global_entry);
|
entry1 = ALLOC(struct global_entry);
|
||||||
st_add_direct(rb_global_tbl, name1, entry1);
|
|
||||||
entry1->id = name1;
|
entry1->id = name1;
|
||||||
|
st_add_direct(rb_global_tbl, name1, entry1);
|
||||||
}
|
}
|
||||||
else if (entry1->var != entry2->var) {
|
else if (entry1->var != entry2->var) {
|
||||||
struct global_variable *var = entry1->var;
|
struct global_variable *var = entry1->var;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user