Changeset 259848 in webkit

Timestamp:

Apr 9, 2020 11:25:42 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Fix bad tests in testmasm's testCagePreservesPACFailureBit().
​https://bugs.webkit.org/show_bug.cgi?id=210314
<rdar://problem/61556785>

Reviewed by Yusuke Suzuki.

Some of these tests will crash when validated untagging is enabled.

• assembler/testmasm.cpp:

(JSC::testCagePreservesPACFailureBit):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/testmasm.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-09  Mark Lam  <mark.lam@apple.com>
+
+        Fix bad tests in testmasm's testCagePreservesPACFailureBit().
+        https://bugs.webkit.org/show_bug.cgi?id=210314
+        <rdar://problem/61556785>
+
+        Reviewed by Yusuke Suzuki.
+
+        Some of these tests will crash when validated untagging is enabled.
+
+        * assembler/testmasm.cpp:
+        (JSC::testCagePreservesPACFailureBit):
+
 2020-04-08  Darin Adler  <darin@apple.com>
 

trunk/Source/JavaScriptCore/assembler/testmasm.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2133 +2133 @@
 
     if (isARM64E()) {
-        // FIXME: This won't work if authentication failures trap but I don't know how to test for that right now.
         CHECK_NOT_EQ(invoke<void*>(cage, taggedPtr, 2), ptr);
-        CHECK_EQ(invoke<void*>(cage, taggedNotCagedPtr, 1), untagArrayPtr(taggedPtr, 2));
+        CHECK_NOT_EQ(invoke<void*>(cage, taggedNotCagedPtr, 1), ptr);
     } else
         CHECK_EQ(invoke<void*>(cage, taggedPtr, 2), ptr);
@@ -2151 +2150 @@
     CHECK_EQ(invoke<void*>(cageWithoutAuthentication, taggedPtr), taggedPtr);
     if (isARM64E()) {
-        // FIXME: This won't work if authentication failures trap but I don't know how to test for that right now.
         CHECK_NOT_EQ(invoke<void*>(cageWithoutAuthentication, taggedNotCagedPtr), taggedNotCagedPtr);
-        CHECK_NOT_EQ(untagArrayPtr(invoke<void*>(cageWithoutAuthentication, taggedNotCagedPtr), 1), notCagedPtr);
+        CHECK_NOT_EQ(invoke<void*>(cageWithoutAuthentication, taggedNotCagedPtr), tagArrayPtr(notCagedPtr, 1));
         CHECK_NOT_EQ(invoke<void*>(cageWithoutAuthentication, taggedNotCagedPtr), taggedPtr);
-        CHECK_NOT_EQ(untagArrayPtr(invoke<void*>(cageWithoutAuthentication, taggedNotCagedPtr), 1), ptr);
+        CHECK_NOT_EQ(invoke<void*>(cageWithoutAuthentication, taggedNotCagedPtr), tagArrayPtr(ptr, 1));
     }