1 files changed, 26 insertions, 109 deletions

diff --git a/Source/JavaScriptCore/runtime/JSScope.cpp b/Source/JavaScriptCore/runtime/JSScope.cpp
index bb2efdd06..3440bc610 100644
--- a/Source/JavaScriptCore/runtime/JSScope.cpp
+++ b/Source/JavaScriptCore/runtime/JSScope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,10 +26,11 @@
 #include "config.h"
 #include "JSScope.h"
 
+#include "JSActivation.h"
 #include "JSGlobalObject.h"
-#include "JSLexicalEnvironment.h"
+#include "JSNameScope.h"
 #include "JSWithScope.h"
-#include "JSCInlines.h"
+#include "Operations.h"
 
 namespace JSC {
 
@@ -39,6 +40,9 @@ void JSScope::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSScope* thisObject = jsCast<JSScope*>(cell);
     ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
+    ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
+
     Base::visitChildren(thisObject, visitor);
     visitor.append(&thisObject->m_next);
 }
@@ -46,26 +50,26 @@ void JSScope::visitChildren(JSCell* cell, SlotVisitor& visitor)
 // Returns true if we found enough information to terminate optimization.
 static inline bool abstractAccess(ExecState* exec, JSScope* scope, const Identifier& ident, GetOrPut getOrPut, size_t depth, bool& needsVarInjectionChecks, ResolveOp& op)
 {
-    if (JSLexicalEnvironment* lexicalEnvironment = jsDynamicCast<JSLexicalEnvironment*>(scope)) {
+    if (JSActivation* activation = jsDynamicCast<JSActivation*>(scope)) {
         if (ident == exec->propertyNames().arguments) {
-            // We know the property will be at this lexical environment scope, but we don't know how to cache it.
+            // We know the property will be at this activation scope, but we don't know how to cache it.
             op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
             return true;
         }
 
-        SymbolTableEntry entry = lexicalEnvironment->symbolTable()->get(ident.impl());
+        SymbolTableEntry entry = activation->symbolTable()->get(ident.impl());
         if (entry.isReadOnly() && getOrPut == Put) {
-            // We know the property will be at this lexical environment scope, but we don't know how to cache it.
+            // We know the property will be at this activation scope, but we don't know how to cache it.
             op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
             return true;
         }
 
         if (!entry.isNull()) {
-            op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, 0, lexicalEnvironment, entry.watchpointSet(), entry.scopeOffset().offset());
+            op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, 0, activation, entry.watchpointSet(), entry.getIndex());
             return true;
         }
 
-        if (lexicalEnvironment->symbolTable()->usesNonStrictEval())
+        if (activation->symbolTable()->usesNonStrictEval())
             needsVarInjectionChecks = true;
         return false;
     }
@@ -81,7 +85,7 @@ static inline bool abstractAccess(ExecState* exec, JSScope* scope, const Identif
 
             op = ResolveOp(
                 makeType(GlobalVar, needsVarInjectionChecks), depth, 0, 0, entry.watchpointSet(),
-                reinterpret_cast<uintptr_t>(globalObject->variableAt(entry.scopeOffset()).slot()));
+                reinterpret_cast<uintptr_t>(globalObject->registerAt(entry.getIndex()).slot()));
             return true;
         }
 
@@ -95,19 +99,8 @@ static inline bool abstractAccess(ExecState* exec, JSScope* scope, const Identif
             op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, 0, 0, 0, 0);
             return true;
         }
-        
-        WatchpointState state = globalObject->structure()->ensurePropertyReplacementWatchpointSet(exec->vm(), slot.cachedOffset())->state();
-        if (state == IsWatched && getOrPut == Put) {
-            // The field exists, but because the replacement watchpoint is still intact. This is
-            // kind of dangerous. We have two options:
-            // 1) Invalidate the watchpoint set. That would work, but it's possible that this code
-            //    path never executes - in which case this would be unwise.
-            // 2) Have the invalidation happen at run-time. All we have to do is leave the code
-            //    uncached. The only downside is slightly more work when this does execute.
-            // We go with option (2) here because it seems less evil.
-            op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, 0, 0, 0, 0);
-        } else
-            op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, globalObject->structure(), 0, 0, slot.cachedOffset());
+
+        op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, globalObject->structure(), 0, 0, slot.cachedOffset());
         return true;
     }
 
@@ -118,28 +111,18 @@ static inline bool abstractAccess(ExecState* exec, JSScope* scope, const Identif
 JSObject* JSScope::objectAtScope(JSScope* scope)
 {
     JSObject* object = scope;
-    if (object->type() == WithScopeType)
+    if (object->structure()->typeInfo().type() == WithScopeType)
         return jsCast<JSWithScope*>(object)->object();
 
     return object;
 }
 
-// When an exception occurs, the result of isUnscopable becomes false.
-static inline bool isUnscopable(ExecState* exec, JSScope* scope, JSObject* object, const Identifier& ident)
+int JSScope::depth()
 {
-    if (scope->type() != WithScopeType)
-        return false;
-
-    JSValue unscopables = object->get(exec, exec->propertyNames().unscopablesSymbol);
-    if (exec->hadException())
-        return false;
-    if (!unscopables.isObject())
-        return false;
-    JSValue blocked = jsCast<JSObject*>(unscopables)->get(exec, ident);
-    if (exec->hadException())
-        return false;
-
-    return blocked.toBoolean(exec);
+    int depth = 0;
+    for (JSScope* scope = this; scope; scope = scope->next())
+        ++depth;
+    return depth;
 }
 
 JSValue JSScope::resolve(ExecState* exec, JSScope* scope, const Identifier& ident)
@@ -147,28 +130,24 @@ JSValue JSScope::resolve(ExecState* exec, JSScope* scope, const Identifier& iden
     ScopeChainIterator end = scope->end();
     ScopeChainIterator it = scope->begin();
     while (1) {
-        JSScope* scope = it.scope();
         JSObject* object = it.get();
 
         if (++it == end) // Global scope.
             return object;
 
-        if (object->hasProperty(exec, ident)) {
-            if (!isUnscopable(exec, scope, object, ident))
-                return object;
-            ASSERT_WITH_MESSAGE(!exec->hadException(), "When an exception occurs, the result of isUnscopable becomes false");
-        }
+        if (object->hasProperty(exec, ident))
+            return object;
     }
 }
 
-ResolveOp JSScope::abstractResolve(ExecState* exec, size_t depthOffset, JSScope* scope, const Identifier& ident, GetOrPut getOrPut, ResolveType unlinkedType)
+ResolveOp JSScope::abstractResolve(ExecState* exec, JSScope* scope, const Identifier& ident, GetOrPut getOrPut, ResolveType unlinkedType)
 {
     ResolveOp op(Dynamic, 0, 0, 0, 0, 0);
     if (unlinkedType == Dynamic)
         return op;
 
+    size_t depth = 0;
     bool needsVarInjectionChecks = JSC::needsVarInjectionChecks(unlinkedType);
-    size_t depth = depthOffset;
     for (; scope; scope = scope->next()) {
         if (abstractAccess(exec, scope, ident, getOrPut, depth, needsVarInjectionChecks, op))
             break;
@@ -178,66 +157,4 @@ ResolveOp JSScope::abstractResolve(ExecState* exec, size_t depthOffset, JSScope*
     return op;
 }
 
-void JSScope::collectVariablesUnderTDZ(JSScope* scope, VariableEnvironment& result)
-{
-    for (; scope; scope = scope->next()) {
-        if (!scope->isLexicalScope())
-            continue;
-        SymbolTable* symbolTable = jsCast<JSLexicalEnvironment*>(scope)->symbolTable();
-        ASSERT(symbolTable->scopeType() == SymbolTable::ScopeType::LexicalScope);
-        ConcurrentJITLocker locker(symbolTable->m_lock);
-        for (auto end = symbolTable->end(locker), iter = symbolTable->begin(locker); iter != end; ++iter)
-            result.add(iter->key);
-    }
-}
-
-bool JSScope::isLexicalScope()
-{
-    JSLexicalEnvironment* lexicalEnvironment = jsDynamicCast<JSLexicalEnvironment*>(this);
-    if (!lexicalEnvironment) // Global object does not hold any lexical variables so we can ignore it.
-        return false;
-
-    return lexicalEnvironment->symbolTable()->scopeType() == SymbolTable::ScopeType::LexicalScope;
-}
-
-bool JSScope::isCatchScope()
-{
-    JSLexicalEnvironment* lexicalEnvironment = jsDynamicCast<JSLexicalEnvironment*>(this);
-    if (!lexicalEnvironment)
-        return false;
-    return lexicalEnvironment->symbolTable()->scopeType() == SymbolTable::ScopeType::CatchScope;
-}
-
-bool JSScope::isFunctionNameScopeObject()
-{
-    JSLexicalEnvironment* lexicalEnvironment = jsDynamicCast<JSLexicalEnvironment*>(this);
-    if (!lexicalEnvironment)
-        return false;
-    return lexicalEnvironment->symbolTable()->scopeType() == SymbolTable::ScopeType::FunctionNameScope;
-}
-
-const char* resolveModeName(ResolveMode mode)
-{
-    static const char* const names[] = {
-        "ThrowIfNotFound",
-        "DoNotThrowIfNotFound"
-    };
-    return names[mode];
-}
-
-const char* resolveTypeName(ResolveType type)
-{
-    static const char* const names[] = {
-        "GlobalProperty",
-        "GlobalVar",
-        "ClosureVar",
-        "LocalClosureVar",
-        "GlobalPropertyWithVarInjectionChecks",
-        "GlobalVarWithVarInjectionChecks",
-        "ClosureVarWithVarInjectionChecks",
-        "Dynamic"
-    };
-    return names[type];
-}
-
 } // namespace JSC