B3::Values that have effects should allow specification of custom HeapRanges

https://bugs.webkit.org/show_bug.cgi?id=150535

Reviewed by Benjamin Poulain.

Add a Effects field to calls and patchpoints. Add a HeapRange to MemoryValues.

In the process, I created a class for the CCall opcode, so that it has somewhere to put
the Effects field.

While doing this, I realized that we didn't have a good way of ensuring that an opcode
that requires a specific subclass was actually created with that subclass. So, I added
assertions for this.

* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* b3/B3ArgumentRegValue.h:
* b3/B3CCallValue.cpp: Added.
* b3/B3CCallValue.h: Added.
* b3/B3CheckValue.h:
* b3/B3Const32Value.h:
* b3/B3Const64Value.h:
* b3/B3ConstDoubleValue.h:
(JSC::B3::ConstDoubleValue::ConstDoubleValue):
* b3/B3ControlValue.h:
* b3/B3Effects.h:
(JSC::B3::Effects::forCall):
(JSC::B3::Effects::mustExecute):
* b3/B3MemoryValue.h:
* b3/B3PatchpointValue.h:
* b3/B3StackSlotValue.h:
* b3/B3UpsilonValue.h:
* b3/B3Value.cpp:
(JSC::B3::Value::effects):
(JSC::B3::Value::dumpMeta):
(JSC::B3::Value::checkOpcode):
(JSC::B3::Value::typeFor):
* b3/B3Value.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191994 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7b06430..c036054 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,46 @@
 2015-11-03  Filip Pizlo  <fpizlo@apple.com>
 
 2015-11-03  Filip Pizlo  <fpizlo@apple.com>
 

+        B3::Values that have effects should allow specification of custom HeapRanges
+        https://bugs.webkit.org/show_bug.cgi?id=150535
+
+        Reviewed by Benjamin Poulain.
+
+        Add a Effects field to calls and patchpoints. Add a HeapRange to MemoryValues.
+
+        In the process, I created a class for the CCall opcode, so that it has somewhere to put
+        the Effects field.
+
+        While doing this, I realized that we didn't have a good way of ensuring that an opcode
+        that requires a specific subclass was actually created with that subclass. So, I added
+        assertions for this.
+
+        * CMakeLists.txt:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * b3/B3ArgumentRegValue.h:
+        * b3/B3CCallValue.cpp: Added.
+        * b3/B3CCallValue.h: Added.
+        * b3/B3CheckValue.h:
+        * b3/B3Const32Value.h:
+        * b3/B3Const64Value.h:
+        * b3/B3ConstDoubleValue.h:
+        (JSC::B3::ConstDoubleValue::ConstDoubleValue):
+        * b3/B3ControlValue.h:
+        * b3/B3Effects.h:
+        (JSC::B3::Effects::forCall):
+        (JSC::B3::Effects::mustExecute):
+        * b3/B3MemoryValue.h:
+        * b3/B3PatchpointValue.h:
+        * b3/B3StackSlotValue.h:
+        * b3/B3UpsilonValue.h:
+        * b3/B3Value.cpp:
+        (JSC::B3::Value::effects):
+        (JSC::B3::Value::dumpMeta):
+        (JSC::B3::Value::checkOpcode):
+        (JSC::B3::Value::typeFor):
+        * b3/B3Value.h:
+
+2015-11-03  Filip Pizlo  <fpizlo@apple.com>
+

         B3::Stackmap should be a superclass of B3::PatchpointValue and B3::CheckValue rather than being one of their members
         https://bugs.webkit.org/show_bug.cgi?id=150831
 
         B3::Stackmap should be a superclass of B3::PatchpointValue and B3::CheckValue rather than being one of their members
         https://bugs.webkit.org/show_bug.cgi?id=150831
 

diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index aaf1f70..b8e3c24 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -280,6 +280,8 @@
                0F300B7C18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F300B7A18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h */; };
                0F32BD101BB34F190093A57F /* HeapHelperPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F32BD0E1BB34F190093A57F /* HeapHelperPool.cpp */; };
                0F32BD111BB34F190093A57F /* HeapHelperPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F32BD0F1BB34F190093A57F /* HeapHelperPool.h */; };
                0F300B7C18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F300B7A18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h */; };
                0F32BD101BB34F190093A57F /* HeapHelperPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F32BD0E1BB34F190093A57F /* HeapHelperPool.cpp */; };
                0F32BD111BB34F190093A57F /* HeapHelperPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F32BD0F1BB34F190093A57F /* HeapHelperPool.h */; };

+               0F338DF91BE96AA80013C88F /* B3CCallValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F338DF71BE96AA80013C88F /* B3CCallValue.cpp */; };
+               0F338DFA1BE96AA80013C88F /* B3CCallValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F338DF81BE96AA80013C88F /* B3CCallValue.h */; };

                0F338DF11BE93AD10013C88F /* B3StackmapValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F338DEF1BE93AD10013C88F /* B3StackmapValue.cpp */; };
                0F338DF21BE93AD10013C88F /* B3StackmapValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F338DF01BE93AD10013C88F /* B3StackmapValue.h */; };
                0F338DF51BE93D550013C88F /* B3ConstrainedValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F338DF31BE93D550013C88F /* B3ConstrainedValue.cpp */; };
                0F338DF11BE93AD10013C88F /* B3StackmapValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F338DEF1BE93AD10013C88F /* B3StackmapValue.cpp */; };
                0F338DF21BE93AD10013C88F /* B3StackmapValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F338DF01BE93AD10013C88F /* B3StackmapValue.h */; };
                0F338DF51BE93D550013C88F /* B3ConstrainedValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F338DF31BE93D550013C88F /* B3ConstrainedValue.cpp */; };


