Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: runtime/vm/runtime_entry_mips.cc

Issue 23672011: Fix the previously ineffective assert checking the number of arguments passed to (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/runtime_entry_ia32.cc ('k') | runtime/vm/runtime_entry_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/runtime_entry_mips.cc
===================================================================
--- runtime/vm/runtime_entry_mips.cc (revision 26825)
+++ runtime/vm/runtime_entry_mips.cc (working copy)
@@ -21,7 +21,7 @@
// SP : points to the arguments and return value array.
// S5 : address of the runtime function to call.
// S4 : number of arguments to the call.
-void RuntimeEntry::Call(Assembler* assembler) const {
+void RuntimeEntry::Call(Assembler* assembler, intptr_t argument_count) const {
// Compute the effective address. When running under the simulator,
// this is a redirection address that forces the simulator to call
// into the runtime system.
@@ -29,23 +29,26 @@
#if defined(USING_SIMULATOR)
// Redirection to leaf runtime calls supports a maximum of 4 arguments passed
// in registers (maximum 2 double arguments for leaf float runtime calls).
- ASSERT(argument_count() >= 0);
+ ASSERT(argument_count >= 0);
ASSERT(!is_leaf() ||
- (!is_float() && (argument_count() <= 4)) ||
- (argument_count() <= 2));
+ (!is_float() && (argument_count <= 4)) ||
+ (argument_count <= 2));
Simulator::CallKind call_kind =
is_leaf() ? (is_float() ? Simulator::kLeafFloatRuntimeCall
: Simulator::kLeafRuntimeCall)
: Simulator::kRuntimeCall;
entry =
- Simulator::RedirectExternalReference(entry, call_kind, argument_count());
+ Simulator::RedirectExternalReference(entry, call_kind, argument_count);
#endif
if (is_leaf()) {
+ ASSERT(argument_count == this->argument_count());
ExternalLabel label(name(), entry);
__ BranchLink(&label);
} else {
+ // Argument count is not checked here, but in the runtime entry for a more
+ // informative error message.
__ LoadImmediate(S5, entry);
- __ LoadImmediate(S4, argument_count());
+ __ LoadImmediate(S4, argument_count);
__ BranchLink(&StubCode::CallToRuntimeLabel());
}
}
« no previous file with comments | « runtime/vm/runtime_entry_ia32.cc ('k') | runtime/vm/runtime_entry_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698