Revision: 19577
Author:   [email protected]
Date:     Thu Feb 27 13:57:49 2014 UTC
Log:      Revert "Merged r19535 into 3.23 branch."

This reverts: Merged r19535 into 3.23 branch.

Fix for a smi stores optimization on x64 with a regression test.

[email protected]

Review URL: https://codereview.chromium.org/179863003
http://code.google.com/p/v8/source/detail?r=19577

Deleted:
 /branches/3.23/test/mjsunit/regress/regress-crbug-345715.js
Modified:
 /branches/3.23/src/hydrogen.cc
 /branches/3.23/src/version.cc

=======================================
--- /branches/3.23/test/mjsunit/regress/regress-crbug-345715.js Thu Feb 27 12:57:31 2014 UTC
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Flags: --allow-natives-syntax --debug-code
-
-a = {y:1.5};
-a.y = 0;
-b = a.y;
-c = {y:{}};
-
-function f() {
-  return 1;
-}
-
-function g() {
-  var e = {y: b};
-  var d = {x:f()};
-  var d = {x:f()};
-  return [e, d];
-}
-
-g();
-g();
-%OptimizeFunctionOnNextCall(g);
-assertEquals(1, g()[1].x);
=======================================
--- /branches/3.23/src/hydrogen.cc      Thu Feb 27 12:57:31 2014 UTC
+++ /branches/3.23/src/hydrogen.cc      Thu Feb 27 13:57:49 2014 UTC
@@ -9475,7 +9475,7 @@
       Add<HStoreNamedField>(object, access, result);
     } else {
       Representation representation = details.representation();
-      HInstruction* value_instruction;
+      HInstruction* value_instruction = Add<HConstant>(value);

       if (representation.IsDouble()) {
         // Allocate a HeapNumber box and store the value into it.
@@ -9490,16 +9490,8 @@
         AddStoreMapConstant(double_box,
             isolate()->factory()->heap_number_map());
Add<HStoreNamedField>(double_box, HObjectAccess::ForHeapNumberValue(),
-                              Add<HConstant>(value));
+            value_instruction);
         value_instruction = double_box;
-      } else if (representation.IsSmi()) {
-        value_instruction = value->IsUninitialized()
-            ? graph()->GetConstant0()
-            : Add<HConstant>(value);
-        // Ensure that value is stored as smi.
-        access = access.WithRepresentation(representation);
-      } else {
-        value_instruction = Add<HConstant>(value);
       }

       Add<HStoreNamedField>(object, access, value_instruction);
=======================================
--- /branches/3.23/src/version.cc       Thu Feb 27 12:57:31 2014 UTC
+++ /branches/3.23/src/version.cc       Thu Feb 27 13:57:49 2014 UTC
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     23
 #define BUILD_NUMBER      17
-#define PATCH_LEVEL       16
+#define PATCH_LEVEL       17
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to