[ic] Merge LoadGlobalIC_Slow builtins for inside typeof and outside typeof cases.

src/ast/ast-numbering.cc

 // Copyright 2012 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.
 
 #include "src/ast/ast-numbering.h"
 
 #include "src/ast/ast.h"
 #include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
 
 class AstNumberingVisitor final : public AstVisitor<AstNumberingVisitor> {
  public:
   AstNumberingVisitor(Isolate* isolate, Zone* zone)
       : isolate_(isolate),
         zone_(zone),
         next_id_(BailoutId::FirstUsable().ToInt()),
         yield_count_(0),
         properties_(zone),
         slot_cache_(zone),
-        slot_cache_inside_typeof_(zone),
         dont_optimize_reason_(kNoReason),
-        typeof_mode_(NOT_INSIDE_TYPEOF),
         catch_prediction_(HandlerTable::UNCAUGHT) {
     InitializeAstVisitor(isolate);
   }
 
   bool Renumber(FunctionLiteral* node);
 
  private:
 // AST node visitor interface.
 #define DEFINE_VISIT(type) void Visit##type(type* node);
   AST_NODE_LIST(DEFINE_VISIT)
@@ skipping 22 matching lines @@
     dont_optimize_reason_ = reason;
     DisableSelfOptimization();
   }
   void DisableCrankshaft(BailoutReason reason) {
     properties_.flags() |= AstProperties::kDontCrankshaft;
   }
 
   template <typename Node>
   void ReserveFeedbackSlots(Node* node) {
     node->AssignFeedbackVectorSlots(isolate_, properties_.get_spec(),
-                                    typeof_mode_ == INSIDE_TYPEOF
-                                        ? &slot_cache_inside_typeof_
-                                        : &slot_cache_);
+                                    &slot_cache_);
   }
 
   BailoutReason dont_optimize_reason() const { return dont_optimize_reason_; }
 
   Isolate* isolate_;
   Zone* zone_;
   int next_id_;
   int yield_count_;
   AstProperties properties_;
   // The slot cache allows us to reuse certain feedback vector slots.
   FeedbackVectorSlotCache slot_cache_;
-  FeedbackVectorSlotCache slot_cache_inside_typeof_;
   BailoutReason dont_optimize_reason_;
-  TypeofMode typeof_mode_;
   HandlerTable::CatchPrediction catch_prediction_;
 
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
   DISALLOW_COPY_AND_ASSIGN(AstNumberingVisitor);
 };
 
 
 void AstNumberingVisitor::VisitVariableDeclaration(VariableDeclaration* node) {
   IncrementNodeCount();
   VisitVariableProxy(node->proxy());
@@ skipping 121 matching lines @@
 
 
 void AstNumberingVisitor::VisitThrow(Throw* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(Throw::num_ids()));
   Visit(node->exception());
 }
 
 
 void AstNumberingVisitor::VisitUnaryOperation(UnaryOperation* node) {
-  Token::Value op = node->op();
-  TypeofMode old_typeof_mode = typeof_mode_;
   IncrementNodeCount();
-  if (op == Token::TYPEOF) typeof_mode_ = INSIDE_TYPEOF;
   node->set_base_id(ReserveIdRange(UnaryOperation::num_ids()));
   Visit(node->expression());
-  typeof_mode_ = old_typeof_mode;
 }
 
 
 void AstNumberingVisitor::VisitCountOperation(CountOperation* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(CountOperation::num_ids()));
   Visit(node->expression());
   ReserveFeedbackSlots(node);
 }
 
@@ skipping 357 matching lines @@
 }
 
 
 bool AstNumbering::Renumber(Isolate* isolate, Zone* zone,
                             FunctionLiteral* function) {
   AstNumberingVisitor visitor(isolate, zone);
   return visitor.Renumber(function);
 }
 }  // namespace internal
 }  // namespace v8