Support for global var shortcuts in script contexts.

src/ast.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.h"
 
 #include <cmath>  // For isfinite.
 #include "src/builtins.h"
 #include "src/code-stubs.h"
 #include "src/contexts.h"
@@ skipping 36 matching lines @@
   return IsLiteral() && AsLiteral()->value()->IsNull();
 }
 
 
 bool Expression::IsUndefinedLiteral(Isolate* isolate) const {
   const VariableProxy* var_proxy = AsVariableProxy();
   if (var_proxy == NULL) return false;
   Variable* var = var_proxy->var();
   // The global identifier "undefined" is immutable. Everything
   // else could be reassigned.
-  return var != NULL && var->location() == Variable::UNALLOCATED &&
+  return var != NULL && var->IsUnallocatedOrGlobalSlot() &&
          var_proxy->raw_name()->IsOneByteEqualTo("undefined");
 }
 
 
 VariableProxy::VariableProxy(Zone* zone, Variable* var, int start_position,
                              int end_position)
     : Expression(zone, start_position),
       bit_field_(IsThisField::encode(var->is_this()) |
                  IsAssignedField::encode(false) |
                  IsResolvedField::encode(false)),
@@ skipping 20 matching lines @@
   DCHECK((is_this() && var->is_this()) || raw_name() == var->raw_name());
   set_var(var);
   set_is_resolved();
   var->set_is_used();
 }
 
 
 void VariableProxy::SetFirstFeedbackICSlot(FeedbackVectorICSlot slot,
                                            ICSlotCache* cache) {
   variable_feedback_slot_ = slot;
-  if (var()->IsUnallocated()) {
+  if (var()->IsUnallocatedOrGlobalSlot()) {
     cache->Add(VariableICSlotPair(var(), slot));
   }
 }
 
 
 FeedbackVectorRequirements VariableProxy::ComputeFeedbackRequirements(
     Isolate* isolate, const ICSlotCache* cache) {
   if (UsesVariableFeedbackSlot()) {
     // VariableProxies that point to the same Variable within a function can
     // make their loads from the same IC slot.
-    if (var()->IsUnallocated()) {
+    if (var()->IsUnallocatedOrGlobalSlot()) {
       for (int i = 0; i < cache->length(); i++) {
         VariableICSlotPair& pair = cache->at(i);
         if (pair.variable() == var()) {
           variable_feedback_slot_ = pair.slot();
           return FeedbackVectorRequirements(0, 0);
         }
       }
     }
     return FeedbackVectorRequirements(0, 1);
   }
   return FeedbackVectorRequirements(0, 0);
 }
 
 
 static int GetStoreICSlots(Expression* expr) {
   int ic_slots = 0;
   if (FLAG_vector_stores) {
     Property* property = expr->AsProperty();
     LhsKind assign_type = Property::GetAssignType(property);
     if ((assign_type == VARIABLE &&
-         expr->AsVariableProxy()->var()->IsUnallocated()) ||
+         expr->AsVariableProxy()->var()->IsUnallocatedOrGlobalSlot()) ||
         assign_type == NAMED_PROPERTY || assign_type == KEYED_PROPERTY) {
       ic_slots++;
     }
   }
   return ic_slots;
 }
 
 
 static Code::Kind GetStoreICKind(Expression* expr) {
   LhsKind assign_type = Property::GetAssignType(expr->AsProperty());
@@ skipping 141 matching lines @@
   // This logic that computes the number of slots needed for vector store
   // ICs must mirror FullCodeGenerator::VisitClassLiteral.
   int ic_slots = 0;
   for (int i = 0; i < properties()->length(); i++) {
     ObjectLiteral::Property* property = properties()->at(i);
 
     Expression* value = property->value();
     if (FunctionLiteral::NeedsHomeObject(value)) ic_slots++;
   }
 
-  if (scope() != NULL && class_variable_proxy()->var()->IsUnallocated()) {
+  if (scope() != NULL &&
+      class_variable_proxy()->var()->IsUnallocatedOrGlobalSlot()) {
     ic_slots++;
   }
 
 #ifdef DEBUG
   // FullCodeGenerator::VisitClassLiteral verifies that it consumes slot_count_
   // slots.
   slot_count_ = ic_slots;
 #endif
   return FeedbackVectorRequirements(0, ic_slots);
 }
@@ skipping 442 matching lines @@
   int slots = IsUsingCallFeedbackSlot(isolate) ? 1 : 0;
   return FeedbackVectorRequirements(slots, ic_slots);
 }
 
 
 Call::CallType Call::GetCallType(Isolate* isolate) const {
   VariableProxy* proxy = expression()->AsVariableProxy();
   if (proxy != NULL) {
     if (proxy->var()->is_possibly_eval(isolate)) {
       return POSSIBLY_EVAL_CALL;
-    } else if (proxy->var()->IsUnallocated()) {
+    } else if (proxy->var()->IsUnallocatedOrGlobalSlot()) {
       return GLOBAL_CALL;
     } else if (proxy->var()->IsLookupSlot()) {
       return LOOKUP_SLOT_CALL;
     }
   }
 
   if (expression()->IsSuperCallReference()) return SUPER_CALL;
 
   Property* property = expression()->AsProperty();
   return property != NULL ? PROPERTY_CALL : OTHER_CALL;
@@ skipping 379 matching lines @@
 bool Literal::Match(void* literal1, void* literal2) {
   const AstValue* x = static_cast<Literal*>(literal1)->raw_value();
   const AstValue* y = static_cast<Literal*>(literal2)->raw_value();
   return (x->IsString() && y->IsString() && x->AsString() == y->AsString()) ||
          (x->IsNumber() && y->IsNumber() && x->AsNumber() == y->AsNumber());
 }
 
 
 }  // namespace internal
 }  // namespace v8