kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

No new entry when getting undefined global variable

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-11-25 04:05:09 +00:00
parent 7ac1ff5fb7
commit 98f8baf944
1 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
variable.c
View file

@ -483,13 +483,25 @@ struct rb_global_variable {
struct trace_var *trace; struct trace_var *trace;
}; };
MJIT_FUNC_EXPORTED struct rb_global_entry* static struct rb_global_entry*
rb_global_entry(ID id) rb_find_global_entry(ID id)
{ {
struct rb_global_entry *entry; struct rb_global_entry *entry;
VALUE data; VALUE data;
if (!rb_id_table_lookup(rb_global_tbl, id, &data)) { if (!rb_id_table_lookup(rb_global_tbl, id, &data)) {
return NULL;
}
entry = (struct rb_global_entry *)data;
ASSUME(entry != NULL);
return entry;
}
MJIT_FUNC_EXPORTED struct rb_global_entry*
rb_global_entry(ID id)
{
struct rb_global_entry *entry = rb_find_global_entry(id);
if (!entry) {
struct rb_global_variable *var; struct rb_global_variable *var;
entry = ALLOC(struct rb_global_entry); entry = ALLOC(struct rb_global_entry);
var = ALLOC(struct rb_global_variable); var = ALLOC(struct rb_global_variable);
@ -505,9 +517,6 @@ rb_global_entry(ID id)
var->trace = 0; var->trace = 0;
rb_id_table_insert(rb_global_tbl, id, (VALUE)entry); rb_id_table_insert(rb_global_tbl, id, (VALUE)entry);
} }
else {
entry = (struct rb_global_entry *)data;
}
return entry; return entry;
} }
@ -620,6 +629,27 @@ global_id(const char *name)
return id; return id;
} }
static ID
find_global_id(const char *name)
{
ID id;
size_t len = strlen(name);
if (name[0] == '$') {
id = rb_check_id_cstr(name, len, NULL);
}
else {
VALUE vbuf = 0;
char *buf = ALLOCV_N(char, vbuf, len+1);
buf[0] = '$';
memcpy(buf+1, name, len);
id = rb_check_id_cstr(buf, len+1, NULL);
ALLOCV_END(vbuf);
}
return id;
}
void void
rb_define_hooked_variable( rb_define_hooked_variable(
const char *name, const char *name,
@ -858,8 +888,14 @@ VALUE
rb_gv_get(const char *name) rb_gv_get(const char *name)
{ {
struct rb_global_entry *entry; struct rb_global_entry *entry;
ID id = find_global_id(name);
entry = rb_global_entry(global_id(name)); if (!id) {
rb_warning("global variable `%s' not initialized", name);
return Qnil;
}
entry = rb_global_entry(id);
return rb_gvar_get(entry); return rb_gvar_get(entry);
} }