Reviewers: danno,

Description:
Fix FastPixelArrayStore on X64 platform.
TEST=test-api/PixelArray

Please review this at http://codereview.chromium.org/6529014/

SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/

Affected files:
  M     src/x64/code-stubs-x64.cc


Index: src/x64/code-stubs-x64.cc
===================================================================
--- src/x64/code-stubs-x64.cc   (revision 6786)
+++ src/x64/code-stubs-x64.cc   (working copy)
@@ -4837,21 +4837,20 @@
     }
   }

- // Some callers already have verified that the key is a smi. key_not_smi is - // set to NULL as a sentinel for that case. Otherwise, add an explicit check
-  // to ensure the key is a smi must be added.
-  if (key_not_smi != NULL) {
-    __ JumpIfNotSmi(key, key_not_smi);
-  } else {
-    if (FLAG_debug_code) {
-      __ AbortIfNotSmi(key);
-    }
-  }
-
   // Key must be a smi and it must be in range.
   if (key_is_untagged) {
     untagged_key = key;
   } else {
+ // Some callers already have verified that the key is a smi. key_not_smi is
+    // set to NULL as a sentinel for that case.  Otherwise, add an explicit
+    // check to ensure the key is a smi.
+    if (key_not_smi != NULL) {
+      __ JumpIfNotSmi(key, key_not_smi);
+    } else {
+      if (FLAG_debug_code) {
+        __ AbortIfNotSmi(key);
+      }
+    }
     __ SmiToInteger32(untagged_key, key);
   }
   __ cmpl(untagged_key, FieldOperand(elements, PixelArray::kLengthOffset));


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to