[csa] Remove ParameterMode from CSA::CloneFastJSArray

isheludko · Commit Bot · commit 73d0c17121d9 · 2019-11-14T23:41:09.000Z
Bug: v8:9708 Change-Id: I40e45eeb660f22f649b8e9e0a3e14201098f464b Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1917142 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Igor Sheludko <ishell@chromium.org> Cr-Commit-Position: refs/heads/master@{#64973}
diff --git a/src/builtins/builtins-array-gen.cc b/src/builtins/builtins-array-gen.cc
@@ -459,8 +459,7 @@ TF_BUILTIN(CloneFastJSArray, ArrayBuiltinsAssembler) {
                           LoadElementsKind(array))),
                       Word32BinaryNot(IsNoElementsProtectorCellInvalid())));
 
-  ParameterMode mode = OptimalParameterMode();
-  Return(CloneFastJSArray(context, array, mode));
+  Return(CloneFastJSArray(context, array));
 }
 
 // This builtin copies the backing store of fast arrays, while converting any
@@ -479,8 +478,7 @@ TF_BUILTIN(CloneFastJSArrayFillingHoles, ArrayBuiltinsAssembler) {
                           LoadElementsKind(array))),
                       Word32BinaryNot(IsNoElementsProtectorCellInvalid())));
 
-  ParameterMode mode = OptimalParameterMode();
-  Return(CloneFastJSArray(context, array, mode, {},
+  Return(CloneFastJSArray(context, array, {},
                           HoleConversionMode::kConvertToUndefined));
 }
 
diff --git a/src/builtins/builtins-constructor-gen.cc b/src/builtins/builtins-constructor-gen.cc
@@ -345,11 +345,10 @@ TNode<JSArray> ConstructorBuiltinsAssembler::EmitCreateShallowArrayLiteral(
   TNode<AllocationSite> allocation_site = CAST(maybe_allocation_site);
   TNode<JSArray> boilerplate = CAST(LoadBoilerplate(allocation_site));
 
-  ParameterMode mode = OptimalParameterMode();
   if (allocation_site_mode == TRACK_ALLOCATION_SITE) {
-    return CloneFastJSArray(context, boilerplate, mode, allocation_site);
+    return CloneFastJSArray(context, boilerplate, allocation_site);
   } else {
-    return CloneFastJSArray(context, boilerplate, mode);
+    return CloneFastJSArray(context, boilerplate);
   }
 }
 
diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
@@ -4094,12 +4094,14 @@ Node* CodeStubAssembler::ExtractFastJSArray(
 }
 
 TNode<JSArray> CodeStubAssembler::CloneFastJSArray(
-    TNode<Context> context, TNode<JSArray> array, ParameterMode mode,
+    TNode<Context> context, TNode<JSArray> array,
     TNode<AllocationSite> allocation_site, HoleConversionMode convert_holes) {
   // TODO(dhai): we should be able to assert IsFastJSArray(array) here, but this
   // function is also used to copy boilerplates even when the no-elements
   // protector is invalid. This function should be renamed to reflect its uses.
 
+  // TODO(v8:9708): remove ParameterMode
+  ParameterMode mode = OptimalParameterMode();
   TNode<Number> length = LoadJSArrayLength(array);
   TNode<FixedArrayBase> new_elements;
   TVARIABLE(FixedArrayBase, var_new_elements);
diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
@@ -1865,7 +1865,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   // function generates significantly less code in this case.
   TNode<JSArray> CloneFastJSArray(
       TNode<Context> context, TNode<JSArray> array,
-      ParameterMode mode = INTPTR_PARAMETERS,
       TNode<AllocationSite> allocation_site = {},
       HoleConversionMode convert_holes = HoleConversionMode::kDontConvert);
 

Original file line number	Diff line number	Diff line change
`@@ -345,11 +345,10 @@ TNode<JSArray> ConstructorBuiltinsAssembler::EmitCreateShallowArrayLiteral(`
`345`	`345`	`TNode<AllocationSite> allocation_site = CAST(maybe_allocation_site);`
`346`	`346`	`TNode<JSArray> boilerplate = CAST(LoadBoilerplate(allocation_site));`
`347`	`347`
`348`		`- ParameterMode mode = OptimalParameterMode();`
`349`	`348`	`if (allocation_site_mode == TRACK_ALLOCATION_SITE) {`
`350`		`- return CloneFastJSArray(context, boilerplate, mode, allocation_site);`
	`349`	`+ return CloneFastJSArray(context, boilerplate, allocation_site);`
`351`	`350`	`} else {`
`352`		`- return CloneFastJSArray(context, boilerplate, mode);`
	`351`	`+ return CloneFastJSArray(context, boilerplate);`
`353`	`352`	`}`
`354`	`353`	`}`
`355`	`354`