Back strongly rooted literals CLs out of the tree for branch cut

Due to outstanding performance issues, it's safer to revert these
changes.

Revert "PPC/s390: [TypeFeedbackVector] DeclareGlobals needs a literals array"
Revert "[TypeFeedbackVector] DeclareGlobals needs a literals array"
Revert "PPC/s390: [builtins] CompileLazy bailed out to the runtime entirely too often."
Revert "[builtins] CompileLazy bailed out to the runtime entirely too often."

Another CL is to follow that removes the main part of this work
(after that revert, performance regressions should disappear.

[email protected], [email protected], [email protected]
BUG=680637

Review-Url: https://codereview.chromium.org/2645543002
Cr-Commit-Position: refs/heads/master@{#42456}

src/builtins/arm/builtins-arm.cc

@@ -1357,7 +1357,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
          FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ ldr(index, FieldMemOperand(map, FixedArray::kLengthOffset));
   __ cmp(index, Operand(Smi::FromInt(2)));
-  __ b(lt, &try_shared);
+  __ b(lt, &gotta_call_runtime);
 
   // r3  : native context
   // r2  : length / index
@@ -1422,7 +1422,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ cmp(index, Operand(Smi::FromInt(1)));
   __ b(gt, &loop_top);
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ jmp(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ pop(closure);
   __ pop(new_target);

src/builtins/arm64/builtins-arm64.cc

@@ -1361,7 +1361,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
          FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ Ldrsw(index, UntagSmiFieldMemOperand(map, FixedArray::kLengthOffset));
   __ Cmp(index, Operand(2));
-  __ B(lt, &try_shared);
+  __ B(lt, &gotta_call_runtime);
 
   // x3  : native context
   // x2  : length / index
@@ -1420,7 +1420,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ Cmp(index, Operand(1));
   __ B(gt, &loop_top);
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ B(&gotta_call_runtime);
+
   __ Bind(&try_shared);
   __ Ldr(entry,
          FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));

src/builtins/ia32/builtins-ia32.cc

@@ -1043,7 +1043,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ mov(map, FieldOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ mov(index, FieldOperand(map, FixedArray::kLengthOffset));
   __ cmp(index, Immediate(Smi::FromInt(2)));
-  __ j(less, &try_shared);
+  __ j(less, &gotta_call_runtime);
 
   // edx : native context
   // ebx : length / index
@@ -1103,7 +1103,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ cmp(index, Immediate(Smi::FromInt(1)));
   __ j(greater, &loop_top);
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ jmp(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ pop(closure);
   __ pop(new_target);

src/builtins/mips/builtins-mips.cc

@@ -1368,7 +1368,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ lw(map, FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
   __ lw(map, FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ lw(index, FieldMemOperand(map, FixedArray::kLengthOffset));
-  __ Branch(&try_shared, lt, index, Operand(Smi::FromInt(2)));
+  __ Branch(&gotta_call_runtime, lt, index, Operand(Smi::FromInt(2)));
 
   // a3  : native context
   // a2  : length / index
@@ -1433,7 +1433,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
           Operand(Smi::FromInt(SharedFunctionInfo::kEntryLength)));
   __ Branch(&loop_top, gt, index, Operand(Smi::FromInt(1)));
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ jmp(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ pop(closure);
   __ pop(new_target);

src/builtins/mips64/builtins-mips64.cc

@@ -1359,7 +1359,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ ld(map, FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
   __ ld(map, FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ ld(index, FieldMemOperand(map, FixedArray::kLengthOffset));
-  __ Branch(&try_shared, lt, index, Operand(Smi::FromInt(2)));
+  __ Branch(&gotta_call_runtime, lt, index, Operand(Smi::FromInt(2)));
 
   // a3  : native context
   // a2  : length / index
@@ -1424,7 +1424,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
            Operand(Smi::FromInt(SharedFunctionInfo::kEntryLength)));
   __ Branch(&loop_top, gt, index, Operand(Smi::FromInt(1)));
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ jmp(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ pop(closure);
   __ pop(new_target);

src/builtins/ppc/builtins-ppc.cc

@@ -1375,7 +1375,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
            FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ LoadP(index, FieldMemOperand(map, FixedArray::kLengthOffset));
   __ CmpSmiLiteral(index, Smi::FromInt(2), r0);
-  __ blt(&try_shared);
+  __ blt(&gotta_call_runtime);
 
   // r10 : native context
   // r5  : length / index
@@ -1440,7 +1440,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ CmpSmiLiteral(index, Smi::FromInt(1), r0);
   __ bgt(&loop_top);
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ b(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ LoadP(entry,
            FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));

src/builtins/s390/builtins-s390.cc

@@ -1380,7 +1380,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
            FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ LoadP(index, FieldMemOperand(map, FixedArray::kLengthOffset));
   __ CmpSmiLiteral(index, Smi::FromInt(2), r0);
-  __ blt(&try_shared);
+  __ blt(&gotta_call_runtime);
 
   // Find literals.
   // r9 : native context
@@ -1446,7 +1446,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ CmpSmiLiteral(index, Smi::FromInt(1), r0);
   __ bgt(&loop_top);
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ b(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ LoadP(entry,
            FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));

src/builtins/x64/builtins-x64.cc

@@ -1008,7 +1008,7 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ movp(map, FieldOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
   __ SmiToInteger32(index, FieldOperand(map, FixedArray::kLengthOffset));
   __ cmpl(index, Immediate(2));
-  __ j(less, &try_shared);
+  __ j(less, &gotta_call_runtime);
 
   // r14 : native context
   // r9  : length / index
@@ -1065,7 +1065,9 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
   __ cmpl(index, Immediate(1));
   __ j(greater, &loop_top);
 
-  // We found no code. Try the SharedFunctionInfo.
+  // We found no code.
+  __ jmp(&gotta_call_runtime);
+
   __ bind(&try_shared);
   __ movp(entry, FieldOperand(closure, JSFunction::kSharedFunctionInfoOffset));
   // Is the shared function marked for tier up?

src/compiler/ast-graph-builder.cc

@@ -933,7 +933,6 @@ void AstGraphBuilder::VisitVariableDeclaration(VariableDeclaration* decl) {
       DCHECK(!slot.IsInvalid());
       globals()->push_back(handle(Smi::FromInt(slot.ToInt()), isolate()));
       globals()->push_back(isolate()->factory()->undefined_value());
-      globals()->push_back(isolate()->factory()->undefined_value());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -959,12 +958,6 @@ void AstGraphBuilder::VisitFunctionDeclaration(FunctionDeclaration* decl) {
       FeedbackVectorSlot slot = decl->proxy()->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals()->push_back(handle(Smi::FromInt(slot.ToInt()), isolate()));
-
-      // We need the slot where the literals array lives, too.
-      slot = decl->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals()->push_back(handle(Smi::FromInt(slot.ToInt()), isolate()));
-
       globals()->push_back(function);
       break;
     }

src/crankshaft/hydrogen.cc

@@ -11789,7 +11789,6 @@ void HOptimizedGraphBuilder::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_.Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_.Add(isolate()->factory()->undefined_value(), zone());
-      globals_.Add(isolate()->factory()->undefined_value(), zone());
       return;
     }
     case VariableLocation::PARAMETER:
@@ -11814,12 +11813,6 @@ void HOptimizedGraphBuilder::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_.Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_.Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function = Compiler::GetSharedFunctionInfo(
           declaration->fun(), current_info()->script(), top_info());
       // Check for stack-overflow exception.

src/full-codegen/arm/full-codegen-arm.cc

@@ -761,7 +761,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -786,12 +785,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.

src/full-codegen/arm64/full-codegen-arm64.cc

@@ -756,7 +756,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -781,12 +780,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack overflow exception.

src/full-codegen/ia32/full-codegen-ia32.cc

@@ -709,7 +709,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -734,12 +733,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.

src/full-codegen/mips/full-codegen-mips.cc

@@ -760,7 +760,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -785,12 +784,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.

src/full-codegen/mips64/full-codegen-mips64.cc

@@ -760,7 +760,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -785,12 +784,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.

src/full-codegen/ppc/full-codegen-ppc.cc

@@ -729,7 +729,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -754,12 +753,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.

src/full-codegen/s390/full-codegen-s390.cc

@@ -702,7 +702,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -726,12 +725,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.

src/full-codegen/x64/full-codegen-x64.cc

@@ -723,7 +723,6 @@ void FullCodeGenerator::VisitVariableDeclaration(
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
       globals_->Add(isolate()->factory()->undefined_value(), zone());
-      globals_->Add(isolate()->factory()->undefined_value(), zone());
       break;
     }
     case VariableLocation::PARAMETER:
@@ -748,12 +747,6 @@ void FullCodeGenerator::VisitFunctionDeclaration(
       FeedbackVectorSlot slot = proxy->VariableFeedbackSlot();
       DCHECK(!slot.IsInvalid());
       globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
-      // We need the slot where the literals array lives, too.
-      slot = declaration->fun()->LiteralFeedbackSlot();
-      DCHECK(!slot.IsInvalid());
-      globals_->Add(handle(Smi::FromInt(slot.ToInt()), isolate()), zone());
-
       Handle<SharedFunctionInfo> function =
           Compiler::GetSharedFunctionInfo(declaration->fun(), script(), info_);
       // Check for stack-overflow exception.