Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Splat in compiledcode is always a fixnum

  • Loading branch information...
commit 0c8dde23fe0fe48d13b1611d52f9a8b60cd20119 1 parent 01e86d0
@dbussink dbussink authored
View
2  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();
View
4 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);
View
2  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);
View
2  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
View
2  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);
View
2  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
View
2  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()));
Please sign in to comment.
Something went wrong with that request. Please try again.