|
@@ -1322,18 +1322,20 @@ module LocalDce = struct
|
|
let rec loop e =
|
|
let rec loop e =
|
|
match e.eexpr with
|
|
match e.eexpr with
|
|
| TLocal v when Meta.has Meta.CompilerGenerated v.v_meta -> (try loop (Ssa.get_var_value v) with Not_found -> ())
|
|
| TLocal v when Meta.has Meta.CompilerGenerated v.v_meta -> (try loop (Ssa.get_var_value v) with Not_found -> ())
|
|
- | TBinop((OpAssign | OpAssignOp _),{eexpr = TLocal v},e2) when is_used v || Optimizer.has_side_effect e2 || is_ref_type v.v_type -> raise Exit
|
|
|
|
|
|
+ | TBinop((OpAssign | OpAssignOp _),{eexpr = TLocal v},e2) when is_used v || has_side_effect e2 || is_ref_type v.v_type -> raise Exit
|
|
| TVar(v,None) when is_used v -> raise Exit
|
|
| TVar(v,None) when is_used v -> raise Exit
|
|
- | TVar(v,Some e1) when is_used v || Optimizer.has_side_effect e1 -> raise Exit
|
|
|
|
|
|
+ | TVar(v,Some e1) when is_used v || has_side_effect e1 -> raise Exit
|
|
| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ -> ()
|
|
| TConst _ | TLocal _ | TTypeExpr _ | TFunction _ -> ()
|
|
| TCall ({ eexpr = TField(_,FStatic({ cl_path = ([],"Std") },{ cf_name = "string" })) },args) -> Type.iter loop e
|
|
| TCall ({ eexpr = TField(_,FStatic({ cl_path = ([],"Std") },{ cf_name = "string" })) },args) -> Type.iter loop e
|
|
|
|
+ | TCall ({eexpr = TField(_,FEnum _)},_) -> Type.iter loop e
|
|
| TNew _ | TCall _ | TBinop ((OpAssignOp _ | OpAssign),_,_) | TUnop ((Increment|Decrement),_,_) -> raise Exit
|
|
| TNew _ | TCall _ | TBinop ((OpAssignOp _ | OpAssign),_,_) | TUnop ((Increment|Decrement),_,_) -> raise Exit
|
|
| TReturn _ | TBreak | TContinue | TThrow _ | TCast (_,Some _) -> raise Exit
|
|
| TReturn _ | TBreak | TContinue | TThrow _ | TCast (_,Some _) -> raise Exit
|
|
| TArray _ | TEnumParameter _ | TCast (_,None) | TBinop _ | TUnop _ | TParenthesis _ | TMeta _ | TWhile _ | TFor _
|
|
| TArray _ | TEnumParameter _ | TCast (_,None) | TBinop _ | TUnop _ | TParenthesis _ | TMeta _ | TWhile _ | TFor _
|
|
| TField _ | TIf _ | TTry _ | TSwitch _ | TArrayDecl _ | TBlock _ | TObjectDecl _ | TVar _ -> Type.iter loop e
|
|
| TField _ | TIf _ | TTry _ | TSwitch _ | TArrayDecl _ | TBlock _ | TObjectDecl _ | TVar _ -> Type.iter loop e
|
|
in
|
|
in
|
|
try
|
|
try
|
|
- loop e; false
|
|
|
|
|
|
+ loop e;
|
|
|
|
+ false
|
|
with Exit ->
|
|
with Exit ->
|
|
true
|
|
true
|
|
in
|
|
in
|