Merge r2564 to branches/1.2:...

test/cctest/test-api.cc

 // Copyright 2007-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 7216 matching lines @@
   CHECK_EQ(2, result->Int32Value());
   CHECK_EQ(2, i::Smi::cast(jsobj->GetElement(6))->value());
 
   result = CompileRun("for (var i = 0; i < 8; i++) {"
                       "  pixels[5] = NaN;"
                       "}"
                       "pixels[5];");
   CHECK_EQ(0, result->Int32Value());
   CHECK_EQ(0, i::Smi::cast(jsobj->GetElement(5))->value());
 
+  result = CompileRun("for (var i = 0; i < 8; i++) {"
+                      "  pixels[8] = Infinity;"
+                      "}"
+                      "pixels[8];");
+  CHECK_EQ(255, result->Int32Value());
+  CHECK_EQ(255, i::Smi::cast(jsobj->GetElement(8))->value());
+
+  result = CompileRun("for (var i = 0; i < 8; i++) {"
+                      "  pixels[9] = -Infinity;"
+                      "}"
+                      "pixels[9];");
+  CHECK_EQ(0, result->Int32Value());
+  CHECK_EQ(0, i::Smi::cast(jsobj->GetElement(9))->value());
+
   result = CompileRun("pixels[3] = 33;"
                       "delete pixels[3];"
                       "pixels[3];");
   CHECK_EQ(33, result->Int32Value());
 
   result = CompileRun("pixels[0] = 10; pixels[1] = 11;"
                       "pixels[2] = 12; pixels[3] = 13;"
                       "pixels.__defineGetter__('2',"
                       "function() { return 120; });"
                       "pixels[2];");
   CHECK_EQ(12, result->Int32Value());
 
   result = CompileRun("var js_array = new Array(40);"
                       "js_array[0] = 77;"
                       "js_array;");
   CHECK_EQ(77, v8::Object::Cast(*result)->Get(v8_str("0"))->Int32Value());
 
   result = CompileRun("pixels[1] = 23;"
                       "pixels.__proto__ = [];"
                       "js_array.__proto__ = pixels;"
                       "js_array.concat(pixels);");
   CHECK_EQ(77, v8::Object::Cast(*result)->Get(v8_str("0"))->Int32Value());
   CHECK_EQ(23, v8::Object::Cast(*result)->Get(v8_str("1"))->Int32Value());
 
   free(pixel_data);
 }