Created
July 8, 2009 04:05
-
-
Save mvr/142571 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vm/llvm/inline.cpp b/vm/llvm/inline.cpp | |
index 39174f6..e4eabd7 100644 | |
--- a/vm/llvm/inline.cpp | |
+++ b/vm/llvm/inline.cpp | |
@@ -148,12 +148,12 @@ namespace rubinius { | |
case InstructionSequence::insn_push_int: | |
val = ops_.constant(Fixnum::from(stream[1])); | |
break; | |
- case InstructionSequence::insn_push_literal: | |
+ case InstructionSequence::insn_push_literal: { | |
Symbol* sym = try_as<Symbol>(cm->literals()->at(stream[1])); | |
assert(sym); | |
val = ops_.constant(sym); | |
- break; | |
+ } break; | |
case InstructionSequence::insn_meta_push_0: | |
val = ops_.constant(Fixnum::from(0)); | |
break; | |
diff --git a/vm/llvm/inline_primitive.cpp b/vm/llvm/inline_primitive.cpp | |
index 19ba347..3ad873b 100644 | |
--- a/vm/llvm/inline_primitive.cpp | |
+++ b/vm/llvm/inline_primitive.cpp | |
@@ -170,7 +170,7 @@ namespace rubinius { | |
} | |
bool Inliner::inline_primitive(Class* klass, CompiledMethod* cm, executor prim) { | |
- char* inlined_prim = 0; | |
+ const char* inlined_prim = 0; | |
if(prim == Primitives::tuple_at && count_ == 1) { | |
inlined_prim = "tuple_at"; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment