Changeset 221823 in webkit for trunk/Source/JavaScriptCore/assembler/ProbeContext.h

Timestamp:

Sep 9, 2017, 9:54:40 AM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r221774.

This change introduced three debug JSC test timeouts.

Reverted changeset:

"Use JIT probes for DFG OSR exit."
​https://bugs.webkit.org/show_bug.cgi?id=175144
​http://trac.webkit.org/changeset/221774

File:

• trunk/Source/JavaScriptCore/assembler/ProbeContext.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/assembler/ProbeContext.h

@@ -46 +46 @@
     inline double& fpr(FPRegisterID);
 
-    template<typename T> T gpr(RegisterID) const;
-    template<typename T> T spr(SPRegisterID) const;
+    template<typename T, typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
+    T gpr(RegisterID) const;
+    template<typename T, typename std::enable_if<std::is_pointer<T>::value>::type* = nullptr>
+    T gpr(RegisterID) const;
+    template<typename T, typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
+    T spr(SPRegisterID) const;
+    template<typename T, typename std::enable_if<std::is_pointer<T>::value>::type* = nullptr>
+    T spr(SPRegisterID) const;
     template<typename T> T fpr(FPRegisterID) const;
 
@@ -80 +86 @@
 }
 
-template<typename T>
+template<typename T, typename std::enable_if<std::is_integral<T>::value>::type*>
 T CPUState::gpr(RegisterID id) const
 {
     CPUState* cpu = const_cast<CPUState*>(this);
-    auto& from = cpu->gpr(id);
-    typename std::remove_const<T>::type to { };
-    std::memcpy(&to, &from, sizeof(to)); // Use std::memcpy to avoid strict aliasing issues.
-    return to;
-}
-
-template<typename T>
+    return static_cast<T>(cpu->gpr(id));
+}
+
+template<typename T, typename std::enable_if<std::is_pointer<T>::value>::type*>
+T CPUState::gpr(RegisterID id) const
+{
+    CPUState* cpu = const_cast<CPUState*>(this);
+    return reinterpret_cast<T>(cpu->gpr(id));
+}
+
+template<typename T, typename std::enable_if<std::is_integral<T>::value>::type*>
 T CPUState::spr(SPRegisterID id) const
 {
     CPUState* cpu = const_cast<CPUState*>(this);
-    auto& from = cpu->spr(id);
-    typename std::remove_const<T>::type to { };
-    std::memcpy(&to, &from, sizeof(to)); // Use std::memcpy to avoid strict aliasing issues.
-    return to;
+    return static_cast<T>(cpu->spr(id));
+}
+
+template<typename T, typename std::enable_if<std::is_pointer<T>::value>::type*>
+T CPUState::spr(SPRegisterID id) const
+{
+    CPUState* cpu = const_cast<CPUState*>(this);
+    return reinterpret_cast<T>(cpu->spr(id));
 }
 
@@ -192 +206 @@
 
     Context(State* state)
-        : cpu(state->cpu)
-        , m_state(state)
+        : m_state(state)
+        , arg(state->arg)
+        , cpu(state->cpu)
     { }
 
-    template<typename T>
-    T arg() { return reinterpret_cast<T>(m_state->arg); }
-
-    uintptr_t& gpr(RegisterID id) { return cpu.gpr(id); }
-    uintptr_t& spr(SPRegisterID id) { return cpu.spr(id); }
-    double& fpr(FPRegisterID id) { return cpu.fpr(id); }
-    const char* gprName(RegisterID id) { return cpu.gprName(id); }
-    const char* sprName(SPRegisterID id) { return cpu.sprName(id); }
-    const char* fprName(FPRegisterID id) { return cpu.fprName(id); }
-
-    template<typename T> T gpr(RegisterID id) const { return cpu.gpr<T>(id); }
-    template<typename T> T spr(SPRegisterID id) const { return cpu.spr<T>(id); }
-    template<typename T> T fpr(FPRegisterID id) const { return cpu.fpr<T>(id); }
-
-    void*& pc() { return cpu.pc(); }
-    void*& fp() { return cpu.fp(); }
-    void*& sp() { return cpu.sp(); }
-
-    template<typename T> T pc() { return cpu.pc<T>(); }
-    template<typename T> T fp() { return cpu.fp<T>(); }
-    template<typename T> T sp() { return cpu.sp<T>(); }
+    uintptr_t& gpr(RegisterID id) { return m_state->cpu.gpr(id); }
+    uintptr_t& spr(SPRegisterID id) { return m_state->cpu.spr(id); }
+    double& fpr(FPRegisterID id) { return m_state->cpu.fpr(id); }
+    const char* gprName(RegisterID id) { return m_state->cpu.gprName(id); }
+    const char* sprName(SPRegisterID id) { return m_state->cpu.sprName(id); }
+    const char* fprName(FPRegisterID id) { return m_state->cpu.fprName(id); }
+
+    void*& pc() { return m_state->cpu.pc(); }
+    void*& fp() { return m_state->cpu.fp(); }
+    void*& sp() { return m_state->cpu.sp(); }
+
+    template<typename T> T pc() { return m_state->cpu.pc<T>(); }
+    template<typename T> T fp() { return m_state->cpu.fp<T>(); }
+    template<typename T> T sp() { return m_state->cpu.sp<T>(); }
 
     Stack& stack()
@@ -227 +235 @@
     Stack* releaseStack() { return new Stack(WTFMove(m_stack)); }
 
-    CPUState& cpu;
-
 private:
     State* m_state;
+public:
+    void* arg;
+    CPUState& cpu;
+
+private:
     Stack m_stack;