Changeset 277942 in webkit

Timestamp:

May 23, 2021, 9:59:35 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Remove some now invalid tests in testmasm.
​https://bugs.webkit.org/show_bug.cgi?id=226155

Reviewed by Yusuke Suzuki.

The ARM64E tests were checking that cageConditionallyAndUntag() would fail to
produce a caged pointer if fed invalid values. These tests are no longer feasible
because on ARM64E, feeding cageConditionallyAndUntag() invalid values will now
result in a crash. This patch removes these tests.

• 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 @@
+2021-05-23  Mark Lam  <mark.lam@apple.com>
+
+        Remove some now invalid tests in testmasm.
+        https://bugs.webkit.org/show_bug.cgi?id=226155
+
+        Reviewed by Yusuke Suzuki.
+
+        The ARM64E tests were checking that cageConditionallyAndUntag() would fail to
+        produce a caged pointer if fed invalid values.  These tests are no longer feasible
+        because on ARM64E, feeding cageConditionallyAndUntag() invalid values will now
+        result in a crash.  This patch removes these tests.
+
+        * assembler/testmasm.cpp:
+        (JSC::testCagePreservesPACFailureBit):
+
 2021-05-23  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/assembler/testmasm.cpp ¶

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2447 +2447 @@
     auto cage = compile([] (CCallHelpers& jit) {
         emitFunctionPrologue(jit);
-        jit.cageConditionallyAndUntag(Gigacage::Primitive, GPRInfo::argumentGPR0, GPRInfo::argumentGPR1, GPRInfo::argumentGPR2);
+        constexpr GPRReg storageGPR = GPRInfo::argumentGPR0;
+        constexpr GPRReg lengthGPR = GPRInfo::argumentGPR1;
+        constexpr GPRReg scratchGPR = GPRInfo::argumentGPR2;
+        jit.cageConditionallyAndUntag(Gigacage::Primitive, storageGPR, lengthGPR, scratchGPR);
         jit.move(GPRInfo::argumentGPR0, GPRInfo::returnValueGPR);
         emitFunctionEpilogue(jit);
@@ -2460 +2463 @@
     void* taggedNotCagedPtr = tagArrayPtr(notCagedPtr, 1);
 
-    if (isARM64E()) {
-        CHECK_NOT_EQ(invoke<void*>(cage, taggedPtr, 2), ptr);
-        CHECK_NOT_EQ(invoke<void*>(cage, taggedNotCagedPtr, 1), ptr);
-        void* cagedTaggedNotCagedPtr = invoke<void*>(cage, taggedNotCagedPtr, 1);
-        CHECK_NOT_EQ(cagedTaggedNotCagedPtr, removeArrayPtrTag(cagedTaggedNotCagedPtr));
-    } else
+    if (!isARM64E())
         CHECK_EQ(invoke<void*>(cage, taggedPtr, 2), ptr);