Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 133 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp b/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp
new file mode 100644
index 000000000..f08fe3d02
--- /dev/null
+++ b/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSModuleEnvironment.h"
+
+#include "Interpreter.h"
+#include "JSCInlines.h"
+#include "JSFunction.h"
+
+using namespace std;
+
+namespace JSC {
+
+const ClassInfo JSModuleEnvironment::s_info = { "JSModuleEnvironment", &Base::s_info, 0, CREATE_METHOD_TABLE(JSModuleEnvironment) };
+
+JSModuleEnvironment* JSModuleEnvironment::create(
+    VM& vm, Structure* structure, JSScope* currentScope, SymbolTable* symbolTable, JSValue initialValue, JSModuleRecord* moduleRecord)
+{
+    // JSLexicalEnvironment (precisely, JSEnvironmentRecord) has the storage to store the variable slots after the its class storage.
+    // Because the offset of the variable slots are fixed in the JSEnvironmentRecord, inheritting these class and adding new member field is not allowed,
+    // the new member will overlap the variable slots.
+    // To keep the JSModuleEnvironment compatible to the JSLexicalEnvironment but add the new member to store the JSModuleRecord, we additionally allocate
+    // the storage after the variable slots.
+    //
+    // JSLexicalEnvironment:
+    //     [ JSLexicalEnvironment ][ variable slots ]
+    //
+    // JSModuleEnvironment:
+    //     [ JSLexicalEnvironment ][ variable slots ][ additional slots for JSModuleEnvironment ]
+    JSModuleEnvironment* result =
+        new (
+            NotNull,
+            allocateCell<JSModuleEnvironment>(vm.heap, JSModuleEnvironment::allocationSize(symbolTable)))
+        JSModuleEnvironment(vm, structure, currentScope, symbolTable);
+    result->finishCreation(vm, initialValue, moduleRecord);
+    return result;
+}
+
+void JSModuleEnvironment::finishCreation(VM& vm, JSValue initialValue, JSModuleRecord* moduleRecord)
+{
+    Base::finishCreation(vm, initialValue);
+    this->moduleRecordSlot().set(vm, this, moduleRecord);
+}
+
+void JSModuleEnvironment::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+    JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
+    Base::visitChildren(thisObject, visitor);
+    visitor.appendValues(thisObject->variables(), thisObject->symbolTable()->scopeSize());
+    visitor.append(&thisObject->moduleRecordSlot());
+}
+
+bool JSModuleEnvironment::getOwnPropertySlot(JSObject* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+{
+    JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
+    JSModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
+    if (resolution.type == JSModuleRecord::Resolution::Type::Resolved) {
+        // When resolveImport resolves the resolution, the imported module environment must have the binding.
+        JSModuleEnvironment* importedModuleEnvironment = resolution.moduleRecord->moduleEnvironment();
+        PropertySlot redirectSlot(importedModuleEnvironment, PropertySlot::InternalMethodType::Get);
+        bool result = importedModuleEnvironment->methodTable(exec->vm())->getOwnPropertySlot(importedModuleEnvironment, exec, resolution.localName, redirectSlot);
+        ASSERT_UNUSED(result, result);
+        ASSERT(redirectSlot.isValue());
+        JSValue value = redirectSlot.getValue(exec, resolution.localName);
+        ASSERT(!exec->hadException());
+        slot.setValue(thisObject, redirectSlot.attributes(), value);
+        return true;
+    }
+    return Base::getOwnPropertySlot(thisObject, exec, propertyName, slot);
+}
+
+void JSModuleEnvironment::getOwnNonIndexPropertyNames(JSObject* cell, ExecState* exec, PropertyNameArray& propertyNamesArray, EnumerationMode mode)
+{
+    JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
+    if (propertyNamesArray.includeStringProperties()) {
+        for (const auto& pair : thisObject->moduleRecord()->importEntries()) {
+            const JSModuleRecord::ImportEntry& importEntry = pair.value;
+            if (!importEntry.isNamespace(exec->vm()))
+                propertyNamesArray.add(importEntry.localName);
+        }
+    }
+    return Base::getOwnNonIndexPropertyNames(thisObject, exec, propertyNamesArray, mode);
+}
+
+void JSModuleEnvironment::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
+{
+    JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
+    // All imported bindings are immutable.
+    JSModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
+    if (resolution.type == JSModuleRecord::Resolution::Type::Resolved) {
+        throwTypeError(exec, ASCIILiteral(StrictModeReadonlyPropertyWriteError));
+        return;
+    }
+    return Base::put(thisObject, exec, propertyName, value, slot);
+}
+
+bool JSModuleEnvironment::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
+{
+    JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
+    // All imported bindings are immutable.
+    JSModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
+    if (resolution.type == JSModuleRecord::Resolution::Type::Resolved)
+        return false;
+    return Base::deleteProperty(thisObject, exec, propertyName);
+}
+
+} // namespace JSC