Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Version 5.2.361.37 (cherry-pick)
Browse files Browse the repository at this point in the history
Merged 7614362

[turbofan] Set elements kind to holey if constructing array of possibly non-zero length.

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

Review URL: https://codereview.chromium.org/2131853002 .

Cr-Commit-Position: refs/branch-heads/5.2@{#43}
Cr-Branched-From: 2cd36d6-refs/heads/5.2.361@{#1}
Cr-Branched-From: 3fef34e-refs/heads/master@{#36332}
  • Loading branch information
jaro-sevcik committed Jul 8, 2016
1 parent e5c6b86 commit 841455c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 361
#define V8_PATCH_LEVEL 36
#define V8_PATCH_LEVEL 37

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
3 changes: 3 additions & 0 deletions src/compiler/js-create-lowering.cc
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,9 @@ Reduction JSCreateLowering::ReduceNewArray(Node* node, Node* length,
PretenureFlag pretenure = site->GetPretenureMode();
ElementsKind elements_kind = site->GetElementsKind();
DCHECK(IsFastElementsKind(elements_kind));
if (NodeProperties::GetType(length)->Max() > 0) {
elements_kind = GetHoleyElementsKind(elements_kind);
}
dependencies()->AssumeTenuringDecision(site);
dependencies()->AssumeTransitionStable(site);

Expand Down
29 changes: 29 additions & 0 deletions test/mjsunit/compiler/regress-621147.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// 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 --turbo-filter=test2

function test(n) {
return Array(n);
}

function test2() {
return test(2);
}

function test3(a) {
a[0] = 1;
}

test(0);

var smi_array = [1,2];
smi_array[2] = 3;
test3(smi_array);

%OptimizeFunctionOnNextCall(test2);

var broken_array = test2();
test3(broken_array);
1+broken_array[0];

0 comments on commit 841455c

Please sign in to comment.