From f50b261d13be62d2893edd9d42e164982442bca2 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 19 Mar 2024 13:21:15 +0000 Subject: [PATCH] Bug 1746288 - Remove intr from IPDL tests r=ipc-reviewers,nika Some tests had `intr` as a means of having the most restricted protocol type; those were downgraded to `sync`. Differential Revision: https://phabricator.services.mozilla.com/D204783 --- ipc/ipdl/test/ipdl/error/IntrAsyncManagee.ipdl | 9 --------- ipc/ipdl/test/ipdl/error/IntrAsyncManager.ipdl | 10 ---------- ipc/ipdl/test/ipdl/error/IntrSyncManagee.ipdl | 9 --------- ipc/ipdl/test/ipdl/error/IntrSyncManager.ipdl | 10 ---------- ipc/ipdl/test/ipdl/error/PIntrNested.ipdl | 7 ------- ipc/ipdl/test/ipdl/error/PIntrNestedProtocol.ipdl | 7 ------- ipc/ipdl/test/ipdl/error/PIntrPriority.ipdl | 7 ------- .../test/ipdl/error/PNoTaintWithoutTainted.ipdl | 2 +- ipc/ipdl/test/ipdl/error/compressCtor.ipdl | 2 +- ipc/ipdl/test/ipdl/error/compressCtorManagee.ipdl | 2 +- ipc/ipdl/test/ipdl/error/intrMessageCompress.ipdl | 10 ---------- ipc/ipdl/test/ipdl/error/syncParentToChild.ipdl | 2 +- ipc/ipdl/test/ipdl/error/tooWeakIntrAsync.ipdl | 10 ---------- ipc/ipdl/test/ipdl/error/tooWeakIntrSync.ipdl | 9 --------- ipc/ipdl/test/ipdl/error/unknownIntrMessage.ipdl | 7 ------- ipc/ipdl/test/ipdl/ok/PMessageTainted.ipdl | 2 +- .../test/ipdl/ok/PMessageTaintedWithPassback.ipdl | 2 +- ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl | 4 +--- ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl | 14 -------------- ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl | 2 +- ipc/ipdl/test/ipdl/ok/Pplugin.ipdl | 6 ------ ipc/ipdl/test/ipdl/ok/Pshmem.ipdl | 4 +--- ipc/ipdl/test/ipdl/sync-messages.ini | 14 -------------- 23 files changed, 9 insertions(+), 142 deletions(-) delete mode 100644 ipc/ipdl/test/ipdl/error/IntrAsyncManagee.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/IntrAsyncManager.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/IntrSyncManagee.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/IntrSyncManager.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/PIntrNested.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/PIntrNestedProtocol.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/PIntrPriority.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/intrMessageCompress.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/tooWeakIntrAsync.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/tooWeakIntrSync.ipdl delete mode 100644 ipc/ipdl/test/ipdl/error/unknownIntrMessage.ipdl delete mode 100644 ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl delete mode 100644 ipc/ipdl/test/ipdl/ok/Pplugin.ipdl diff --git a/ipc/ipdl/test/ipdl/error/IntrAsyncManagee.ipdl b/ipc/ipdl/test/ipdl/error/IntrAsyncManagee.ipdl deleted file mode 100644 index 527c007ec47e..000000000000 --- a/ipc/ipdl/test/ipdl/error/IntrAsyncManagee.ipdl +++ /dev/null @@ -1,9 +0,0 @@ -//error: protocol `IntrAsyncManagee' requires more powerful send semantics than its manager `IntrAsyncManager' provides - -include protocol IntrAsyncManager; - -intr protocol IntrAsyncManagee { - manager IntrAsyncManager; -child: - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/error/IntrAsyncManager.ipdl b/ipc/ipdl/test/ipdl/error/IntrAsyncManager.ipdl deleted file mode 100644 index dc5768df28bf..000000000000 --- a/ipc/ipdl/test/ipdl/error/IntrAsyncManager.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -//error: protocol `IntrAsyncManagee' requires more powerful send semantics than its manager `IntrAsyncManager' provides - -include protocol IntrAsyncManagee; - -[ChildProc=any] -async protocol IntrAsyncManager { - manages IntrAsyncManagee; -parent: - async IntrAsyncManagee(); -}; diff --git a/ipc/ipdl/test/ipdl/error/IntrSyncManagee.ipdl b/ipc/ipdl/test/ipdl/error/IntrSyncManagee.ipdl deleted file mode 100644 index d0b1462e8647..000000000000 --- a/ipc/ipdl/test/ipdl/error/IntrSyncManagee.ipdl +++ /dev/null @@ -1,9 +0,0 @@ -//error: protocol `IntrSyncManagee' requires more powerful send semantics than its manager `IntrSyncManager' provides - -include protocol IntrSyncManager; - -intr protocol IntrSyncManagee { - manager IntrSyncManager; -child: - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/error/IntrSyncManager.ipdl b/ipc/ipdl/test/ipdl/error/IntrSyncManager.ipdl deleted file mode 100644 index f8e762093c95..000000000000 --- a/ipc/ipdl/test/ipdl/error/IntrSyncManager.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -//error: protocol `IntrSyncManagee' requires more powerful send semantics than its manager `IntrSyncManager' provides - -include protocol IntrSyncManagee; - -[ChildProc=any] -sync protocol IntrSyncManager { - manages IntrSyncManagee; -parent: - async IntrSyncManagee(); -}; diff --git a/ipc/ipdl/test/ipdl/error/PIntrNested.ipdl b/ipc/ipdl/test/ipdl/error/PIntrNested.ipdl deleted file mode 100644 index c487bcd49d8f..000000000000 --- a/ipc/ipdl/test/ipdl/error/PIntrNested.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -//error: intr message `Msg' cannot specify [Nested] - -[ChildProc=any] -intr protocol PIntrNested { -child: - [Nested=inside_sync, LegacyIntr] intr Msg(); -}; diff --git a/ipc/ipdl/test/ipdl/error/PIntrNestedProtocol.ipdl b/ipc/ipdl/test/ipdl/error/PIntrNestedProtocol.ipdl deleted file mode 100644 index dd95a7c00252..000000000000 --- a/ipc/ipdl/test/ipdl/error/PIntrNestedProtocol.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -//error: intr protocol `PIntrNestedProtocol' cannot specify [NestedUpTo] - -[NestedUpTo=inside_sync, ChildProc=any] -intr protocol PIntrNestedProtocol { -child: - [LegacyIntr] intr Msg(); -}; diff --git a/ipc/ipdl/test/ipdl/error/PIntrPriority.ipdl b/ipc/ipdl/test/ipdl/error/PIntrPriority.ipdl deleted file mode 100644 index c8bf75e9a301..000000000000 --- a/ipc/ipdl/test/ipdl/error/PIntrPriority.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -//error: intr message `Msg' cannot specify [Priority] - -[ChildProc=any] -intr protocol PIntrPriority { -child: - [Priority=vsync, LegacyIntr] intr Msg(); -}; diff --git a/ipc/ipdl/test/ipdl/error/PNoTaintWithoutTainted.ipdl b/ipc/ipdl/test/ipdl/error/PNoTaintWithoutTainted.ipdl index b196050c48f7..8a80689ec0cc 100644 --- a/ipc/ipdl/test/ipdl/error/PNoTaintWithoutTainted.ipdl +++ b/ipc/ipdl/test/ipdl/error/PNoTaintWithoutTainted.ipdl @@ -1,7 +1,7 @@ //error: argument typename `int' of message `foo' has a NoTaint attribute, but the message lacks the Tainted attribute [ChildProc=any] -intr protocol PNoTaintWithoutTainted { +sync protocol PNoTaintWithoutTainted { child: async foo([NoTaint=passback] int id); }; diff --git a/ipc/ipdl/test/ipdl/error/compressCtor.ipdl b/ipc/ipdl/test/ipdl/error/compressCtor.ipdl index 93c300333dcf..a5e0e4062be5 100644 --- a/ipc/ipdl/test/ipdl/error/compressCtor.ipdl +++ b/ipc/ipdl/test/ipdl/error/compressCtor.ipdl @@ -4,7 +4,7 @@ include protocol compressCtorManagee; [ChildProc=any] -intr protocol compressCtor { +sync protocol compressCtor { manages compressCtorManagee; parent: diff --git a/ipc/ipdl/test/ipdl/error/compressCtorManagee.ipdl b/ipc/ipdl/test/ipdl/error/compressCtorManagee.ipdl index 52ec2cc1cd97..cf867ce54b96 100644 --- a/ipc/ipdl/test/ipdl/error/compressCtorManagee.ipdl +++ b/ipc/ipdl/test/ipdl/error/compressCtorManagee.ipdl @@ -3,7 +3,7 @@ include protocol compressCtor; -intr protocol compressCtorManagee { +sync protocol compressCtorManagee { manager compressCtor; child: diff --git a/ipc/ipdl/test/ipdl/error/intrMessageCompress.ipdl b/ipc/ipdl/test/ipdl/error/intrMessageCompress.ipdl deleted file mode 100644 index e56cfc5d8ce1..000000000000 --- a/ipc/ipdl/test/ipdl/error/intrMessageCompress.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -//error: message `foo' in protocol `intrMessageCompress' requests compression but is not async -//error: message `bar' in protocol `intrMessageCompress' requests compression but is not async - -[ChildProc=any] -intr protocol intrMessageCompress { -parent: - [Compress, LegacyIntr] intr foo(); -child: - [Compress, LegacyIntr] intr bar(); -}; diff --git a/ipc/ipdl/test/ipdl/error/syncParentToChild.ipdl b/ipc/ipdl/test/ipdl/error/syncParentToChild.ipdl index 8ce7c0be477a..8cc0fdb72d40 100644 --- a/ipc/ipdl/test/ipdl/error/syncParentToChild.ipdl +++ b/ipc/ipdl/test/ipdl/error/syncParentToChild.ipdl @@ -1,7 +1,7 @@ //error: sync parent-to-child messages are verboten (here, message `Msg' in protocol `syncParentToChild') [ChildProc=any] -intr protocol syncParentToChild { +sync protocol syncParentToChild { // can't declare sync parent-to-child messages child: sync Msg(); diff --git a/ipc/ipdl/test/ipdl/error/tooWeakIntrAsync.ipdl b/ipc/ipdl/test/ipdl/error/tooWeakIntrAsync.ipdl deleted file mode 100644 index 7dad5e68efbb..000000000000 --- a/ipc/ipdl/test/ipdl/error/tooWeakIntrAsync.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -//error: message `Msg' requires more powerful send semantics than its protocol `tooWeakIntrAsync' provides - -[ChildProc=any] -protocol tooWeakIntrAsync { - - // it's an error to declare an async protocol with an intr message - -parent: [LegacyIntr] intr Msg(); - -}; diff --git a/ipc/ipdl/test/ipdl/error/tooWeakIntrSync.ipdl b/ipc/ipdl/test/ipdl/error/tooWeakIntrSync.ipdl deleted file mode 100644 index a56e884e735e..000000000000 --- a/ipc/ipdl/test/ipdl/error/tooWeakIntrSync.ipdl +++ /dev/null @@ -1,9 +0,0 @@ -//error: message `Msg' requires more powerful send semantics than its protocol `tooWeakIntrSync' provides - -[ChildProc=any] -sync protocol tooWeakIntrSync { - - // it's an error to declare a sync protocol with an interrupt message -parent: - [LegacyIntr] intr Msg(); -}; diff --git a/ipc/ipdl/test/ipdl/error/unknownIntrMessage.ipdl b/ipc/ipdl/test/ipdl/error/unknownIntrMessage.ipdl deleted file mode 100644 index 7ce415aba08e..000000000000 --- a/ipc/ipdl/test/ipdl/error/unknownIntrMessage.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -//error: Unknown sync IPC message unknownIntrMessage::Msg - -[ChildProc=any] -intr protocol unknownIntrMessage { -parent: - [LegacyIntr] intr Msg(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/PMessageTainted.ipdl b/ipc/ipdl/test/ipdl/ok/PMessageTainted.ipdl index deb10fb7acf9..e6565c6264a7 100644 --- a/ipc/ipdl/test/ipdl/ok/PMessageTainted.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PMessageTainted.ipdl @@ -1,5 +1,5 @@ [ChildProc=any] -intr protocol PMessageTainted { +sync protocol PMessageTainted { child: [Tainted] async foo(); }; diff --git a/ipc/ipdl/test/ipdl/ok/PMessageTaintedWithPassback.ipdl b/ipc/ipdl/test/ipdl/ok/PMessageTaintedWithPassback.ipdl index 8db2c8b742e0..25fbae1f9284 100644 --- a/ipc/ipdl/test/ipdl/ok/PMessageTaintedWithPassback.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PMessageTaintedWithPassback.ipdl @@ -1,5 +1,5 @@ [ChildProc=any] -intr protocol PMessageTaintedWithPassback { +sync protocol PMessageTaintedWithPassback { child: [Tainted] async foo([NoTaint=passback] int id); }; diff --git a/ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl b/ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl index a0ceac937f1e..d51878b872d8 100644 --- a/ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl @@ -4,11 +4,9 @@ union Foo { }; [ChildProc=any] -intr protocol Pbytebuf { +sync protocol Pbytebuf { parent: async Msg(ByteBuf s, Foo f); sync SyncMsg(ByteBuf s, Foo f) returns (ByteBuf t, Foo g); - [LegacyIntr] intr InterruptMsg(ByteBuf s, Foo f) - returns (ByteBuf t, Foo g); }; diff --git a/ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl deleted file mode 100644 index 4b663327e6b9..000000000000 --- a/ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl +++ /dev/null @@ -1,14 +0,0 @@ -[ChildProc=any] -intr protocol PintrProtocol { - - // sanity check of Interrupt protocols -child: - async AsyncMsg(); - -parent: - sync SyncMsg(int i) returns (int r); - -both: - [LegacyIntr] intr InterruptMsg(int x) returns (int y); - -}; diff --git a/ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl b/ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl index 7e14c888ddd8..0ec647629978 100644 --- a/ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl @@ -1,5 +1,5 @@ [ChildProc=any] -intr protocol PmessageCompress { +sync protocol PmessageCompress { child: [Compress] async foo(); [Compress=all] async bar(); diff --git a/ipc/ipdl/test/ipdl/ok/Pplugin.ipdl b/ipc/ipdl/test/ipdl/ok/Pplugin.ipdl deleted file mode 100644 index f7d9352a0819..000000000000 --- a/ipc/ipdl/test/ipdl/ok/Pplugin.ipdl +++ /dev/null @@ -1,6 +0,0 @@ -[ChildProc=any] -intr protocol Pplugin { -child: - async __delete__(); - -}; diff --git a/ipc/ipdl/test/ipdl/ok/Pshmem.ipdl b/ipc/ipdl/test/ipdl/ok/Pshmem.ipdl index a46e777d8cf0..2779a2437f13 100644 --- a/ipc/ipdl/test/ipdl/ok/Pshmem.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pshmem.ipdl @@ -4,11 +4,9 @@ union Foo { }; [ChildProc=any] -intr protocol Pshmem { +sync protocol Pshmem { parent: async Msg(Shmem s, Foo f); sync SyncMsg(Shmem s, Foo f) returns (Shmem t, Foo g); - [LegacyIntr] intr InterruptMsg(Shmem s, Foo f) - returns (Shmem t, Foo g); }; diff --git a/ipc/ipdl/test/ipdl/sync-messages.ini b/ipc/ipdl/test/ipdl/sync-messages.ini index 82af605d011b..afd0ff3d5d7e 100644 --- a/ipc/ipdl/test/ipdl/sync-messages.ini +++ b/ipc/ipdl/test/ipdl/sync-messages.ini @@ -10,30 +10,16 @@ description = test only description = test only [Punion_Comparable::Msg] description = test only -[PintrProtocol::SyncMsg] -description = test only -[PintrProtocol::InterruptMsg] -description = test only [Pshmem::SyncMsg] description = test only -[Pshmem::InterruptMsg] -description = test only [Pbytebuf::SyncMsg] description = test only -[Pbytebuf::InterruptMsg] -description = test only [PsyncProtocol::SyncMsg] description = test only -[PintrMessageCompress::foo] -description = test only -[PintrMessageCompress::bar] -description = test only [PsyncMessageCompress::foo] description = test only [PsyncParentToChild::Msg] description = test only -[PtooWeakIntrSync::Msg] -description = test only [PtooWeakSyncAsync::Msg] description = test only [PundeclReturnType::Msg]