~rdoering/ubuntu/intrepid/erlang/fix-535090

« back to all changes in this revision

Viewing changes to lib/hipe/ssa/hipe_ssa_const_prop.inc

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 16:57:10 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501165710-2sapk0hp2gf3o0ip
Tags: 1:11.b.4-2ubuntu1
* Merge with Debian Unstable. Remaining changes:
  - Add -fno-stack-protector to fix broken crypto_drv.
* DebianMaintainerField update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
208
208
    true ->
209
209
      Instructions    = extract_code(Node, Environment),
210
210
      Updater         = fun(Instruction) ->
211
 
                            update_instruction(Instruction, Environment) end,
212
 
 
 
211
                            update_instruction(Instruction, Environment)
 
212
                        end,
213
213
      NewInstructions = lists:flatmap(Updater, Instructions),
214
214
      Environment1    = update_code(Node, NewInstructions, Environment);
215
215
    false -> 
277
277
visit_phi_nodes([], CurrentNode, _Environment, _SSAWork) ->
278
278
  ?EXIT({"~w: visit_phi_nodes/4 Basic block contains no code",
279
279
         ?MODULE, CurrentNode});
280
 
visit_phi_nodes([Inst | Insts], Node, Environment, SSAWork) ->
 
280
visit_phi_nodes(Is = [Inst | Insts], Node, Environment, SSAWork) ->
281
281
  case ?CODE:is_phi(Inst) of
282
282
    true ->
283
283
      {Environment1, NewSSA} = visit_phi(Inst, Node, Environment),
284
284
      visit_phi_nodes(Insts, Node, Environment1, NewSSA ++ SSAWork);
285
285
    false ->
286
 
      {Environment, [Inst | Insts], SSAWork}
 
286
      {Environment, Is, SSAWork}
287
287
  end.
288
288
 
289
289
%%-----------------------------------------------------------------------------