Created
August 3, 2009 20:32
-
-
Save dbussink/160815 to your computer and use it in GitHub Desktop.
This file contains hidden or 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/vmmethod.cpp b/vm/vmmethod.cpp | |
index 5f915c1..8dd7b37 100644 | |
--- a/vm/vmmethod.cpp | |
+++ b/vm/vmmethod.cpp | |
@@ -547,17 +547,12 @@ namespace rubinius { | |
frame->cm = cm; | |
frame->scope = scope; | |
- | |
#ifdef RBX_PROFILER | |
if(unlikely(state->shared.profiling())) { | |
profiler::MethodEntry method(state, msg, args, cm); | |
- return (*vmm->run)(state, vmm, frame, args); | |
- } else { | |
- return (*vmm->run)(state, vmm, frame, args); | |
} | |
-#else | |
- return (*vmm->run)(state, vmm, frame, args); | |
#endif | |
+ return (*vmm->run)(state, vmm, frame, args); | |
} | |
/** @todo Is this redundant after having gone through set_argument_handler? --rue */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment