deps: backport 4af8029 from upstream V8

targos · MylesBorins · commit 50c3dabc0f31 · 2017-11-28T13:11:09.000+09:00
Original commit message: [turbofan] Fix missing lazy deopt in object literals. This adds a missing lazy bailout point when defining data properties with computed property names in object literals. The runtime call to Runtime::kDefineDataPropertyInLiteral can trigger deopts. The necessary bailout ID already exists and is now properly used. R=jarin@chromium.org TEST=mjsunit/regress/regress-crbug-621816 BUG=chromium:621816 Review-Url: https://codereview.chromium.org/2099133003 Cr-Commit-Position: refs/heads/master@{#37294} Refs: v8/v8@4af8029 PR-URL: #17290 Fixes: #14326 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 1
 #define V8_BUILD_NUMBER 281
-#define V8_PATCH_LEVEL 108
+#define V8_PATCH_LEVEL 109
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/compiler/ast-graph-builder.cc b/deps/v8/src/compiler/ast-graph-builder.cc
@@ -1620,7 +1620,8 @@ void AstGraphBuilder::VisitClassLiteralContents(ClassLiteral* expr) {
             jsgraph()->Constant(property->NeedsSetFunctionName());
         const Operator* op =
             javascript()->CallRuntime(Runtime::kDefineDataPropertyInLiteral);
-        NewNode(op, receiver, key, value, attr, set_function_name);
+        Node* call = NewNode(op, receiver, key, value, attr, set_function_name);
+        PrepareFrameState(call, BailoutId::None());
         break;
       }
       case ObjectLiteral::Property::GETTER: {
@@ -1870,7 +1871,8 @@ void AstGraphBuilder::VisitObjectLiteral(ObjectLiteral* expr) {
             jsgraph()->Constant(property->NeedsSetFunctionName());
         const Operator* op =
             javascript()->CallRuntime(Runtime::kDefineDataPropertyInLiteral);
-        NewNode(op, receiver, key, value, attr, set_function_name);
+        Node* call = NewNode(op, receiver, key, value, attr, set_function_name);
+        PrepareFrameState(call, expr->GetIdForPropertySet(property_index));
         break;
       }
       case ObjectLiteral::Property::PROTOTYPE:
diff --git a/deps/v8/src/compiler/linkage.cc b/deps/v8/src/compiler/linkage.cc
@@ -145,7 +145,6 @@ int Linkage::FrameStateInputCount(Runtime::FunctionId function) {
   switch (function) {
     case Runtime::kAllocateInTargetSpace:
     case Runtime::kCreateIterResultObject:
-    case Runtime::kDefineDataPropertyInLiteral:
     case Runtime::kDefineGetterPropertyUnchecked:  // TODO(jarin): Is it safe?
     case Runtime::kDefineSetterPropertyUnchecked:  // TODO(jarin): Is it safe?
     case Runtime::kFinalizeClassDefinition:        // TODO(conradw): Is it safe?
diff --git a/deps/v8/src/full-codegen/arm/full-codegen-arm.cc b/deps/v8/src/full-codegen/arm/full-codegen-arm.cc
@@ -1572,6 +1572,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/arm64/full-codegen-arm64.cc b/deps/v8/src/full-codegen/arm64/full-codegen-arm64.cc
@@ -1557,6 +1557,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/ia32/full-codegen-ia32.cc b/deps/v8/src/full-codegen/ia32/full-codegen-ia32.cc
@@ -1493,6 +1493,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/mips/full-codegen-mips.cc b/deps/v8/src/full-codegen/mips/full-codegen-mips.cc
@@ -1569,6 +1569,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/mips64/full-codegen-mips64.cc b/deps/v8/src/full-codegen/mips64/full-codegen-mips64.cc
@@ -1570,6 +1570,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/ppc/full-codegen-ppc.cc b/deps/v8/src/full-codegen/ppc/full-codegen-ppc.cc
@@ -1532,6 +1532,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/s390/full-codegen-s390.cc b/deps/v8/src/full-codegen/s390/full-codegen-s390.cc
@@ -1491,6 +1491,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/x64/full-codegen-x64.cc b/deps/v8/src/full-codegen/x64/full-codegen-x64.cc
@@ -1518,6 +1518,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/src/full-codegen/x87/full-codegen-x87.cc b/deps/v8/src/full-codegen/x87/full-codegen-x87.cc
@@ -1485,6 +1485,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
             PushOperand(Smi::FromInt(NONE));
             PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));
             CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);
+            PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
+                                   NO_REGISTERS);
           } else {
             DropOperands(3);
           }
diff --git a/deps/v8/test/mjsunit/regress/regress-crbug-621816.js b/deps/v8/test/mjsunit/regress/regress-crbug-621816.js
@@ -0,0 +1,18 @@
+// Copyright 2016 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
+
+function f() {
+  var o = {};
+  o.a = 1;
+}
+function g() {
+  var o = { ['a']: function(){} };
+  f();
+}
+f();
+f();
+%OptimizeFunctionOnNextCall(g);
+g();

Original file line number	Diff line number	Diff line change
`@@ -1572,6 +1572,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1572`	`1572`	`PushOperand(Smi::FromInt(NONE));`
`1573`	`1573`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1574`	`1574`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1575`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1576`	`+ NO_REGISTERS);`
`1575`	`1577`	`} else {`
`1576`	`1578`	`DropOperands(3);`
`1577`	`1579`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1557,6 +1557,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1557`	`1557`	`PushOperand(Smi::FromInt(NONE));`
`1558`	`1558`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1559`	`1559`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1560`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1561`	`+ NO_REGISTERS);`
`1560`	`1562`	`} else {`
`1561`	`1563`	`DropOperands(3);`
`1562`	`1564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1493,6 +1493,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1493`	`1493`	`PushOperand(Smi::FromInt(NONE));`
`1494`	`1494`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1495`	`1495`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1496`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1497`	`+ NO_REGISTERS);`
`1496`	`1498`	`} else {`
`1497`	`1499`	`DropOperands(3);`
`1498`	`1500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1569,6 +1569,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1569`	`1569`	`PushOperand(Smi::FromInt(NONE));`
`1570`	`1570`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1571`	`1571`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1572`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1573`	`+ NO_REGISTERS);`
`1572`	`1574`	`} else {`
`1573`	`1575`	`DropOperands(3);`
`1574`	`1576`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1570,6 +1570,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1570`	`1570`	`PushOperand(Smi::FromInt(NONE));`
`1571`	`1571`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1572`	`1572`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1573`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1574`	`+ NO_REGISTERS);`
`1573`	`1575`	`} else {`
`1574`	`1576`	`DropOperands(3);`
`1575`	`1577`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1532,6 +1532,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1532`	`1532`	`PushOperand(Smi::FromInt(NONE));`
`1533`	`1533`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1534`	`1534`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1535`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1536`	`+ NO_REGISTERS);`
`1535`	`1537`	`} else {`
`1536`	`1538`	`DropOperands(3);`
`1537`	`1539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1491,6 +1491,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {`
`1491`	`1491`	`PushOperand(Smi::FromInt(NONE));`
`1492`	`1492`	`PushOperand(Smi::FromInt(property->NeedsSetFunctionName()));`
`1493`	`1493`	`CallRuntimeWithOperands(Runtime::kDefineDataPropertyInLiteral);`
	`1494`	`+ PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),`
	`1495`	`+ NO_REGISTERS);`
`1494`	`1496`	`} else {`
`1495`	`1497`	`DropOperands(3);`
`1496`	`1498`	`}`