Reviewers: Hannes Payer,
Description:
Rollback of r19535 in 3.24 branch.
Fix for a smi stores optimization on x64 with a regression test.
BUG=345715
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/181473009/
SVN Base: https://v8.googlecode.com/svn/branches/3.24
Affected files (+4, -32 lines):
D test/mjsunit/regress/regress-crbug-345715.js
M src/hydrogen.cc
M src/version.cc
Index: test/mjsunit/regress/regress-crbug-345715.js
diff --git a/test/mjsunit/regress/regress-crbug-345715.js
b/test/mjsunit/regress/regress-crbug-345715.js
deleted file mode 100644
index
a3753417dfb6f8440ec36f883dc6ac1be4a6c8ce..0000000000000000000000000000000000000000
--- a/test/mjsunit/regress/regress-crbug-345715.js
+++ /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
-
-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);
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
ccaa0ecc228602b7ca72161547df508bc85fe3d2..4d09bb8ec9bb4cc8ab537e81ce4ad99c25d7c84c
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -9894,11 +9894,9 @@ void
HOptimizedGraphBuilder::BuildEmitInObjectProperties(
Add<HStoreNamedField>(double_box,
HObjectAccess::ForHeapNumberValue(),
Add<HConstant>(value));
value_instruction = double_box;
- } else if (representation.IsSmi()) {
- value_instruction = value->IsUninitialized()
- ? graph()->GetConstant0()
- : Add<HConstant>(value);
- // Ensure that value is stored as smi.
+ } else if (representation.IsSmi() && value->IsUninitialized()) {
+ value_instruction = graph()->GetConstant0();
+ // Ensure that Constant0 is stored as smi.
access = access.WithRepresentation(representation);
} else {
value_instruction = Add<HConstant>(value);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
a5a99830481a1f21df6185b3efb3fc6863980278..8c343d66405a4c483b6647fa88bce55371e8b2e7
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 24
#define BUILD_NUMBER 35
-#define PATCH_LEVEL 7
+#define PATCH_LEVEL 8
// 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.
