* vm_method.c: make a rb_method_definition_t data (def) *after* making

  a rb_method_entry_t data (me).
  Normally, `me' points `def'. Some Ruby objects pointed from `def'
  and objects are marked by `me' (mark_method_entry() in gc.c).
  However, `def' is built before making a `me', then nobody can mark
  objects pointed from `def' before making (and pointing from) `me'.
  I hope this patch solve #11244.
* vm_method.c: remove `rb_' prefix from some static functions.
* method.h (rb_method_entry_create): constify
* gc.c (mark_method_entry): add checking `def' and
  `def->body.iseq.iseqptr' availability because they can be NULL.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 27 insertions, 25 deletions

diff --git a/gc.c b/gc.c
index 2cd8c410e9..e9cebfa85c 100644
--- a/gc.c
+++ b/gc.c
@@ -3930,31 +3930,33 @@ mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me)
 
     gc_mark(objspace, me->klass);
 
-    switch (def->type) {
-      case VM_METHOD_TYPE_ISEQ:
-	gc_mark(objspace, def->body.iseq.iseqptr->self);
-	gc_mark(objspace, (VALUE)def->body.iseq.cref);
-	break;
-      case VM_METHOD_TYPE_ATTRSET:
-      case VM_METHOD_TYPE_IVAR:
-	gc_mark(objspace, def->body.attr.location);
-	break;
-      case VM_METHOD_TYPE_BMETHOD:
-	gc_mark(objspace, def->body.proc);
-	break;
-      case VM_METHOD_TYPE_ALIAS:
-	gc_mark(objspace, (VALUE)def->body.alias.original_me);
-	return;
-      case VM_METHOD_TYPE_REFINED:
-	gc_mark(objspace, (VALUE)def->body.refined.orig_me);
-	break;
-      case VM_METHOD_TYPE_CFUNC:
-      case VM_METHOD_TYPE_ZSUPER:
-      case VM_METHOD_TYPE_MISSING:
-      case VM_METHOD_TYPE_OPTIMIZED:
-      case VM_METHOD_TYPE_UNDEF:
-      case VM_METHOD_TYPE_NOTIMPLEMENTED:
-	break;
+    if (def) {
+	switch (def->type) {
+	  case VM_METHOD_TYPE_ISEQ:
+	    if (def->body.iseq.iseqptr) gc_mark(objspace, def->body.iseq.iseqptr->self);
+	    gc_mark(objspace, (VALUE)def->body.iseq.cref);
+	    break;
+	  case VM_METHOD_TYPE_ATTRSET:
+	  case VM_METHOD_TYPE_IVAR:
+	    gc_mark(objspace, def->body.attr.location);
+	    break;
+	  case VM_METHOD_TYPE_BMETHOD:
+	    gc_mark(objspace, def->body.proc);
+	    break;
+	  case VM_METHOD_TYPE_ALIAS:
+	    gc_mark(objspace, (VALUE)def->body.alias.original_me);
+	    return;
+	  case VM_METHOD_TYPE_REFINED:
+	    gc_mark(objspace, (VALUE)def->body.refined.orig_me);
+	    break;
+	  case VM_METHOD_TYPE_CFUNC:
+	  case VM_METHOD_TYPE_ZSUPER:
+	  case VM_METHOD_TYPE_MISSING:
+	  case VM_METHOD_TYPE_OPTIMIZED:
+	  case VM_METHOD_TYPE_UNDEF:
+	  case VM_METHOD_TYPE_NOTIMPLEMENTED:
+	    break;
+	}
     }
 }