0
@@ -75,7 +75,8 @@ class TestInstructions : public CxxTest::TestSuite {
0
         fd.puts "cm->stack_size = Object::i2n(10);"
0
         fd.puts "cm->local_count = Object::i2n(0);"
0
         fd.puts "cm->literals = Tuple::create(state, 10);"
0
-        fd.puts "MethodContext* ctx = task->generate_context(Qnil, cm, cm->vmmethod(state));"
0
+        fd.puts "cm->formalize(state);"
0
+        fd.puts "MethodContext* ctx = task->generate_context(Qnil, cm);"
0
         fd.puts "task->make_active(ctx);"
0
         # The += 0 disable unused variable warnings.
0
         fd.puts "Tuple* stack = task->stack; stack += 0;"
0
@@ -2306,7 +2307,8 @@ CODE
0
   def test_send_method
0
     <<-CODE
0
     CompiledMethod* target = CompiledMethod::create(state);
0
-    target->iseq = InstructionSequence::create(state, 0);
0
+    target->iseq = InstructionSequence::create(state, 1);
0
+    target->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     target->total_args = Object::i2n(0);
0
     target->required_args = target->total_args;
0
     target->stack_size = Object::i2n(10);
0
@@ -2320,6 +2322,8 @@ CODE
0
 
0
     stream[1] = (opcode)0;
0
 
0
+    target->formalize(state);
0
+
0
     run();
0
 
0
     TS_ASSERT_EQUALS(task->active->cm, target);
0
@@ -2398,7 +2402,8 @@ CODE
0
   def test_send_stack
0
     <<-CODE
0
     CompiledMethod* target = CompiledMethod::create(state);
0
-    target->iseq = InstructionSequence::create(state, 0);
0
+    target->iseq = InstructionSequence::create(state, 1);
0
+    target->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     target->total_args = Object::i2n(1);
0
     target->required_args = target->total_args;
0
     target->stack_size = Object::i2n(1);
0
@@ -2414,6 +2419,8 @@ CODE
0
     stream[1] = (opcode)0;
0
     stream[2] = (opcode)1;
0
 
0
+    target->formalize(state);
0
+
0
     run();
0
 
0
     MethodContext* s = task->active->sender;
0
@@ -2472,7 +2479,8 @@ CODE
0
   def test_send_stack_with_block
0
     <<-CODE
0
     CompiledMethod* target = CompiledMethod::create(state);
0
-    target->iseq = InstructionSequence::create(state, 0);
0
+    target->iseq = InstructionSequence::create(state, 1);
0
+    target->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     target->total_args = Object::i2n(1);
0
     target->required_args = target->total_args;
0
     target->stack_size = Object::i2n(1);
0
@@ -2491,6 +2499,8 @@ CODE
0
     stream[1] = (opcode)0;
0
     stream[2] = (opcode)1;
0
 
0
+    target->formalize(state);
0
+
0
     run();
0
 
0
     TS_ASSERT_EQUALS(task->active->cm, target);
0
@@ -2563,7 +2573,8 @@ CODE
0
   def test_send_stack_with_splat
0
     <<-CODE
0
     CompiledMethod* target = CompiledMethod::create(state);
0
-    target->iseq = InstructionSequence::create(state, 0);
0
+    target->iseq = InstructionSequence::create(state, 1);
0
+    target->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     target->total_args = Object::i2n(2);
0
     target->required_args = target->total_args;
0
     target->stack_size = Object::i2n(2);
0
@@ -2586,6 +2597,8 @@ CODE
0
     stream[1] = (opcode)0;
0
     stream[2] = (opcode)1;
0
 
0
+    target->formalize(state);
0
+
0
     run();
0
 
0
     TS_ASSERT_EQUALS(task->active->cm, target);
0
@@ -2638,7 +2651,8 @@ CODE
0
   def test_send_super_stack_with_block
0
     <<-CODE
0
     CompiledMethod* target = CompiledMethod::create(state);
0
-    target->iseq = InstructionSequence::create(state, 0);
0
+    target->iseq = InstructionSequence::create(state, 1);
0
+    target->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     target->total_args = Object::i2n(1);
0
     target->required_args = target->total_args;
0
     target->stack_size = Object::i2n(1);
0
@@ -2668,6 +2682,8 @@ CODE
0
     stream[1] = (opcode)0;
0
     stream[2] = (opcode)1;
0
 
0
+    target->formalize(state);
0
+
0
     run();
0
 
0
     TS_ASSERT_EQUALS(task->active->cm, target);
0
@@ -2731,7 +2747,8 @@ CODE
0
   def test_send_super_stack_with_splat
0
     <<-CODE
0
     CompiledMethod* target = CompiledMethod::create(state);
0
-    target->iseq = InstructionSequence::create(state, 0);
0
+    target->iseq = InstructionSequence::create(state, 1);
0
+    target->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     target->total_args = Object::i2n(2);
0
     target->required_args = target->total_args;
0
     target->stack_size = Object::i2n(2);
0
@@ -2765,6 +2782,8 @@ CODE
0
     stream[1] = (opcode)0;
0
     stream[2] = (opcode)1;
0
 
0
+    target->formalize(state);
0
+
0
     run();
0
 
0
     TS_ASSERT_EQUALS(task->active->cm, target);

0
@@ -21,7 +21,7 @@ class TestCompiledMethod : public CxxTest::TestSuite {
0
 
0
   void test_startup_tramp() {
0
     CompiledMethod* cm = CompiledMethod::generate_tramp(state);
0
-    VMMethod* vmm = cm->vmmethod(state);
0
+    VMMethod* vmm = cm->formalize(state);
0
 
0
     TS_ASSERT_EQUALS(vmm->opcodes[0], static_cast<unsigned int>(InstructionSequence::insn_halt));
0
     TS_ASSERT(!cm->scope->nil_p());

0
@@ -34,10 +34,13 @@ class TestMessage : public CxxTest::TestSuite {
0
 
0
   CompiledMethod* create_cm() {
0
     CompiledMethod* cm = CompiledMethod::create(state);
0
-    cm->iseq = InstructionSequence::create(state, 40);
0
+    cm->iseq = InstructionSequence::create(state, 1);
0
+    cm->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     cm->stack_size = Object::i2n(10);
0
     cm->total_args = Object::i2n(0);
0
     cm->required_args = cm->total_args;
0
+    cm->formalize(state);
0
+
0
     return cm;
0
   }
0
 

0
@@ -23,10 +23,14 @@ class TestTask : public CxxTest::TestSuite {
0
 
0
   CompiledMethod* create_cm() {
0
     CompiledMethod* cm = CompiledMethod::create(state);
0
-    cm->iseq = InstructionSequence::create(state, 40);
0
+    cm->iseq = InstructionSequence::create(state, 1);
0
+    cm->iseq->opcodes->put(state, 0, Object::i2n(InstructionSequence::insn_ret));
0
     cm->stack_size = Object::i2n(10);
0
     cm->total_args = Object::i2n(0);
0
     cm->required_args = cm->total_args;
0
+
0
+    cm->formalize(state);
0
+
0
     return cm;
0
   }
0