@@ -2301,6 +2303,8 @@
                0F300B7A18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGIntegerCheckCombiningPhase.h; path = dfg/DFGIntegerCheckCombiningPhase.h; sourceTree = "<group>"; };
                0F32BD0E1BB34F190093A57F /* HeapHelperPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeapHelperPool.cpp; sourceTree = "<group>"; };
                0F32BD0F1BB34F190093A57F /* HeapHelperPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapHelperPool.h; sourceTree = "<group>"; };
                0F300B7A18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGIntegerCheckCombiningPhase.h; path = dfg/DFGIntegerCheckCombiningPhase.h; sourceTree = "<group>"; };
                0F32BD0E1BB34F190093A57F /* HeapHelperPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeapHelperPool.cpp; sourceTree = "<group>"; };
                0F32BD0F1BB34F190093A57F /* HeapHelperPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapHelperPool.h; sourceTree = "<group>"; };

+               0F338DF71BE96AA80013C88F /* B3CCallValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3CCallValue.cpp; path = b3/B3CCallValue.cpp; sourceTree = "<group>"; };
+               0F338DF81BE96AA80013C88F /* B3CCallValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3CCallValue.h; path = b3/B3CCallValue.h; sourceTree = "<group>"; };

                0F338DEF1BE93AD10013C88F /* B3StackmapValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3StackmapValue.cpp; path = b3/B3StackmapValue.cpp; sourceTree = "<group>"; };
                0F338DF01BE93AD10013C88F /* B3StackmapValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3StackmapValue.h; path = b3/B3StackmapValue.h; sourceTree = "<group>"; };
                0F338DF31BE93D550013C88F /* B3ConstrainedValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3ConstrainedValue.cpp; path = b3/B3ConstrainedValue.cpp; sourceTree = "<group>"; };
                0F338DEF1BE93AD10013C88F /* B3StackmapValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3StackmapValue.cpp; path = b3/B3StackmapValue.cpp; sourceTree = "<group>"; };
                0F338DF01BE93AD10013C88F /* B3StackmapValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3StackmapValue.h; path = b3/B3StackmapValue.h; sourceTree = "<group>"; };
                0F338DF31BE93D550013C88F /* B3ConstrainedValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3ConstrainedValue.cpp; path = b3/B3ConstrainedValue.cpp; sourceTree = "<group>"; };


@@ -4397,6 +4401,8 @@
                                0FEC84B81BDACDAC0080FF74 /* B3BasicBlockInlines.h */,
                                0FEC84B91BDACDAC0080FF74 /* B3BasicBlockUtils.h */,
                                0FEC84BA1BDACDAC0080FF74 /* B3BlockWorklist.h */,
                                0FEC84B81BDACDAC0080FF74 /* B3BasicBlockInlines.h */,
                                0FEC84B91BDACDAC0080FF74 /* B3BasicBlockUtils.h */,
                                0FEC84BA1BDACDAC0080FF74 /* B3BlockWorklist.h */,

+                               0F338DF71BE96AA80013C88F /* B3CCallValue.cpp */,
+                               0F338DF81BE96AA80013C88F /* B3CCallValue.h */,

                                0FEC84BB1BDACDAC0080FF74 /* B3CheckSpecial.cpp */,
                                0FEC84BC1BDACDAC0080FF74 /* B3CheckSpecial.h */,
                                0FEC84BD1BDACDAC0080FF74 /* B3CheckValue.cpp */,
                                0FEC84BB1BDACDAC0080FF74 /* B3CheckSpecial.cpp */,
                                0FEC84BC1BDACDAC0080FF74 /* B3CheckSpecial.h */,
                                0FEC84BD1BDACDAC0080FF74 /* B3CheckValue.cpp */,


@@ -6521,6 +6527,7 @@
                                0FEC856E1BDACDC70080FF74 /* AirAllocateStack.h in Headers */,
                                0FEC85701BDACDC70080FF74 /* AirArg.h in Headers */,
                                0FEC85721BDACDC70080FF74 /* AirBasicBlock.h in Headers */,
                                0FEC856E1BDACDC70080FF74 /* AirAllocateStack.h in Headers */,
                                0FEC85701BDACDC70080FF74 /* AirArg.h in Headers */,
                                0FEC85721BDACDC70080FF74 /* AirBasicBlock.h in Headers */,

