Revert to the original definition of dummyStmt

Author: jprotopopov-ut

src/cil.ml

@@ -1367,8 +1367,7 @@ let mkBlock (slst: stmt list) : block =
 let mkEmptyStmt () = mkStmt (Instr [])
 let mkStmtOneInstr (i: instr) = mkStmt (Instr [i])
 
-let dummyInstr = DummyInstr(lu)
-let dummyStmt =  mkStmt (Instr [dummyInstr])
+let dummyStmt =  mkStmt (Asm([], ["dummy statement!!"], [], [], [], [], lu))
 
 let compactStmts (b: stmt list) : stmt list =
       (* Try to compress statements. Scan the list of statements and remember
@@ -6080,8 +6079,8 @@ let typeSigAttrs = function
 let dExp: doc -> exp =
   fun d -> Const(CStr(sprint ~width:!lineLength d, No_encoding))
 
-let dInstr: doc -> location -> instr =
-  fun d l -> DummyInstr l
+let dStmt: doc -> location -> stmt =
+  fun d l -> mkStmt (Asm([], [sprint ~width:!lineLength d], [], [], [], [], l))
 
 let dGlobal: doc -> location -> global =
   fun d l -> GAsm(sprint ~width:!lineLength d, l)

src/cil.mli

@@ -1767,10 +1767,7 @@ val compactStmts: stmt list -> stmt list
 (** Returns an empty statement (of kind [Instr]) *)
 val mkEmptyStmt: unit -> stmt
 
-(** A instr to serve as a placeholder *)
-val dummyInstr: instr
-
-(** A statement consisting of just [dummyInstr] *)
+(** A statement to serve as a placeholder *)
 val dummyStmt: stmt
 
 (** Make a while loop. Can contain Break or Continue *)
@@ -2669,8 +2666,8 @@ val get_stmtLoc: stmtkind -> location
 (** Generate an {!exp} to be used in case of errors. *)
 val dExp: Pretty.doc -> exp
 
-(** Generate an {!instr} to be used in case of errors. *)
-val dInstr: Pretty.doc -> location -> instr
+(** Generate an {!stmt} to be used in case of errors. *)
+val dStmt: Pretty.doc -> location -> stmt
 
 (** Generate a {!global} to be used in case of errors. *)
 val dGlobal: Pretty.doc -> location -> global

src/frontc/cabs2cil.ml

@@ -5055,7 +5055,7 @@ and doExp (asconst: bool)   (* This expression is used as a constant *)
   with e when continueOnError -> begin
     (*ignore (E.log "error in doExp (%s)" (Printexc.to_string e));*)
     E.hadErrors := true;
-    (i2c (dInstr (dprintf "booo_exp(%t)" d_thisloc) !currentLoc),
+    (s2c (dStmt (dprintf "booo_exp(%t)" d_thisloc) !currentLoc),
      integer 0, intType)
   end