From: Eric Wong <normalperson@...>
Date: 2012-12-29T16:09:44+09:00
Subject: [ruby-core:51185] Re: [ruby-trunk - Bug #7629][Open] Segmentation fault

"atd (Antonio Tapiador)" <atapiador@dit.upm.es> wrote:
> https://bugs.ruby-lang.org/issues/7629
> 
> ruby 1.9.3p362 produces a segmentation fault in our tests in Travis.
> 
> You can find a full trace of the bug at https://travis-ci.org/ging/social_stream/jobs/3843546

Can you try reverting the vm.c change of r38314?
(I just identified with "git bisect", not sure what the correct fix is)

commit 190156054e33bc3b3bdd9e7965a1fe4a8cd50ebf
Author: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date:   Tue Dec 11 08:51:25 2012 +0000

    [Backport #5634]
    
    * vm.c (rb_vm_make_env_object): make Proc object if Env is possible
      to point block. [ruby-core:41038] [ruby-trunk - Bug #5634]
    
    * vm.c (rb_vm_make_proc): No need to make Proc object here.
    
    * bootstraptest/test_proc.rb: add tests.
    
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

diff --git a/vm.c b/vm.c
index 4dd242f..63141ba 100644
--- a/vm.c
+++ b/vm.c
@@ -467,30 +467,16 @@ vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary)
     }
 }
 
-static VALUE vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block);
-
 VALUE
 rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
 {
     VALUE envval;
-    VALUE *lfp;
-    rb_block_t *blockptr;
 
     if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) {
 	/* for method_missing */
 	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
 
-    lfp = cfp->lfp;
-    blockptr = GC_GUARDED_PTR_REF(lfp[0]);
-
-    if (blockptr && !(lfp[0] & 0x02)) {
-	VALUE blockprocval = vm_make_proc_from_block(th, blockptr);
-	rb_proc_t *p;
-	GetProcPtr(blockprocval, p);
-	lfp[0] = GC_GUARDED_PTR(&p->block);
-    }
-
     envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp);
     rb_vm_rewrite_dfp_in_errinfo(th);
 
@@ -559,6 +545,16 @@ rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass)
 	rb_bug("rb_vm_make_proc: Proc value is already created.");
     }
 
+    if (GC_GUARDED_PTR_REF(cfp->lfp[0])) {
+	rb_proc_t *p;
+
+	blockprocval = vm_make_proc_from_block(
+	    th, (rb_block_t *)GC_GUARDED_PTR_REF(*cfp->lfp));
+
+	GetProcPtr(blockprocval, p);
+	*cfp->lfp = GC_GUARDED_PTR(&p->block);
+    }
+
     envval = rb_vm_make_env_object(th, cfp);
 
     if (PROCDEBUG) {