+                               0F338DFA1BE96AA80013C88F /* B3CCallValue.h in Headers */,

                                0FEC85741BDACDC70080FF74 /* AirCCallSpecial.h in Headers */,
                                0FEC85761BDACDC70080FF74 /* AirCode.h in Headers */,
                                0F4570391BE44C910062A629 /* AirEliminateDeadCode.h in Headers */,
                                0FEC85741BDACDC70080FF74 /* AirCCallSpecial.h in Headers */,
                                0FEC85761BDACDC70080FF74 /* AirCode.h in Headers */,
                                0F4570391BE44C910062A629 /* AirEliminateDeadCode.h in Headers */,


@@ -8836,6 +8843,7 @@
                                14E84F9E14EE1ACC00D6D5D4 /* WeakBlock.cpp in Sources */,
                                14F7256514EE265E00B1652B /* WeakHandleOwner.cpp in Sources */,
                                A7CA3AE317DA41AE006538AF /* WeakMapConstructor.cpp in Sources */,
                                14E84F9E14EE1ACC00D6D5D4 /* WeakBlock.cpp in Sources */,
                                14F7256514EE265E00B1652B /* WeakHandleOwner.cpp in Sources */,
                                A7CA3AE317DA41AE006538AF /* WeakMapConstructor.cpp in Sources */,

+                               0F338DF91BE96AA80013C88F /* B3CCallValue.cpp in Sources */,

                                A7CA3AEB17DA5168006538AF /* WeakMapData.cpp in Sources */,
                                A7CA3AE517DA41AE006538AF /* WeakMapPrototype.cpp in Sources */,
                                14E84FA014EE1ACC00D6D5D4 /* WeakSet.cpp in Sources */,
                                A7CA3AEB17DA5168006538AF /* WeakMapData.cpp in Sources */,
                                A7CA3AE517DA41AE006538AF /* WeakMapPrototype.cpp in Sources */,
                                14E84FA014EE1ACC00D6D5D4 /* WeakSet.cpp in Sources */,

diff --git a/Source/JavaScriptCore/b3/B3ArgumentRegValue.h b/Source/JavaScriptCore/b3/B3ArgumentRegValue.h
index cbd0f4f..09dd0b6 100644 (file)
--- a/Source/JavaScriptCore/b3/B3ArgumentRegValue.h
+++ b/Source/JavaScriptCore/b3/B3ArgumentRegValue.h
@@ -48,7 +48,7 @@ private:
     friend class Procedure;
 
     ArgumentRegValue(unsigned index, Origin origin, Reg reg)
     friend class Procedure;
 
     ArgumentRegValue(unsigned index, Origin origin, Reg reg)

