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

Unified Diff: runtime/vm/runtime_entry_ia32.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_arm.cc ('k') | runtime/vm/runtime_entry_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/runtime_entry_ia32.cc
===================================================================
--- runtime/vm/runtime_entry_ia32.cc (revision 26825)
+++ runtime/vm/runtime_entry_ia32.cc (working copy)
@@ -23,14 +23,17 @@
// EDX : number of arguments to the call.
// For leaf calls the caller is responsible to setup the arguments
// and look for return values based on the C calling convention.
-void RuntimeEntry::Call(Assembler* assembler) const {
- if (!is_leaf()) {
+void RuntimeEntry::Call(Assembler* assembler, intptr_t argument_count) const {
+ if (is_leaf()) {
+ ASSERT(argument_count == this->argument_count());
+ ExternalLabel label(name(), GetEntryPoint());
+ __ call(&label);
+ } else {
+ // Argument count is not checked here, but in the runtime entry for a more
+ // informative error message.
__ movl(ECX, Immediate(GetEntryPoint()));
- __ movl(EDX, Immediate(argument_count()));
+ __ movl(EDX, Immediate(argument_count));
__ call(&StubCode::CallToRuntimeLabel());
- } else {
- ExternalLabel label(name(), GetEntryPoint());
- __ call(&label);
}
}
« no previous file with comments | « runtime/vm/runtime_entry_arm.cc ('k') | runtime/vm/runtime_entry_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698