Splat in compiledcode is always a fixnum

rubinius · Mar 24, 2013 · 0c8dde2 · 0c8dde2
1 parent 01e86d0
commit 0c8dde2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/vm/builtin/block_as_method.cpp b/vm/builtin/block_as_method.cpp
@@ -26,7 +26,7 @@ namespace rubinius {
   {
     BlockAsMethod* bm = as<BlockAsMethod>(exec);
 
-    Object* splat = bm->block_env()->compiled_code()->splat();
+    Fixnum* splat = bm->block_env()->compiled_code()->splat();
     size_t required = bm->block_env()->compiled_code()->required_args()->to_native();
     size_t total_args = bm->block_env()->compiled_code()->total_args()->to_native();
 

diff --git a/vm/builtin/compiledcode.hpp b/vm/builtin/compiledcode.hpp
@@ -29,7 +29,7 @@ namespace rubinius {
     Fixnum* required_args_;     // slot
     Fixnum* post_args_;         // slot
     Fixnum* total_args_;        // slot
-    Object* splat_;             // slot
+    Fixnum* splat_;             // slot
     Tuple* lines_;              // slot
     Tuple* local_names_;        // slot
     Symbol* file_;              // slot
@@ -72,7 +72,7 @@ namespace rubinius {
     attr_accessor(required_args, Fixnum);
     attr_accessor(post_args, Fixnum);
     attr_accessor(total_args, Fixnum);
-    attr_accessor(splat, Object);
+    attr_accessor(splat, Fixnum);
     attr_accessor(literals, Tuple);
     attr_accessor(lines, Tuple);
     attr_accessor(local_names, Tuple);

diff --git a/vm/llvm/types32.cpp.gen b/vm/llvm/types32.cpp.gen
@@ -414,7 +414,7 @@ StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
-StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_9);
+StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_16);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_16);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_8);

diff --git a/vm/llvm/types32.ll b/vm/llvm/types32.ll
@@ -204,7 +204,7 @@ declare void @output16(%"struct.rubinius::Class"*)
                   %"struct.rubinius::Fixnum"*, ; required_args
                   %"struct.rubinius::Fixnum"*, ; post_args
                   %"struct.rubinius::Fixnum"*, ; total_args
-                  %"struct.rubinius::Object"*, ; splat
+                  %"struct.rubinius::Fixnum"*, ; splat
                    %"struct.rubinius::Tuple"*, ; lines
                    %"struct.rubinius::Tuple"*, ; local_names
                   %"struct.rubinius::Symbol"*, ; file

diff --git a/vm/llvm/types64.cpp.gen b/vm/llvm/types64.cpp.gen
@@ -414,7 +414,7 @@ StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
-StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_9);
+StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_15);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_16);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_16);
 StructTy_struct_rubinius__CompiledCode_fields.push_back(PointerTy_8);

diff --git a/vm/llvm/types64.ll b/vm/llvm/types64.ll
@@ -204,7 +204,7 @@ declare void @output16(%"struct.rubinius::Class"*)
                   %"struct.rubinius::Fixnum"*, ; required_args
                   %"struct.rubinius::Fixnum"*, ; post_args
                   %"struct.rubinius::Fixnum"*, ; total_args
-                  %"struct.rubinius::Object"*, ; splat
+                  %"struct.rubinius::Fixnum"*, ; splat
                    %"struct.rubinius::Tuple"*, ; lines
                    %"struct.rubinius::Tuple"*, ; local_names
                   %"struct.rubinius::Symbol"*, ; file

diff --git a/vm/marshal.cpp b/vm/marshal.cpp
@@ -235,7 +235,7 @@ namespace rubinius {
     code->required_args(state, reinterpret_cast<Fixnum*>(unmarshal()));
     code->post_args(state, reinterpret_cast<Fixnum*>(unmarshal()));
     code->total_args(state, reinterpret_cast<Fixnum*>(unmarshal()));
-    code->splat(state, unmarshal());
+    code->splat(state, reinterpret_cast<Fixnum*>(unmarshal()));
     code->literals(state, reinterpret_cast<Tuple*>(unmarshal()));
     code->lines(state, reinterpret_cast<Tuple*>(unmarshal()));
     code->file(state, reinterpret_cast<Symbol*>(unmarshal()));