Changeset 251372 in webkit

Timestamp:

Oct 21, 2019 12:15:26 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

Remove all uses of untagCodePtr in debugging code.
​https://bugs.webkit.org/show_bug.cgi?id=203188
<rdar://problem/56453043>

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

• runtime/JSCPtrTag.cpp:

(JSC::tagForPtr):

Source/WTF:

We want the ability to always assert on failure to authenticate in untagCodePtr
(though we don't currently do that yet).

• wtf/PtrTag.cpp:

(WTF::tagForPtr):

• wtf/PtrTag.h:

(WTF::retagCodePtrImpl):
(WTF::tagCFunctionPtrImpl):
(WTF::untagCFunctionPtrImpl):
(WTF::assertIsCFunctionPtr):
(WTF::isTaggedWith):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/JSCPtrTag.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PtrTag.cpp (modified) (1 diff)
• WTF/wtf/PtrTag.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-10-21  Mark Lam  <mark.lam@apple.com>
+
+        Remove all uses of untagCodePtr in debugging code.
+        https://bugs.webkit.org/show_bug.cgi?id=203188
+        <rdar://problem/56453043> 
+
+        Reviewed by Yusuke Suzuki.
+
+        * runtime/JSCPtrTag.cpp:
+        (JSC::tagForPtr):
+
 2019-10-21  Robin Morisset  <rmorisset@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSCPtrTag.cpp

@@ -34 +34 @@
 {
 #define RETURN_NAME_IF_TAG_MATCHES(tag) \
-    if (WTF::untagCodePtrImpl<WTF::PtrTagAction::NoAssert>(ptr, JSC::tag) == removeCodePtrTag(ptr)) \
+    if (ptr == WTF::tagCodePtrImpl<WTF::PtrTagAction::NoAssert>(removeCodePtrTag(ptr), JSC::tag)) \
         return #tag;
     FOR_EACH_JSC_PTRTAG(RETURN_NAME_IF_TAG_MATCHES)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-10-20  Mark Lam  <mark.lam@apple.com>
+
+        Remove all uses of untagCodePtr in debugging code.
+        https://bugs.webkit.org/show_bug.cgi?id=203188
+        <rdar://problem/56453043> 
+
+        Reviewed by Yusuke Suzuki.
+
+        We want the ability to always assert on failure to authenticate in untagCodePtr
+        (though we don't currently do that yet).
+
+        * wtf/PtrTag.cpp:
+        (WTF::tagForPtr):
+        * wtf/PtrTag.h:
+        (WTF::retagCodePtrImpl):
+        (WTF::tagCFunctionPtrImpl):
+        (WTF::untagCFunctionPtrImpl):
+        (WTF::assertIsCFunctionPtr):
+        (WTF::isTaggedWith):
+
 2019-10-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WTF/wtf/PtrTag.cpp

@@ -47 +47 @@
 
 #define RETURN_NAME_IF_TAG_MATCHES(tag) \
-    if (untagCodePtrImpl<PtrTagAction::NoAssert>(ptr, tag) == removeCodePtrTag(ptr)) \
+    if (ptr == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), tag)) \
         return #tag;
     FOR_EACH_WTF_PTRTAG(RETURN_NAME_IF_TAG_MATCHES)

trunk/Source/WTF/wtf/PtrTag.h

@@ -264 +264 @@
         return nullptr;
     PtrTagAction untagAction = (tagAction == PtrTagAction::NoAssert) ? PtrTagAction::NoAssert : PtrTagAction::ReleaseAssert;
-    WTF_PTRTAG_ASSERT(untagAction, ptr, oldTag, removeCodePtrTag(ptr) == untagCodePtrImpl<PtrTagAction::NoAssert>(ptr, oldTag));
+    WTF_PTRTAG_ASSERT(untagAction, ptr, oldTag, ptr == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), oldTag));
     PtrType result = retagCodePtrImplHelper<tagAction>(ptr, oldTag, newTag);
     WTF_PTRTAG_ASSERT(tagAction, ptr, newTag, result == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), newTag));
@@ -296 +296 @@
     if (!ptr)
         return nullptr;
-    WTF_PTRTAG_ASSERT(tagAction, ptr, CFunctionPtrTag, removeCodePtrTag(ptr) == untagCodePtrImpl<PtrTagAction::NoAssert>(ptr, CFunctionPtrTag));
+    WTF_PTRTAG_ASSERT(tagAction, ptr, CFunctionPtrTag, ptr == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), CFunctionPtrTag));
     return retagCodePtrImpl<tagAction>(ptr, CFunctionPtrTag, tag);
 }
@@ -326 +326 @@
     if (!ptr)
         return nullptr;
-    WTF_PTRTAG_ASSERT(tagAction, ptr, tag, removeCodePtrTag(ptr) == untagCodePtrImpl<PtrTagAction::NoAssert>(ptr, tag));
+    WTF_PTRTAG_ASSERT(tagAction, ptr, tag, ptr == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), tag));
     return retagCodePtrImpl<tagAction>(ptr, tag, CFunctionPtrTag);
 }
@@ -368 +368 @@
 {
     void* ptr = bitwise_cast<void*>(value);
-    WTF_PTRTAG_ASSERT(PtrTagAction::ReleaseAssert, ptr, CFunctionPtrTag, untagCodePtrImpl<PtrTagAction::NoAssert>(ptr, CFunctionPtrTag) == removeCodePtrTag(ptr));
+    WTF_PTRTAG_ASSERT(PtrTagAction::ReleaseAssert, ptr, CFunctionPtrTag, ptr == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), CFunctionPtrTag));
 }
 
@@ -405 +405 @@
     if (tag == NoPtrTag)
         return ptr == removeCodePtrTag(ptr);
-    return untagCodePtrImpl<PtrTagAction::NoAssert>(ptr, tag) == removeCodePtrTag(ptr);
+    return ptr == tagCodePtrImpl<PtrTagAction::NoAssert>(removeCodePtrTag(ptr), tag);
 }