Reviewers: Toon Verwaest,
Description:
Merged r19535 into 3.23 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/182993004/
SVN Base: https://v8.googlecode.com/svn/branches/3.23
Affected files (+37, -3 lines):
M src/hydrogen.cc
M src/version.cc
A test/mjsunit/regress/regress-crbug-345715.js
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
a95f4a49633069888f862b237c145ebc0f91ea95..cdf69e7c72c672490e853d537951203e64353a4c
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -9475,7 +9475,7 @@ void
HOptimizedGraphBuilder::BuildEmitInObjectProperties(
Add<HStoreNamedField>(object, access, result);
} else {
Representation representation = details.representation();
- HInstruction* value_instruction = Add<HConstant>(value);
+ HInstruction* value_instruction;
if (representation.IsDouble()) {
// Allocate a HeapNumber box and store the value into it.
@@ -9490,8 +9490,16 @@ void
HOptimizedGraphBuilder::BuildEmitInObjectProperties(
AddStoreMapConstant(double_box,
isolate()->factory()->heap_number_map());
Add<HStoreNamedField>(double_box,
HObjectAccess::ForHeapNumberValue(),
- value_instruction);
+ 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.
+ access = access.WithRepresentation(representation);
+ } else {
+ value_instruction = Add<HConstant>(value);
}
Add<HStoreNamedField>(object, access, value_instruction);
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
1d0337564023cbe2dd1163efb68cba23ab04c837..27b5aa8b85e4d3d482632991edc29db51e24712e
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 23
#define BUILD_NUMBER 17
-#define PATCH_LEVEL 15
+#define PATCH_LEVEL 16
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
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
new file mode 100644
index
0000000000000000000000000000000000000000..6b4ab6f85346c500cfd93c123a1b8a83ae1c5c75
--- /dev/null
+++ b/test/mjsunit/regress/regress-crbug-345715.js
@@ -0,0 +1,26 @@
+// 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);
--
--
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.
