Reviewers: Jakob,

Description:
Version 4.1.0.25 (cherry-pick)

Merged ddfca2b06992b3f82dfdc89e468ddc518f18396a

Bugfix in hydrogen GVN.

BUG=chromium:467481
LOG=N
[email protected]

Please review this at https://codereview.chromium.org/1023753002/

Base URL: https://chromium.googlesource.com/v8/[email protected]

Affected files (+23, -4 lines):
  M include/v8-version.h
  M src/hydrogen.cc
  A test/mjsunit/regress/regress-467481.js


Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index 069ce67ee4d7f3e44981c4c0e1d3b8bf60da0ea2..3416edebca979f39173676c14bbaf0fcd0243541 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 1
 #define V8_BUILD_NUMBER 0
-#define V8_PATCH_LEVEL 24
+#define V8_PATCH_LEVEL 25

 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index a6843115bb27104727e5a926999433b295e0be01..e8fa84f264de03b4ce40e8713034d752543a649a 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -6954,9 +6954,6 @@ HInstruction* HOptimizedGraphBuilder::BuildMonomorphicElementAccess(
     PropertyAccessType access_type,
     KeyedAccessStoreMode store_mode) {
   HCheckMaps* checked_object = Add<HCheckMaps>(object, map, dependency);
-  if (dependency) {
-    checked_object->ClearDependsOnFlag(kElementsKind);
-  }

   if (access_type == STORE && map->prototype()->IsJSObject()) {
     // monomorphic stores need a prototype chain check because shape
Index: test/mjsunit/regress/regress-467481.js
diff --git a/test/mjsunit/regress/regress-467481.js b/test/mjsunit/regress/regress-467481.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcb12d89b0b0c857c28fdd55ff941a9bfcadf941
--- /dev/null
+++ b/test/mjsunit/regress/regress-467481.js
@@ -0,0 +1,22 @@
+// Copyright 2015 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
+
+function f(a1, a2) {
+  var v7 = a2[0];
+  var v8 = a1[0];
+  a2[0] = 0.3;
+}
+v6 = new Array(1);
+v6[0] = "tagged";
+f(v6, [1]);
+v5 = new Array(1);
+v5[0] = 0.1;
+f(v5, v5);
+v5 = new Array(10);
+f(v5, v5);
+%OptimizeFunctionOnNextCall(f);
+f(v5, v5);
+v5[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/d/optout.

Reply via email to