Bug 1459270 - fixed a regression where IPC was not correctly checking for transitions to actors being dead; r?froydnj draft
authorAlex Gaynor <agaynor@mozilla.com>
Fri, 04 May 2018 13:51:22 -0400
changeset 791612 6576e87c624398efe417e25f5d4f4dfa82ee6349
parent 791608 01db12b43ae7906b83e066d6ab83e06a001edc0a
push id108849
push userbmo:agaynor@mozilla.com
push dateFri, 04 May 2018 17:51:52 +0000
reviewersfroydnj
bugs1459270
milestone61.0a1
Bug 1459270 - fixed a regression where IPC was not correctly checking for transitions to actors being dead; r?froydnj MozReview-Commit-ID: HzhUna0mVpB
ipc/ipdl/ipdl/lower.py
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -4628,17 +4628,17 @@ class _GenerateProtocolActorCode(ipdl.as
             # avoid unused-variable warnings
             saveIdStmts = [ StmtDecl(Decl(_actorIdType(), idvar.name),
                                      self.protocol.routingId()) ]
         else:
             saveIdStmts = [ ]
         return idvar, saveIdStmts
 
     def transition(self, md, actor=None, reply=False, errorfn=None):
-        msgid = md.pqMsgId() if not reply else md.pqReplyId()
+        msgid = md.msgId() if not reply else md.replyId()
         args = [
             ExprVar('true' if _deleteId().name == msgid else 'false'),
         ]
         if self.protocol.decl.type.hasReentrantDelete:
             function = 'ReEntrantDeleteStateTransition'
             args.append(
                 ExprVar('true' if _deleteReplyId().name == msgid else 'false'),
             )