Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 134 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGCommonData.h b/Source/JavaScriptCore/dfg/DFGCommonData.h
new file mode 100644
index 000000000..bf4f94fcc
--- /dev/null
+++ b/Source/JavaScriptCore/dfg/DFGCommonData.h
@@ -0,0 +1,134 @@
+/*
+ * 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. ``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
+ * 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. 
+ */
+
+#ifndef DFGCommonData_h
+#define DFGCommonData_h
+
+#if ENABLE(DFG_JIT)
+
+#include "CodeBlockJettisoningWatchpoint.h"
+#include "DFGAdaptiveInferredPropertyValueWatchpoint.h"
+#include "DFGAdaptiveStructureWatchpoint.h"
+#include "DFGJumpReplacement.h"
+#include "InlineCallFrameSet.h"
+#include "JSCell.h"
+#include "ProfilerCompilation.h"
+#include "SymbolTable.h"
+#include <wtf/Bag.h>
+#include <wtf/Noncopyable.h>
+
+namespace JSC {
+
+class CodeBlock;
+class Identifier;
+class TrackedReferences;
+
+namespace DFG {
+
+struct Node;
+struct Plan;
+
+// CommonData holds the set of data that both DFG and FTL code blocks need to know
+// about themselves.
+
+struct WeakReferenceTransition {
+    WeakReferenceTransition() { }
+    
+    WeakReferenceTransition(VM& vm, JSCell* owner, JSCell* codeOrigin, JSCell* from, JSCell* to)
+        : m_from(vm, owner, from)
+        , m_to(vm, owner, to)
+    {
+        if (!!codeOrigin)
+            m_codeOrigin.set(vm, owner, codeOrigin);
+    }
+    
+    WriteBarrier<JSCell> m_codeOrigin;
+    WriteBarrier<JSCell> m_from;
+    WriteBarrier<JSCell> m_to;
+};
+        
+class CommonData {
+    WTF_MAKE_NONCOPYABLE(CommonData);
+public:
+    CommonData()
+        : isStillValid(true)
+        , frameRegisterCount(std::numeric_limits<unsigned>::max())
+        , requiredRegisterCountForExit(std::numeric_limits<unsigned>::max())
+    { }
+    
+    void notifyCompilingStructureTransition(Plan&, CodeBlock*, Node*);
+    CallSiteIndex addCodeOrigin(CodeOrigin);
+    CallSiteIndex addUniqueCallSiteIndex(CodeOrigin);
+    CallSiteIndex lastCallSite() const;
+    void removeCallSiteIndex(CallSiteIndex);
+    
+    void shrinkToFit();
+    
+    bool invalidate(); // Returns true if we did invalidate, or false if the code block was already invalidated.
+    
+    unsigned requiredRegisterCountForExecutionAndExit() const
+    {
+        return std::max(frameRegisterCount, requiredRegisterCountForExit);
+    }
+    
+    void validateReferences(const TrackedReferences&);
+
+    static ptrdiff_t frameRegisterCountOffset() { return OBJECT_OFFSETOF(CommonData, frameRegisterCount); }
+
+    RefPtr<InlineCallFrameSet> inlineCallFrames;
+    Vector<CodeOrigin, 0, UnsafeVectorOverflow> codeOrigins;
+    
+    Vector<Identifier> dfgIdentifiers;
+    Vector<WeakReferenceTransition> transitions;
+    Vector<WriteBarrier<JSCell>> weakReferences;
+    Vector<WriteBarrier<Structure>> weakStructureReferences;
+    Bag<CodeBlockJettisoningWatchpoint> watchpoints;
+    Bag<AdaptiveStructureWatchpoint> adaptiveStructureWatchpoints;
+    Bag<AdaptiveInferredPropertyValueWatchpoint> adaptiveInferredPropertyValueWatchpoints;
+    Vector<JumpReplacement> jumpReplacements;
+    
+    RefPtr<Profiler::Compilation> compilation;
+    bool livenessHasBeenProved; // Initialized and used on every GC.
+    bool allTransitionsHaveBeenMarked; // Initialized and used on every GC.
+    bool isStillValid;
+    
+#if USE(JSVALUE32_64)
+    std::unique_ptr<Bag<double>> doubleConstants;
+#endif
+    
+    unsigned frameRegisterCount;
+    unsigned requiredRegisterCountForExit;
+
+private:
+    HashSet<unsigned, WTF::IntHash<unsigned>, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> callSiteIndexFreeList;
+
+};
+
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)
+
+#endif // DFGCommonData_h
+