Index: src/code-stubs.cc |
diff --git a/src/code-stubs.cc b/src/code-stubs.cc |
index c7d4c805d0c87824ecd1cbdb23afc49dfa710f02..d6a231cf1a1b5b6504a20330a41e6e07c36a90c4 100644 |
--- a/src/code-stubs.cc |
+++ b/src/code-stubs.cc |
@@ -575,7 +575,7 @@ void ElementsTransitionAndStoreStub::Generate(MacroAssembler* masm) { |
if (IsFastSmiOrObjectElementsKind(to_)) { |
if (IsFastSmiOrObjectElementsKind(from_)) { |
ElementsTransitionGenerator:: |
- GenerateMapChangeElementsTransition(masm); |
+ GenerateMapChangeElementsTransition(masm, &fail); |
} else if (IsFastDoubleElementsKind(from_)) { |
ASSERT(!IsFastSmiElementsKind(to_)); |
ElementsTransitionGenerator::GenerateDoubleToObject(masm, &fail); |
@@ -594,8 +594,11 @@ void ElementsTransitionAndStoreStub::Generate(MacroAssembler* masm) { |
grow_mode_); |
} else if (IsFastDoubleElementsKind(from_)) { |
ASSERT(to_ == FAST_HOLEY_DOUBLE_ELEMENTS); |
+ // Don't pass the fail label because we don't want to |
+ // record allocation site info changes for the double->fast |
+ // transition. |
mvstanton
2013/01/11 16:56:06
Better, pass a parameter to the method indicating
mvstanton
2013/01/15 15:23:15
I have added these methods, such that the on/off f
|
ElementsTransitionGenerator:: |
- GenerateMapChangeElementsTransition(masm); |
+ GenerateMapChangeElementsTransition(masm, NULL); |
} else { |
UNREACHABLE(); |
} |