Remove DummyInstr instructiontype

Author: jprotopopov-ut

src/check.ml

@@ -835,8 +835,7 @@ and checkInstr (i: instr) =
   if !ignoreInstr i then ()
   else
   match i with
-    DummyInstr _ -> ()
-  | Set (dest, e, l, el) ->
+    Set (dest, e, l, el) ->
       currentLoc := l;
       currentExpLoc := el;
       let t = checkLval false false dest in

src/cil.ml

@@ -848,8 +848,7 @@ and stmtkind =
 (** Instructions. They may cause effects directly but may not have control
     flow.*)
 and instr =
-     DummyInstr of location
-  |  Set        of lval * exp * location * location  (** An assignment. A cast is present
+     Set        of lval * exp * location * location  (** An assignment. A cast is present
                                              if the exp has different type
                                              from lval.
                                              Second location is just for expression when inside condition. *)
@@ -1136,8 +1135,7 @@ let stripUnderscores (s: string) : string =
 
 let get_instrLoc (inst : instr) =
   match inst with
-      DummyInstr(loc) -> loc
-    |  Set(_, _, loc, _) -> loc
+      Set(_, _, loc, _) -> loc
     | Call(_, _, _, loc, _) -> loc
     | VarDecl(_,loc) -> loc
 let get_globalLoc (g : global) =
@@ -3587,8 +3585,7 @@ class defaultCilPrinterClass : cilPrinter = object (self)
   (*** INSTRUCTIONS ****)
   method pInstr () (i:instr) =       (* imperative instruction *)
     match i with
-      DummyInstr(l) -> text ""
-    | Set(lv,e,l,el) -> begin
+      Set(lv,e,l,el) -> begin
         (* Be nice to some special cases *)
         match e with
           BinOp((PlusA|PlusPI|IndexPI),Lval(lv'),Const(CInt(one,_,_)),_)
@@ -5382,7 +5379,6 @@ and childrenInstr (vis: cilVisitor) (i: instr) : instr =
   let fExp e = visitCilExpr vis e in
   let fLval lv = visitCilLval vis lv in
   match i with
-  | DummyInstr(l) -> i
   | VarDecl(v,l) -> i
   | Set(lv,e,l,el) ->
       let lv' = fLval lv in let e' = fExp e in

src/cil.mli

@@ -1092,8 +1092,7 @@ function call, or an inline assembly instruction. *)
 
 (** Instructions. *)
 and instr =
-    DummyInstr of location
-  | Set        of lval * exp * location * location
+    Set        of lval * exp * location * location
    (** An assignment. The type of the expression is guaranteed to be the same
       with that of the lvalue.
       Second location is just for expression when inside condition. *)

src/ext/pta/ptranal.ml

@@ -269,8 +269,7 @@ let rec analyze_init (i : init ) : A.tau =
 
 let analyze_instr (i : instr ) : unit =
   match i with
-       DummyInstr _ -> ()
-    |  Set (lval, rhs, l, el) ->
+       Set (lval, rhs, l, el) ->
         A.assign (analyze_lval lval) (analyze_expr rhs)
     | Call (res, fexpr, actuals, l, el) ->
         if not (isFunctionType (typeOf fexpr)) then

src/ext/syntacticsearch/funcVar.ml

@@ -159,8 +159,6 @@ let rec search_instr_list_for_var list name varid includeCallTmp =
       search_expression exp name loc varid includeCallTmp
       @ search_expression_list exp_list name loc varid includeCallTmp
       @ search_instr_list_for_var xs name varid includeCallTmp
-  (* Should I consider Asm too? *)
-  | _ :: xs -> search_instr_list_for_var xs name varid includeCallTmp
   | [] -> []
 
 (* Finds a variable in a list of statements *)

src/ext/zrapp/availexps.ml

@@ -243,11 +243,6 @@ let eh_handle_inst i eh =
       (eh_kill_mem eh;
        eh_kill_addrof_or_global eh;
        eh)
-  | DummyInstr(_) ->
-      let _,d = UD.computeUseDefInstr i in
-      (UD.VS.iter (fun vi ->
-	eh_kill_vi eh vi) d;
-       eh)
   | VarDecl _ ->   raise (Unimplemented "VarDecl") (* VarDecl instruction is not supported for availexps, to make availexps work for programs without VLA *)
                                                    (* make sure to set alwaysGenerateVarDecl in cabs2cil.ml to false. To support VLA, implement this.  *)
 

src/ext/zrapp/availexpslv.ml

@@ -305,12 +305,6 @@ let lvh_handle_inst i lvh =
       end;
       lvh
   end
-  | DummyInstr(_) -> begin
-      let _,d = UD.computeUseDefInstr i in
-      UD.VS.iter (fun vi ->
-	lvh_kill_vi lvh vi) d;
-      lvh
-  end
   | VarDecl _ ->   raise (Unimplemented "VarDecl") (* VarDecl instruction is not supported for availexpslv, to make availexpslv work for programs without VLA *)
                                                    (* make sure to set alwaysGenerateVarDecl in cabs2cil.ml to false. To support VLA, implement this.  *)
 

src/ext/zrapp/reachingdefs.ml

@@ -273,8 +273,7 @@ let getDefRhs didstmh stmdat defId =
 	      | _ -> false)
 	  | None -> false) iihl in
 	(match i with
-      DummyInstr _ -> None
-	  | Set((lh,_),e,_,_) ->
+      Set((lh,_),e,_,_) ->
 	    (match lh with
 	      Var(vi') ->
 		(IH.add rhsHtbl defId (Some(RDExp(e),stm.sid,iosh_in));

src/frontc/cabs2cil.ml

@@ -842,8 +842,7 @@ module BlockChunk =
         {l with synthetic = true}
 
       let doInstr: instr -> instr = function
-          DummyInstr(eloc) -> DummyInstr(doLoc eloc)
-        | Set (l, e, loc, eloc) -> Set (l, e, doLoc loc, doLoc eloc)
+          Set (l, e, loc, eloc) -> Set (l, e, doLoc loc, doLoc eloc)
         | VarDecl (v, loc) -> VarDecl (v, doLoc loc)
         | Call (l, f, a, loc, eloc) -> Call (l, f, a, doLoc loc, doLoc eloc)
 
@@ -938,8 +937,7 @@ module BlockChunk =
           c
 
       let eDoInstr: instr -> instr = function
-          DummyInstr(eloc) -> DummyInstr(doLoc eloc)
-        | Set (l, e, loc, eloc) -> Set (l, e, loc, doLoc eloc)
+          Set (l, e, loc, eloc) -> Set (l, e, loc, doLoc eloc)
         | VarDecl (v, loc) -> VarDecl (v, loc)
         | Call (l, f, a, loc, eloc) -> Call (l, f, a, loc, doLoc eloc)
 
@@ -6479,8 +6477,7 @@ and doDecl (isglobal: bool) (isstmt: bool) : A.definition -> chunk = function
                unnecessary warning than to break CIL's invariant that
                return statements are inserted properly.  *)
             let instrFallsThrough (i : instr) = match i with
-              DummyInstr _ -> true
-            |  Set _ -> true
+              Set _ -> true
             | Call (None, Lval (Var e, NoOffset), _, _, _) ->
                 (* See if this is exit, or if it has the noreturn attribute *)
                 if e.vname = "exit" then false