Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 509581: generate direct error return stmt instead of switch stmt with only default case when there are no dispatched messages.

Browse Source
This commit is contained in:
Chris Jones 2009-08-11 17:20:28 -05:00
parent 28d1cd83ea
commit 165a6d7976
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/ipdl/ipdl/cxx/ast.py
View File

@ -477,11 +477,13 @@ class StmtSwitch(Block):
def __init__(self, expr):
Block.__init__(self)
self.expr = expr
self.nr_cases = 0
def addcase(self, case, block):
'''NOTE: |case| is not checked for uniqueness'''
self.addstmt(case)
self.addstmt(block)
self.nr_cases += 1
class StmtExpr(Node):
def __init__(self, expr):

19
ipc/ipdl/ipdl/lower.py
View File

@ -719,7 +719,14 @@ class GenerateProtocolActorHeader(Visitor):
if dispatches:
addDispatcher(asynchandler, 'OnMessageReceived',
[ cxx.ExprVar('msg') ])
asynchandler.addstmt(self.asyncswitch)
# bug 509581: don't generate the switch stmt if there is only the
# default case; MSVC doesn't like that
reterror = cxx.StmtReturn(cxx.ExprVar('MsgNotKnown'))
if self.asyncswitch.nr_cases > 1:
asynchandler.addstmt(self.asyncswitch)
else:
asynchandler.addstmt(reterror)
cls.addstmt(asynchandler)
cls.addstmt(cxx.Whitespace.NL)
@ -727,7 +734,10 @@ class GenerateProtocolActorHeader(Visitor):
if dispatches:
addDispatcher(synchandler, 'OnMessageReceived',
[ cxx.ExprVar('msg'), cxx.ExprVar('reply') ])
synchandler.addstmt(self.syncswitch)
if self.syncswitch.nr_cases > 1:
synchandler.addstmt(self.syncswitch)
else:
synchandler.addstmt(reterror)
cls.addstmt(synchandler)
cls.addstmt(cxx.Whitespace.NL)
@ -735,7 +745,10 @@ class GenerateProtocolActorHeader(Visitor):
if dispatches:
addDispatcher(rpchandler, 'OnCallReceived',
[ cxx.ExprVar('msg'), cxx.ExprVar('reply') ])
rpchandler.addstmt(self.rpcswitch)
if self.rpcswitch.nr_cases > 1:
rpchandler.addstmt(self.rpcswitch)
else:
rpchandler.addstmt(reterror)
cls.addstmt(rpchandler)
cls.addstmt(cxx.Whitespace.NL)