Revision: 15180
Author: [email protected]
Date: Mon Jun 17 06:50:56 2013
Log: Fix constant function transition. Insert return instruction
before returning.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/17250003
http://code.google.com/p/v8/source/detail?r=15180
Modified:
/branches/bleeding_edge/src/arm/stub-cache-arm.cc
/branches/bleeding_edge/src/ia32/stub-cache-ia32.cc
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Fri Jun 14 09:06:12
2013
+++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Mon Jun 17 06:50:56
2013
@@ -577,7 +577,11 @@
OMIT_REMEMBERED_SET,
OMIT_SMI_CHECK);
- if (details.type() == CONSTANT_FUNCTION) return;
+ if (details.type() == CONSTANT_FUNCTION) {
+ ASSERT(value_reg.is(r0));
+ __ Ret();
+ return;
+ }
int index = transition->instance_descriptors()->GetFieldIndex(
transition->LastAdded());
=======================================
--- /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Fri Jun 14 09:06:12
2013
+++ /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Mon Jun 17 06:50:56
2013
@@ -931,7 +931,11 @@
OMIT_REMEMBERED_SET,
OMIT_SMI_CHECK);
- if (details.type() == CONSTANT_FUNCTION) return;
+ if (details.type() == CONSTANT_FUNCTION) {
+ ASSERT(value_reg.is(eax));
+ __ ret(0);
+ return;
+ }
int index = transition->instance_descriptors()->GetFieldIndex(
transition->LastAdded());
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Fri Jun 14 09:06:12
2013
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Mon Jun 17 06:50:56
2013
@@ -889,7 +889,11 @@
OMIT_REMEMBERED_SET,
OMIT_SMI_CHECK);
- if (details.type() == CONSTANT_FUNCTION) return;
+ if (details.type() == CONSTANT_FUNCTION) {
+ ASSERT(value_reg.is(rax));
+ __ ret(0);
+ return;
+ }
int index = transition->instance_descriptors()->GetFieldIndex(
transition->LastAdded());
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
