diff options
| author | Henrik Nord <[email protected]> | 2011-11-30 16:04:11 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-11-30 16:04:15 +0100 |
| commit | 0290bed50ccbba067619c5829b0a090a8a60a2ff (patch) | |
| tree | 301de75ee89b085c962025a143b45719af9c68fd /lib/hipe | |
| parent | 08ea3af8528ad0920021ecc230a66eb5ee59bc86 (diff) | |
| parent | 804f81747df38cbcb997a6e7aebe8d3868a31e3e (diff) | |
| download | otp-0290bed50ccbba067619c5829b0a090a8a60a2ff.tar.gz otp-0290bed50ccbba067619c5829b0a090a8a60a2ff.tar.bz2 otp-0290bed50ccbba067619c5829b0a090a8a60a2ff.zip | |
Merge branch 'sa/dialyzer-fixes-r15'
* sa/dialyzer-fixes-r15:
Update inets test results
Add file/line info in a particular Dialyzer crash
Fix Dialyzer's warnings in HiPE
Fix Dialyzer's warning for its own code
Fix crash in Typer
No warnings for underspecs with remote types
OTP-9758
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/icode/hipe_icode_coordinator.erl | 9 | ||||
| -rw-r--r-- | lib/hipe/icode/hipe_icode_mulret.erl | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/hipe/icode/hipe_icode_coordinator.erl b/lib/hipe/icode/hipe_icode_coordinator.erl index a71e143192..d2defa0c90 100644 --- a/lib/hipe/icode/hipe_icode_coordinator.erl +++ b/lib/hipe/icode/hipe_icode_coordinator.erl @@ -49,6 +49,12 @@ coordinate(CG, Escaping, NonEscaping, Mod) -> fun (PM) -> last_action(PM, ServerPid, Mod, All) end, coordinate({Clean,All}, CG, gb_trees:empty(), Restart, LastAction, ServerPid). +-type mfalists() :: {[mfa()], [mfa()]}. + +-spec coordinate(mfalists(), hipe_digraph:hdg(), gb_tree(), + fun((mfalists(), gb_tree()) -> mfalists()), + fun((gb_tree()) -> 'ok'), pid()) -> no_return(). + coordinate(MFALists, CG, PM, Restart, LastAction, ServerPid) -> case MFALists of {[], []} -> @@ -106,8 +112,7 @@ last_action(PM, ServerPid, Mod, All) -> receive {done_rewrite, MFA} -> ok end - end, All), - ok. + end, All). restart_funs({Queue, Busy} = QB, PM, All, ServerPid) -> case ?MAX_CONCURRENT - length(Busy) of diff --git a/lib/hipe/icode/hipe_icode_mulret.erl b/lib/hipe/icode/hipe_icode_mulret.erl index a6529c8519..0579867e2f 100644 --- a/lib/hipe/icode/hipe_icode_mulret.erl +++ b/lib/hipe/icode/hipe_icode_mulret.erl @@ -595,9 +595,9 @@ optimizeDefine([I|Code], Dsts, DstLst, Res) -> [Ds] = Dsts, case isCallPrimop(I, mktuple) andalso DstLst =:= [] of true -> - case (hipe_icode:call_dstlist(I) =:= Dsts) of + case hipe_icode:call_dstlist(I) =:= Dsts of true -> - case (hipe_icode:call_args(I) > 1) of + case length(hipe_icode:call_args(I)) > 1 of true -> optimizeDefine(Code, Dsts, hipe_icode:call_args(I), Res); false -> |