Revision: 3093
Author: [email protected]
Date: Tue Oct 20 05:45:56 2009
Log: Merge bleeding_edge revision 3032 to trunk

BUG=475
TEST=mjsunit/regress/regress-475.js
[email protected]
Review URL: http://codereview.chromium.org/293024
http://code.google.com/p/v8/source/detail?r=3093

Added:
  /trunk/test/mjsunit/regress/regress-475.js
Modified:
  /trunk/src/ia32/codegen-ia32.cc
  /trunk/src/version.cc

=======================================
--- /dev/null
+++ /trunk/test/mjsunit/regress/regress-475.js  Tue Oct 20 05:45:56 2009
@@ -0,0 +1,28 @@
+// Copyright 2009 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
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+assertEquals(1, (function (){return 1|-1%1})());
=======================================
--- /trunk/src/ia32/codegen-ia32.cc     Fri Oct 16 04:48:38 2009
+++ /trunk/src/ia32/codegen-ia32.cc     Tue Oct 20 05:45:56 2009
@@ -6531,7 +6531,7 @@
      Register left,
      Register right) {
    if (!ArgsInRegistersSupported()) {
-    // Only pass arguments in registers if there is no smi code in the  
stub.
+    // Pass arguments on the stack.
      __ push(left);
      __ push(right);
    } else {
@@ -6584,7 +6584,7 @@
      Register left,
      Smi* right) {
    if (!ArgsInRegistersSupported()) {
-    // Only pass arguments in registers if there is no smi code in the  
stub.
+    // Pass arguments on the stack.
      __ push(left);
      __ push(Immediate(right));
    } else {
@@ -6612,8 +6612,8 @@
      MacroAssembler* masm,
      Smi* left,
      Register right) {
-  if (flags_ != NO_SMI_CODE_IN_STUB) {
-    // Only pass arguments in registers if there is no smi code in the  
stub.
+  if (!ArgsInRegistersSupported()) {
+    // Pass arguments on the stack.
      __ push(Immediate(left));
      __ push(right);
    } else {
=======================================
--- /trunk/src/version.cc       Fri Oct 16 04:48:38 2009
+++ /trunk/src/version.cc       Tue Oct 20 05:45:56 2009
@@ -35,7 +35,7 @@
  #define MAJOR_VERSION     1
  #define MINOR_VERSION     3
  #define BUILD_NUMBER      16
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
  #define CANDIDATE_VERSION false

  // Define SONAME to have the SCons build the put a specific SONAME into the

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

Reply via email to