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

src/builtins/s390/builtins-s390.cc

 // 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.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 1362 matching lines @@
   __ LoadP(index, FieldMemOperand(closure, JSFunction::kLiteralsOffset));
   __ LoadP(index, FieldMemOperand(index, LiteralsArray::kFeedbackVectorOffset));
   __ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, &gotta_call_runtime);
 
   __ LoadP(map,
            FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
   __ LoadP(map,
            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
   // r4  : length / index
   // r8  : optimized code map
   // r5  : new target
   // r3  : closure
   Register native_context = r9;
   __ LoadP(native_context, NativeContextMemOperand());
 
@@ skipping 45 matching lines @@
   __ RecordWriteContextSlot(native_context, function_list_offset, r7, temp,
                             kLRHasNotBeenSaved, kDontSaveFPRegs);
   __ JumpToJSEntry(entry);
 
   __ bind(&loop_bottom);
   __ SubSmiLiteral(index, index, Smi::FromInt(SharedFunctionInfo::kEntryLength),
                    r0);
   __ 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));
   // Is the shared function marked for tier up?
   __ LoadlB(temp, FieldMemOperand(
                       entry, SharedFunctionInfo::kMarkedForTierUpByteOffset));
   __ TestBit(temp, SharedFunctionInfo::kMarkedForTierUpBitWithinByte, r0);
   __ bne(&gotta_call_runtime);
 
   // If SFI points to anything other than CompileLazy, install that.
@@ skipping 1519 matching lines @@
     __ bkpt(0);
   }
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390