Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 89 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp b/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp
new file mode 100644
index 000000000..1af13ef4e
--- /dev/null
+++ b/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013-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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. 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 INC. 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 "DFGDesiredWeakReferences.h"
+
+#if ENABLE(DFG_JIT)
+
+#include "CodeBlock.h"
+#include "DFGCommonData.h"
+#include "JSCInlines.h"
+
+namespace JSC { namespace DFG {
+
+DesiredWeakReferences::DesiredWeakReferences()
+    : m_codeBlock(nullptr)
+{
+}
+
+DesiredWeakReferences::DesiredWeakReferences(CodeBlock* codeBlock)
+    : m_codeBlock(codeBlock)
+{
+}
+
+DesiredWeakReferences::~DesiredWeakReferences()
+{
+}
+
+void DesiredWeakReferences::addLazily(JSCell* cell)
+{
+    if (cell)
+        m_references.add(cell);
+}
+
+void DesiredWeakReferences::addLazily(JSValue value)
+{
+    if (value.isCell())
+        addLazily(value.asCell());
+}
+
+bool DesiredWeakReferences::contains(JSCell* cell)
+{
+    return m_references.contains(cell);
+}
+
+void DesiredWeakReferences::reallyAdd(VM& vm, CommonData* common)
+{
+    for (JSCell* target : m_references) {
+        if (Structure* structure = jsDynamicCast<Structure*>(target)) {
+            common->weakStructureReferences.append(
+                WriteBarrier<Structure>(vm, m_codeBlock, structure));
+        } else {
+            common->weakReferences.append(
+                WriteBarrier<JSCell>(vm, m_codeBlock, target));
+        }
+    }
+}
+
+void DesiredWeakReferences::visitChildren(SlotVisitor& visitor)
+{
+    for (JSCell* target : m_references)
+        visitor.appendUnbarrieredPointer(&target);
+}
+
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)