From 8fbf5dd9e5bd38c2ade0384f8a7503f7cc1db8a4 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 24 Jul 2015 19:49:16 +0000
Subject: * vm_core.h: constify rb_iseq_constant_body::catch_table. * compile.c
 (iseq_set_exception_table): catch up this fix. * iseq.c: ditto. * vm.c
 (vm_exec): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 compile.c | 69 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 36 insertions(+), 33 deletions(-)

(limited to 'compile.c')

diff --git a/compile.c b/compile.c
index ec0867e561..ffc4965572 100644
--- a/compile.c
+++ b/compile.c
@@ -1714,44 +1714,47 @@ iseq_set_exception_table(rb_iseq_t *iseq)
     tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
     tptr = RARRAY_CONST_PTR(iseq->compile_data->catch_table_ary);
 
-    iseq->body->catch_table = 0;
     if (tlen > 0) {
-	iseq->body->catch_table = xmalloc(iseq_catch_table_bytes(tlen));
-	iseq->body->catch_table->size = tlen;
-    }
-
-    if (iseq->body->catch_table) for (i = 0; i < iseq->body->catch_table->size; i++) {
-	ptr = RARRAY_CONST_PTR(tptr[i]);
-	entry = &iseq->body->catch_table->entries[i];
-	entry->type = (enum catch_type)(ptr[0] & 0xffff);
-	entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
-	entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
-	entry->iseq = (rb_iseq_t *)ptr[3];
-
-	/* register iseq as mark object */
-	if (entry->iseq != 0) {
-	    iseq_add_mark_object(iseq, (VALUE)entry->iseq);
-	}
-
-	/* stack depth */
-	if (ptr[4]) {
-	    LABEL *lobj = (LABEL *)(ptr[4] & ~1);
-	    entry->cont = label_get_position(lobj);
-	    entry->sp = label_get_sp(lobj);
-
-	    /* TODO: Dirty Hack!  Fix me */
-	    if (entry->type == CATCH_TYPE_RESCUE ||
-		entry->type == CATCH_TYPE_BREAK ||
-		entry->type == CATCH_TYPE_NEXT) {
-		entry->sp--;
+	struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen));
+	table->size = tlen;
+
+	for (i = 0; i < table->size; i++) {
+	    ptr = RARRAY_CONST_PTR(tptr[i]);
+	    entry = &table->entries[i];
+	    entry->type = (enum catch_type)(ptr[0] & 0xffff);
+	    entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
+	    entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
+	    entry->iseq = (rb_iseq_t *)ptr[3];
+
+	    /* register iseq as mark object */
+	    if (entry->iseq != 0) {
+		iseq_add_mark_object(iseq, (VALUE)entry->iseq);
+	    }
+
+	    /* stack depth */
+	    if (ptr[4]) {
+		LABEL *lobj = (LABEL *)(ptr[4] & ~1);
+		entry->cont = label_get_position(lobj);
+		entry->sp = label_get_sp(lobj);
+
+		/* TODO: Dirty Hack!  Fix me */
+		if (entry->type == CATCH_TYPE_RESCUE ||
+		    entry->type == CATCH_TYPE_BREAK ||
+		    entry->type == CATCH_TYPE_NEXT) {
+		    entry->sp--;
+		}
+	    }
+	    else {
+		entry->cont = 0;
 	    }
 	}
-	else {
-	    entry->cont = 0;
-	}
+	iseq->body->catch_table = table;
+	RB_OBJ_WRITE(iseq, &iseq->compile_data->catch_table_ary, 0); /* free */
+    }
+    else {
+	iseq->body->catch_table = NULL;
     }
 
-    RB_OBJ_WRITE(iseq, &iseq->compile_data->catch_table_ary, 0); /* free */
     return COMPILE_OK;
 }
 
-- 
cgit v1.2.3