-        : Value(index, ArgumentReg, reg.isGPR() ? pointerType() : Double, origin)
+        : Value(index, CheckedOpcode, ArgumentReg, reg.isGPR() ? pointerType() : Double, origin)

         , m_reg(reg)
     {
         ASSERT(reg.isSet());
         , m_reg(reg)
     {
         ASSERT(reg.isSet());

diff --git a/Source/JavaScriptCore/b3/B3CCallValue.cpp b/Source/JavaScriptCore/b3/B3CCallValue.cpp
new file mode 100644 (file)
index 0000000..7c50858
--- /dev/null
+++ b/Source/JavaScriptCore/b3/B3CCallValue.cpp
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ *
+ * 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. 
+ */
+
+#include "config.h"
+#include "B3CCallValue.h"
+
+#if ENABLE(B3_JIT)
+
+namespace JSC { namespace B3 {
+
+CCallValue::~CCallValue()
+{
+}
+
+} } // namespace JSC::B3
+
+#endif // ENABLE(B3_JIT)
+

diff --git a/Source/JavaScriptCore/b3/B3CCallValue.h b/Source/JavaScriptCore/b3/B3CCallValue.h
new file mode 100644 (file)
index 0000000..1c65e9b
--- /dev/null
+++ b/Source/JavaScriptCore/b3/B3CCallValue.h
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ *
+ * 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 B3CCallValue_h
+#define B3CCallValue_h
+
+#if ENABLE(B3_JIT)
+
+#include "B3Effects.h"
+#include "B3Value.h"
+
+namespace JSC { namespace B3 {
+
+class JS_EXPORT_PRIVATE CCallValue : public Value {
+public:
+    static bool accepts(Opcode opcode) { return opcode == CCall; }
+
+    ~CCallValue();
+
+    Effects effects;
+
+private:
+    friend class Procedure;
+
+    template<typename... Arguments>
+    CCallValue(unsigned index, Type type, Origin origin, Arguments... arguments)
+        : Value(index, CheckedOpcode, CCall, type, origin, arguments...)
+        , effects(Effects::forCall())
+    {
+    }
+};
+
+} } // namespace JSC::B3
+
+#endif // ENABLE(B3_JIT)
+
+#endif // B3CCallValue_h
+

diff --git a/Source/JavaScriptCore/b3/B3CheckValue.cpp b/Source/JavaScriptCore/b3/B3CheckValue.cpp
index 9212300..09a9e7f 100644 (file)
--- a/Source/JavaScriptCore/b3/B3CheckValue.cpp
+++ b/Source/JavaScriptCore/b3/B3CheckValue.cpp
@@ -36,7 +36,7 @@ CheckValue::~CheckValue()
 
 // Use this form for CheckAdd, CheckSub, and CheckMul.
 CheckValue::CheckValue(unsigned index, Opcode opcode, Origin origin, Value* left, Value* right)
 
 // Use this form for CheckAdd, CheckSub, and CheckMul.
 CheckValue::CheckValue(unsigned index, Opcode opcode, Origin origin, Value* left, Value* right)

-    : StackmapValue(index, opcode, left->type(), origin)
+    : StackmapValue(index, CheckedOpcode, opcode, left->type(), origin)

 {
     ASSERT(B3::isInt(type()));
     ASSERT(left->type() == right->type());
 {
     ASSERT(B3::isInt(type()));
     ASSERT(left->type() == right->type());


@@ -47,7 +47,7 @@ CheckValue::CheckValue(unsigned index, Opcode opcode, Origin origin, Value* left
 
 // Use this form for Check.
 CheckValue::CheckValue(unsigned index, Opcode opcode, Origin origin, Value* predicate)
 
 // Use this form for Check.
 CheckValue::CheckValue(unsigned index, Opcode opcode, Origin origin, Value* predicate)

-    : StackmapValue(index, opcode, Void, origin)
+    : StackmapValue(index, CheckedOpcode, opcode, Void, origin)

 {
     ASSERT(opcode == Check);
     append(predicate);
 {
     ASSERT(opcode == Check);
     append(predicate);

diff --git a/Source/JavaScriptCore/b3/B3Const32Value.h b/Source/JavaScriptCore/b3/B3Const32Value.h
index afed120..6257a64 100644 (file)
--- a/Source/JavaScriptCore/b3/B3Const32Value.h
+++ b/Source/JavaScriptCore/b3/B3Const32Value.h
@@ -55,7 +55,7 @@ protected:
     friend class Procedure;
 
     Const32Value(unsigned index, Origin origin, int32_t value)
     friend class Procedure;
 
     Const32Value(unsigned index, Origin origin, int32_t value)

-        : Value(index, Const32, Int32, origin)
+        : Value(index, CheckedOpcode, Const32, Int32, origin)

         , m_value(value)
     {
     }
         , m_value(value)
     {
     }

diff --git a/Source/JavaScriptCore/b3/B3Const64Value.h b/Source/JavaScriptCore/b3/B3Const64Value.h
index 58b994a..53bbbf6 100644 (file)
--- a/Source/JavaScriptCore/b3/B3Const64Value.h
+++ b/Source/JavaScriptCore/b3/B3Const64Value.h
@@ -55,7 +55,7 @@ protected:
     friend class Procedure;
 
     Const64Value(unsigned index, Origin origin, int64_t value)
     friend class Procedure;
 
     Const64Value(unsigned index, Origin origin, int64_t value)

-        : Value(index, Const64, Int64, origin)
+        : Value(index, CheckedOpcode, Const64, Int64, origin)

         , m_value(value)
     {
     }
         , m_value(value)
     {
     }

diff --git a/Source/JavaScriptCore/b3/B3ConstDoubleValue.h b/Source/JavaScriptCore/b3/B3ConstDoubleValue.h
index d528972..fb175e5 100644 (file)
--- a/Source/JavaScriptCore/b3/B3ConstDoubleValue.h
+++ b/Source/JavaScriptCore/b3/B3ConstDoubleValue.h
@@ -54,7 +54,7 @@ private:
     friend class Procedure;
 
     ConstDoubleValue(unsigned index, Origin origin, double value)
     friend class Procedure;
 
     ConstDoubleValue(unsigned index, Origin origin, double value)

-        : Value(index, ConstDouble, Double, origin)
+        : Value(index, CheckedOpcode, ConstDouble, Double, origin)

         , m_value(value)
     {
     }
         , m_value(value)
     {
     }

diff --git a/Source/JavaScriptCore/b3/B3ControlValue.h b/Source/JavaScriptCore/b3/B3ControlValue.h
index bee39d7..f0d4d5b 100644 (file)
--- a/Source/JavaScriptCore/b3/B3ControlValue.h
+++ b/Source/JavaScriptCore/b3/B3ControlValue.h
@@ -95,6 +95,7 @@ protected:
     ControlValue(unsigned index, Opcode opcode, Type type, Origin origin, Arguments... arguments)
         : Value(index, opcode, type, origin, arguments...)
     {
     ControlValue(unsigned index, Opcode opcode, Type type, Origin origin, Arguments... arguments)
         : Value(index, opcode, type, origin, arguments...)
     {

+        ASSERT(accepts(opcode));

     }
 
     // Subclasses will populate this.
     }
 
     // Subclasses will populate this.


@@ -105,21 +106,21 @@ private:
 
     // Use this for Oops.
     ControlValue(unsigned index, Opcode opcode, Origin origin)
 
     // Use this for Oops.
     ControlValue(unsigned index, Opcode opcode, Origin origin)

-        : Value(index, opcode, Void, origin)
+        : Value(index, CheckedOpcode, opcode, Void, origin)

     {
         ASSERT(opcode == Oops);
     }
 
     // Use this for Return.
     ControlValue(unsigned index, Opcode opcode, Origin origin, Value* result)
     {
         ASSERT(opcode == Oops);
     }
 
     // Use this for Return.
     ControlValue(unsigned index, Opcode opcode, Origin origin, Value* result)

-        : Value(index, opcode, Void, origin, result)
+        : Value(index, CheckedOpcode, opcode, Void, origin, result)

     {
         ASSERT(opcode == Return);
     }
 
     // Use this for Jump.
     ControlValue(unsigned index, Opcode opcode, Origin origin, const FrequentedBlock& target)
     {
         ASSERT(opcode == Return);
     }
 
     // Use this for Jump.
     ControlValue(unsigned index, Opcode opcode, Origin origin, const FrequentedBlock& target)

-        : Value(index, opcode, Void, origin)
+        : Value(index, CheckedOpcode, opcode, Void, origin)

     {
         ASSERT(opcode == Jump);
         m_successors.append(target);
     {
         ASSERT(opcode == Jump);
         m_successors.append(target);


@@ -129,7 +130,7 @@ private:
     ControlValue(
         unsigned index, Opcode opcode, Origin origin, Value* predicate,
         const FrequentedBlock& yes, const FrequentedBlock& no)
     ControlValue(
         unsigned index, Opcode opcode, Origin origin, Value* predicate,
         const FrequentedBlock& yes, const FrequentedBlock& no)

-        : Value(index, opcode, Void, origin, predicate)
+        : Value(index, CheckedOpcode, opcode, Void, origin, predicate)

     {
         ASSERT(opcode == Branch);
         m_successors.append(yes);
     {
         ASSERT(opcode == Branch);
         m_successors.append(yes);

diff --git a/Source/JavaScriptCore/b3/B3Effects.h b/Source/JavaScriptCore/b3/B3Effects.h
index b262c29..772d4d3 100644 (file)
--- a/Source/JavaScriptCore/b3/B3Effects.h
+++ b/Source/JavaScriptCore/b3/B3Effects.h
@@ -55,6 +55,16 @@ struct Effects {
     HeapRange writes;
     HeapRange reads;
 
     HeapRange writes;
     HeapRange reads;
 

+    static Effects forCall()
+    {
+        Effects result;
+        result.exitsSideways = true;
+        result.controlDependent = true;
+        result.writes = HeapRange::top();
+        result.reads = HeapRange::top();
+        return result;
+    }
+

     bool mustExecute() const
     {
         return terminal || exitsSideways || writesSSAState || writes;
     bool mustExecute() const
     {
         return terminal || exitsSideways || writesSSAState || writes;

diff --git a/Source/JavaScriptCore/b3/B3MemoryValue.h b/Source/JavaScriptCore/b3/B3MemoryValue.h
index 2e4d4ee..e2a104c 100644 (file)
--- a/Source/JavaScriptCore/b3/B3MemoryValue.h
+++ b/Source/JavaScriptCore/b3/B3MemoryValue.h
@@ -28,14 +28,11 @@
 
 #if ENABLE(B3_JIT)
 
 
 #if ENABLE(B3_JIT)
 

+#include "B3HeapRange.h"

 #include "B3Value.h"
 
 namespace JSC { namespace B3 {
 
 #include "B3Value.h"
 
 namespace JSC { namespace B3 {
 

-// FIXME: Add alias analysis to these by allowing the client to associate an integer range to the
-// value. Two operations may access the same memory if their ranges overlaps.
-// https://bugs.webkit.org/show_bug.cgi?id=150535
-

 class JS_EXPORT_PRIVATE MemoryValue : public Value {
 public:
     static bool accepts(Opcode opcode)
 class JS_EXPORT_PRIVATE MemoryValue : public Value {
 public:
     static bool accepts(Opcode opcode)


@@ -62,6 +59,9 @@ public:
     int32_t offset() const { return m_offset; }
     void setOffset(int32_t offset) { m_offset = offset; }
 
     int32_t offset() const { return m_offset; }
     void setOffset(int32_t offset) { m_offset = offset; }
 

+    const HeapRange& range() const { return m_range; }
+    void setRange(const HeapRange& range) { m_range = range; }
+

     size_t accessByteSize() const;
 
 protected:
     size_t accessByteSize() const;
 
 protected:


@@ -75,8 +75,9 @@ private:
     MemoryValue(
         unsigned index, Opcode opcode, Type type, Origin origin, Value* pointer,
         int32_t offset = 0)
     MemoryValue(
         unsigned index, Opcode opcode, Type type, Origin origin, Value* pointer,
         int32_t offset = 0)

-        : Value(index, opcode, type, origin, pointer)
+        : Value(index, CheckedOpcode, opcode, type, origin, pointer)

         , m_offset(offset)
         , m_offset(offset)

+        , m_range(HeapRange::top())

     {
         if (!ASSERT_DISABLED) {
             switch (opcode) {
     {
         if (!ASSERT_DISABLED) {
             switch (opcode) {


@@ -113,8 +114,9 @@ private:
     MemoryValue(
         unsigned index, Opcode opcode, Origin origin, Value* value, Value* pointer,
         int32_t offset = 0)
     MemoryValue(
         unsigned index, Opcode opcode, Origin origin, Value* value, Value* pointer,
         int32_t offset = 0)

-        : Value(index, opcode, Void, origin, value, pointer)
+        : Value(index, CheckedOpcode, opcode, Void, origin, value, pointer)

         , m_offset(offset)
         , m_offset(offset)

+        , m_range(HeapRange::top())

     {
         if (!ASSERT_DISABLED) {
             switch (opcode) {
     {
         if (!ASSERT_DISABLED) {
             switch (opcode) {


@@ -131,6 +133,7 @@ private:
     }
 
     int32_t m_offset { 0 };
     }
 
     int32_t m_offset { 0 };

+    HeapRange m_range;

 };
 
 } } // namespace JSC::B3
 };
 
 } } // namespace JSC::B3

diff --git a/Source/JavaScriptCore/b3/B3PatchpointValue.cpp b/Source/JavaScriptCore/b3/B3PatchpointValue.cpp
index 52012ea..6345ee3 100644 (file)
--- a/Source/JavaScriptCore/b3/B3PatchpointValue.cpp
+++ b/Source/JavaScriptCore/b3/B3PatchpointValue.cpp
@@ -35,7 +35,7 @@ PatchpointValue::~PatchpointValue()
 }
 
 PatchpointValue::PatchpointValue(unsigned index, Type type, Origin origin)
 }
 
 PatchpointValue::PatchpointValue(unsigned index, Type type, Origin origin)

-    : StackmapValue(index, Patchpoint, type, origin)
+    : StackmapValue(index, CheckedOpcode, Patchpoint, type, origin)

 {
 }
 
 {
 }
 

diff --git a/Source/JavaScriptCore/b3/B3PatchpointValue.h b/Source/JavaScriptCore/b3/B3PatchpointValue.h
index 1c0945d..13434f4 100644 (file)
--- a/Source/JavaScriptCore/b3/B3PatchpointValue.h
+++ b/Source/JavaScriptCore/b3/B3PatchpointValue.h
@@ -28,7 +28,9 @@
 
 #if ENABLE(B3_JIT)
 
 
 #if ENABLE(B3_JIT)
 

+#include "B3Effects.h"

 #include "B3StackmapValue.h"
 #include "B3StackmapValue.h"

+#include "B3Value.h"

 
 namespace JSC { namespace B3 {
 
 
 namespace JSC { namespace B3 {
 


@@ -38,6 +40,8 @@ public:
 
     ~PatchpointValue();
 
 
     ~PatchpointValue();
 

+    Effects effects;
+

 private:
     friend class Procedure;
 
 private:
     friend class Procedure;
 

diff --git a/Source/JavaScriptCore/b3/B3StackSlotValue.h b/Source/JavaScriptCore/b3/B3StackSlotValue.h
index d5c4323..6904b5e 100644 (file)
--- a/Source/JavaScriptCore/b3/B3StackSlotValue.h
+++ b/Source/JavaScriptCore/b3/B3StackSlotValue.h
@@ -64,7 +64,7 @@ private:
     friend class Procedure;
 
     StackSlotValue(unsigned index, Origin origin, unsigned byteSize, StackSlotKind kind)
     friend class Procedure;
 
     StackSlotValue(unsigned index, Origin origin, unsigned byteSize, StackSlotKind kind)

-        : Value(index, StackSlot, pointerType(), origin)
+        : Value(index, CheckedOpcode, StackSlot, pointerType(), origin)

         , m_byteSize(byteSize)
         , m_kind(kind)
         , m_offsetFromFP(0)
         , m_byteSize(byteSize)
         , m_kind(kind)
         , m_offsetFromFP(0)

diff --git a/Source/JavaScriptCore/b3/B3StackmapValue.cpp b/Source/JavaScriptCore/b3/B3StackmapValue.cpp
index 69a4722..7372110 100644 (file)
--- a/Source/JavaScriptCore/b3/B3StackmapValue.cpp
+++ b/Source/JavaScriptCore/b3/B3StackmapValue.cpp
@@ -78,9 +78,10 @@ void StackmapValue::dumpMeta(CommaPrinter& comma, PrintStream& out) const
         ", usedRegisters = ", m_usedRegisters);
 }
 
         ", usedRegisters = ", m_usedRegisters);
 }
 

-StackmapValue::StackmapValue(unsigned index, Opcode opcode, Type type, Origin origin)
-    : Value(index, opcode, type, origin)
+StackmapValue::StackmapValue(unsigned index, CheckedOpcodeTag, Opcode opcode, Type type, Origin origin)
+    : Value(index, CheckedOpcode, opcode, type, origin)

 {
 {

+    ASSERT(accepts(opcode));

 }
 
 } } // namespace JSC::B3
 }
 
 } } // namespace JSC::B3

diff --git a/Source/JavaScriptCore/b3/B3StackmapValue.h b/Source/JavaScriptCore/b3/B3StackmapValue.h
index 95cc69b..aaa9030 100644 (file)
--- a/Source/JavaScriptCore/b3/B3StackmapValue.h
+++ b/Source/JavaScriptCore/b3/B3StackmapValue.h
@@ -176,7 +176,7 @@ protected:
     void dumpChildren(CommaPrinter&, PrintStream&) const override;
     void dumpMeta(CommaPrinter&, PrintStream&) const override;
 
     void dumpChildren(CommaPrinter&, PrintStream&) const override;
     void dumpMeta(CommaPrinter&, PrintStream&) const override;
 

-    StackmapValue(unsigned index, Opcode, Type, Origin);
+    StackmapValue(unsigned index, CheckedOpcodeTag, Opcode, Type, Origin);

 
 private:
     friend class CheckSpecial;
 
 private:
     friend class CheckSpecial;

diff --git a/Source/JavaScriptCore/b3/B3UpsilonValue.h b/Source/JavaScriptCore/b3/B3UpsilonValue.h
index dec83de..9d5ca6a 100644 (file)
--- a/Source/JavaScriptCore/b3/B3UpsilonValue.h
+++ b/Source/JavaScriptCore/b3/B3UpsilonValue.h
@@ -56,7 +56,7 @@ private:
     // the Upsilons without the Phi, then create the Phi, then go back and tell the Upsilons about
     // the Phi. This allows you to emit code in its natural order.
     UpsilonValue(unsigned index, Origin origin, Value* value, Value* phi = nullptr)
     // the Upsilons without the Phi, then create the Phi, then go back and tell the Upsilons about
     // the Phi. This allows you to emit code in its natural order.
     UpsilonValue(unsigned index, Origin origin, Value* value, Value* phi = nullptr)

-        : Value(index, Upsilon, Void, origin, value)
+        : Value(index, CheckedOpcode, Upsilon, Void, origin, value)

         , m_phi(phi)
     {
         if (phi) {
         , m_phi(phi)
     {
         if (phi) {

diff --git a/Source/JavaScriptCore/b3/B3Value.cpp b/Source/JavaScriptCore/b3/B3Value.cpp
index 7590cc2..b289166 100644 (file)
--- a/Source/JavaScriptCore/b3/B3Value.cpp
+++ b/Source/JavaScriptCore/b3/B3Value.cpp
@@ -28,6 +28,12 @@
 
 #if ENABLE(B3_JIT)
 
 
 #if ENABLE(B3_JIT)
 

+#include "B3ArgumentRegValue.h"
+#include "B3CCallValue.h"
+#include "B3ControlValue.h"
+#include "B3MemoryValue.h"
+#include "B3StackSlotValue.h"
+#include "B3UpsilonValue.h"

 #include "B3ValueInlines.h"
 #include <wtf/CommaPrinter.h>
 #include <wtf/StringPrintStream.h>
 #include "B3ValueInlines.h"
 #include <wtf/CommaPrinter.h>
 #include <wtf/StringPrintStream.h>


@@ -241,26 +247,21 @@ Effects Value::effects() const
     case Load16S:
     case LoadFloat:
     case Load:
     case Load16S:
     case LoadFloat:
     case Load:

-        // FIXME: MemoryValue should have a HeapRange.
-        // https://bugs.webkit.org/show_bug.cgi?id=150535
-        result.reads = HeapRange::top();
+        result.reads = as<MemoryValue>()->range();

         result.controlDependent = true;
         break;
     case Store8:
     case Store16:
     case StoreFloat:
     case Store:
         result.controlDependent = true;
         break;
     case Store8:
     case Store16:
     case StoreFloat:
     case Store:

-        // FIXME: MemoryValue should have a HeapRange.
-        // https://bugs.webkit.org/show_bug.cgi?id=150535
-        result.writes = HeapRange::top();
+        result.writes = as<MemoryValue>()->range();

         result.controlDependent = true;
         break;
     case CCall:
         result.controlDependent = true;
         break;
     case CCall:

+        result = as<CCallValue>()->effects;
+        break;

     case Patchpoint:
     case Patchpoint:

-        result.reads = HeapRange::top();
-        result.writes = HeapRange::top();
-        result.exitsSideways = true;
-        result.controlDependent = true;
+        result = as<PatchpointValue>()->effects;

         break;
     case CheckAdd:
     case CheckSub:
         break;
     case CheckAdd:
     case CheckSub:


@@ -297,6 +298,23 @@ void Value::dumpMeta(CommaPrinter&, PrintStream&) const
 {
 }
 
 {
 }
 

+#if !ASSERT_DISABLED
+void Value::checkOpcode(Opcode opcode)
+{
+    ASSERT(!ArgumentRegValue::accepts(opcode));
+    ASSERT(!CCallValue::accepts(opcode));
+    ASSERT(!CheckValue::accepts(opcode));
+    ASSERT(!Const32Value::accepts(opcode));
+    ASSERT(!Const64Value::accepts(opcode));
+    ASSERT(!ConstDoubleValue::accepts(opcode));
+    ASSERT(!ControlValue::accepts(opcode));
+    ASSERT(!MemoryValue::accepts(opcode));
+    ASSERT(!PatchpointValue::accepts(opcode));
+    ASSERT(!StackSlotValue::accepts(opcode));
+    ASSERT(!UpsilonValue::accepts(opcode));
+}
+#endif // !ASSERT_DISABLED
+

 Type Value::typeFor(Opcode opcode, Value* firstChild)
 {
     switch (opcode) {
 Type Value::typeFor(Opcode opcode, Value* firstChild)
 {
     switch (opcode) {

diff --git a/Source/JavaScriptCore/b3/B3Value.h b/Source/JavaScriptCore/b3/B3Value.h
index 144dc2c..1795317 100644 (file)
--- a/Source/JavaScriptCore/b3/B3Value.h
+++ b/Source/JavaScriptCore/b3/B3Value.h
@@ -159,15 +159,24 @@ public:
 protected:
     virtual void dumpChildren(CommaPrinter&, PrintStream&) const;
     virtual void dumpMeta(CommaPrinter&, PrintStream&) const;
 protected:
     virtual void dumpChildren(CommaPrinter&, PrintStream&) const;
     virtual void dumpMeta(CommaPrinter&, PrintStream&) const;

-    
+

 private:
     friend class Procedure;
 
 private:
     friend class Procedure;
 

+    // Checks that this opcode is valid for use with B3::Value.
+#if ASSERT_DISABLED
+    static void checkOpcode(Opcode) { }
+#else
+    static void checkOpcode(Opcode);
+#endif
+

 protected:
 protected:

+    enum CheckedOpcodeTag { CheckedOpcode };
+    

     // Instantiate values via Procedure.
     // This form requires specifying the type explicitly:
     template<typename... Arguments>
     // Instantiate values via Procedure.
     // This form requires specifying the type explicitly:
     template<typename... Arguments>

-    explicit Value(unsigned index, Opcode opcode, Type type, Origin origin, Value* firstChild, Arguments... arguments)
+    explicit Value(unsigned index, CheckedOpcodeTag, Opcode opcode, Type type, Origin origin, Value* firstChild, Arguments... arguments)

         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)
         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)


@@ -176,7 +185,7 @@ protected:
     {
     }
     // This form is for specifying the type explicitly when the opcode has no children:
     {
     }
     // This form is for specifying the type explicitly when the opcode has no children:

-    explicit Value(unsigned index, Opcode opcode, Type type, Origin origin)
+    explicit Value(unsigned index, CheckedOpcodeTag, Opcode opcode, Type type, Origin origin)

         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)
         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)


@@ -185,7 +194,7 @@ protected:
     }
     // This form is for those opcodes that can infer their type from the opcode and first child:
     template<typename... Arguments>
     }
     // This form is for those opcodes that can infer their type from the opcode and first child:
     template<typename... Arguments>

-    explicit Value(unsigned index, Opcode opcode, Origin origin, Value* firstChild, Arguments... arguments)
+    explicit Value(unsigned index, CheckedOpcodeTag, Opcode opcode, Origin origin, Value* firstChild, Arguments... arguments)

         : m_index(index)
         , m_opcode(opcode)
         , m_type(typeFor(opcode, firstChild))
         : m_index(index)
         , m_opcode(opcode)
         , m_type(typeFor(opcode, firstChild))


@@ -195,7 +204,7 @@ protected:
     }
     // This form is for those opcodes that can infer their type from the opcode alone, and that don't
     // take any arguments:
     }
     // This form is for those opcodes that can infer their type from the opcode alone, and that don't
     // take any arguments:

-    explicit Value(unsigned index, Opcode opcode, Origin origin)
+    explicit Value(unsigned index, CheckedOpcodeTag, Opcode opcode, Origin origin)

         : m_index(index)
         , m_opcode(opcode)
         , m_type(typeFor(opcode, nullptr))
         : m_index(index)
         , m_opcode(opcode)
         , m_type(typeFor(opcode, nullptr))


@@ -203,7 +212,7 @@ protected:
     {
     }
     // Use this form for varargs.
     {
     }
     // Use this form for varargs.

-    explicit Value(unsigned index, Opcode opcode, Type type, Origin origin, const AdjacencyList& children)
+    explicit Value(unsigned index, CheckedOpcodeTag, Opcode opcode, Type type, Origin origin, const AdjacencyList& children)

         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)
         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)


@@ -211,7 +220,7 @@ protected:
         , m_children(children)
     {
     }
         , m_children(children)
     {
     }

-    explicit Value(unsigned index, Opcode opcode, Type type, Origin origin, AdjacencyList&& children)
+    explicit Value(unsigned index, CheckedOpcodeTag, Opcode opcode, Type type, Origin origin, AdjacencyList&& children)

         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)
         : m_index(index)
         , m_opcode(opcode)
         , m_type(type)


@@ -220,6 +229,15 @@ protected:
     {
     }
 
     {
     }
 

+    // This is the constructor you end up actually calling, if you're instantiating Value
+    // directly.
+    template<typename... Arguments>
+    explicit Value(unsigned index, Opcode opcode, Arguments&&... arguments)
+        : Value(index, CheckedOpcode, opcode, std::forward<Arguments>(arguments)...)
+    {
+        checkOpcode(opcode);
+    }
+

 private:
     static Type typeFor(Opcode, Value* firstChild);
 
 private:
     static Type typeFor(Opcode, Value* firstChild);