diff options
| author | Ben Murdoch <benm@google.com> | 2012-04-23 10:39:17 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-04-23 10:39:17 +0100 |
| commit | 8f9999fcc44cfd4f5e1140c6678bbca4cf8ea1c7 (patch) | |
| tree | 6737d3b2a7df79987192a9d9c5a285d8a01e31cd /src/arm/stub-cache-arm.cc | |
| parent | 3ef787dbeca8a5fb1086949cda830dccee07bfbd (diff) | |
| download | android_external_v8-8f9999fcc44cfd4f5e1140c6678bbca4cf8ea1c7.tar.gz android_external_v8-8f9999fcc44cfd4f5e1140c6678bbca4cf8ea1c7.tar.bz2 android_external_v8-8f9999fcc44cfd4f5e1140c6678bbca4cf8ea1c7.zip | |
Merge V8 at 3.9.24.15
Bug: 5688872
Change-Id: Idd477521ab57b89f9c3200852b82af8e08aa2191
Diffstat (limited to 'src/arm/stub-cache-arm.cc')
| -rw-r--r-- | src/arm/stub-cache-arm.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc index 06f8385a..852824f8 100644 --- a/src/arm/stub-cache-arm.cc +++ b/src/arm/stub-cache-arm.cc @@ -443,8 +443,10 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, Label exit; // Check that the map of the object hasn't changed. + CompareMapMode mode = transition.is_null() ? ALLOW_ELEMENT_TRANSITION_MAPS + : REQUIRE_EXACT_MAP; __ CheckMap(receiver_reg, scratch, Handle<Map>(object->map()), miss_label, - DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS); + DO_SMI_CHECK, mode); // Perform global security token check if needed. if (object->IsJSGlobalProxy()) { |