Remove C11 generic from CIL

Author: sim642

src/check.ml

@@ -278,7 +278,6 @@ let rec checkType (t: typ) (ctx: ctxType) =
         (fun (an, at, aa) ->
           checkType at CTFArg;
           checkAttributes aa) (argsToList targs)
-  | TDefault -> ()
 
 (* Check that a type is a promoted integral type *)
 and checkIntegralType (t: typ) =
@@ -619,12 +618,7 @@ and checkExp (isconst: bool) (e: exp) : typ =
           (* | TComp _ -> E.s (bug "Cast of a composite type") *)
           | TVoid _ -> E.s (bug "Cast of a void type")
           | _ -> tres
-      end
-      | Generic (exp, lst) -> 
-          let typ = checkExp false exp in
-          List.iter (fun (t, e) -> checkType t CTExp; ignore (checkExp false e)) lst;
-          typ
-      )
+      end)
     () (* The argument of withContext *)
 
 and checkInit  (i: init) : typ =

src/cil.ml

@@ -277,7 +277,6 @@ and typ =
 
   | TBuiltin_va_list of attributes
             (** This is the same as the gcc's type with the same name *)
-  | TDefault
 
 (** Various kinds of integers *)
 and ikind =
@@ -538,7 +537,6 @@ and exp =
                           * It is not printed. Given an lval of type
                           * [TArray(T)] produces an expression of type
                           * [TPtr(T)]. *)
-  | Generic of exp * ((typ * exp) list)
 
 
 (** Literal constants *)
@@ -1528,7 +1526,6 @@ let rec typeAttrs = function
   | TEnum (enum, a) -> addAttributes enum.eattr a
   | TFun (_, _, _, a) -> a
   | TBuiltin_va_list a -> a
-  | TDefault -> []
 
 
 let setTypeAttrs t a =
@@ -1543,7 +1540,6 @@ let setTypeAttrs t a =
   | TEnum (enum, _) -> TEnum (enum, a)
   | TFun (r, args, v, _) -> TFun(r,args,v,a)
   | TBuiltin_va_list _ -> TBuiltin_va_list a
-  | TDefault -> TDefault
 
 
 let typeAddAttributes a0 t =
@@ -1566,7 +1562,6 @@ begin
       | TComp (comp, a) -> TComp (comp, add a)
       | TNamed (t, a) -> TNamed (t, add a)
       | TBuiltin_va_list a -> TBuiltin_va_list (add a)
-      | TDefault -> TDefault
 end
 
 let typeRemoveAttributes (anl: string list) t =
@@ -1582,7 +1577,6 @@ let typeRemoveAttributes (anl: string list) t =
   | TComp (comp, a) -> TComp (comp, drop a)
   | TNamed (t, a) -> TNamed (t, drop a)
   | TBuiltin_va_list a -> TBuiltin_va_list (drop a)
-  | TDefault -> TDefault
 
 let unrollType (t: typ) : typ =
   let rec withAttrs (al: attributes) (t: typ) : typ =
@@ -1863,7 +1857,6 @@ let getParenthLevel (e: exp) =
 
   | Lval(Var _, NoOffset) -> 0        (* Plain variables *)
   | Const _ -> 0                        (* Constants *)
-  | Generic _ -> 0 (*TODO*)
 
 
 let getParenthLevelAttrParam (a: attrparam) =
@@ -1960,14 +1953,6 @@ let rec typeOf (e: exp) : typ =
         TArray (t,_, a) -> TPtr(t, a)
      | _ -> E.s (E.bug "typeOf: StartOf on a non-array")
   end
-  | Generic (exp, lst) -> 
-      let typeOfExp = typeOf exp in
-      let rec findType lst = 
-        match lst with 
-        [] -> voidType
-        | (t, e) :: rest -> if t = typeOfExp then typeOf e else findType rest
-      in 
-      findType lst
 
 and typeOfInit (i: init) : typ =
   match i with
@@ -2257,7 +2242,6 @@ let rec alignOf_int t =
 
     | TFun _ as t -> raise (SizeOfError ("function", t))
     | TVoid _ as t -> raise (SizeOfError ("void", t))
-    | TDefault -> raise (SizeOfError ("default", t))
   in
   match filterAttributes "aligned" (typeAttrs t) with
     [] ->
@@ -2570,7 +2554,6 @@ and bitsSizeOf t =
       0
 
   | TFun _ -> raise (SizeOfError ("function", t))
-  | TDefault -> raise (SizeOfError("default", t))
 
 
 and addTrailing nrbits roundto =
@@ -2838,8 +2821,6 @@ let rec isConstant = function
   | AddrOf (Mem e, off) | StartOf(Mem e, off)
         -> isConstant e && isConstantOffset off
   | AddrOfLabel _ -> true
-  | Generic _ -> false (*TODO*)
-
 and isConstantOffset = function
     NoOffset -> true
   | Field(fi, off) -> isConstantOffset off
@@ -3543,14 +3524,6 @@ class defaultCilPrinterClass : cilPrinter = object (self)
 
     | StartOf(lv) -> self#pLval () lv
 
-    | Generic(e, lst) -> 
-        let rec print_generic_exp l doc =
-          match l with
-          | [] -> doc
-          | (t, e1) :: rest -> print_generic_exp rest (doc ++ text ", " ++ (self#pType None () t) ++ text ":" ++ self#pExp () e1)
-        in
-        text "_Generic(" ++ self#pExp () e ++ print_generic_exp lst nil ++ text ")"
-
   (* Print an expression, given the precedence of the context in which it
    * appears. *)
   method private pExpPrec (contextprec: int) () (e: exp) =
@@ -4487,7 +4460,6 @@ class defaultCilPrinterClass : cilPrinter = object (self)
        ++ self#pAttrs () a
         ++ text " "
         ++ name
-  | TDefault -> text "default"
 
 
   (**** PRINTING ATTRIBUTES *********)
@@ -4823,7 +4795,6 @@ class plainCilPrinterClass =
        end
    | TBuiltin_va_list a ->
        dprintf "TBuiltin_va_list(%a)" self#pAttrs a
-   | TDefault -> dprintf "TDefault"
 
 
   (* Some plain pretty-printers. Unlike the above these expose all the
@@ -4902,13 +4873,6 @@ class plainCilPrinterClass =
   | StartOf lv -> dprintf "StartOf(%a)" self#pLval lv
   | AddrOf (lv) -> dprintf "AddrOf(%a)" self#pLval lv
   | AddrOfLabel (sref) -> dprintf "AddrOfLabel(%a)" self#pStmt !sref
-  | Generic(e, lst) -> 
-      let rec print_generic_exp l doc =
-        match l with
-        | [] -> doc
-        | (t, e1) :: rest -> print_generic_exp rest (doc ++ text "," ++ (self#pType None () t) ++ text ":" ++ self#pExp () e1)
-      in
-      text "_Generic(" ++ self#pExp () e ++ text "," ++ print_generic_exp lst nil
 
 
 
@@ -5422,8 +5386,6 @@ and childrenExp (vis: cilVisitor) (e: exp) : exp =
   | StartOf lv ->
       let lv' = vLval lv in
       if lv' != lv then StartOf lv' else e
-  | Generic(e, lst) -> e (*TODO*)
-
 
 and visitCilInit (vis: cilVisitor) (forglob: varinfo)
                  (atoff: offset) (i: init) : init =
@@ -6208,7 +6170,6 @@ let rec typeSigWithAttrs ?(ignoreSign=false) doattr t =
       TSFun(typeSig rt, (Util.list_map_opt (fun (_, atype, _) -> (typeSig atype)) args), isva, doattr a)
   | TNamed(t, a) -> typeSigAddAttrs (doattr a) (typeSig t.ttype)
   | TBuiltin_va_list al -> TSBase (TBuiltin_va_list (doattr al))
-  | TDefault -> TSBase (TDefault)
 
 let typeSig t =
   typeSigWithAttrs (fun al -> al) t

src/cil.mli

@@ -242,7 +242,6 @@ and typ =
 
   | TBuiltin_va_list of attributes
             (** This is the same as the gcc's type with the same name *)
-  | TDefault
 
 (**
  There are a number of functions for querying the kind of a type. These are
@@ -632,7 +631,6 @@ and exp =
      * not sure which one to use. In C this operation is implicit, the
      * [StartOf] operator is not printed. We have it in CIL because it makes
      * the typing rules simpler. *)
-  | Generic of exp * ((typ * exp) list)
 
 (** {b Constants.} *)
 

src/ext/pta/ptranal.ml

@@ -257,7 +257,6 @@ and analyze_expr (e : exp ) : A.tau =
       | SizeOfE _ -> A.bottom ()
       | Imag __ -> A.bottom ()
       | Real __ -> A.bottom ()
-      | Generic (_, _) -> failwith "not implemented yet"
  in
   H.add expressions e result;
   result

src/frontc/cabs2cil.ml

@@ -669,7 +669,6 @@ let rec stripConstLocalType (t: typ) : typ =
       let a' = dc a in if a != a' then TVoid a' else t
   | TBuiltin_va_list a ->
       let a' = dc a in if a != a' then TBuiltin_va_list a' else t
-  | TDefault -> t
 
 
 let constFoldTypeVisitor = object (self)
@@ -1573,7 +1572,6 @@ let cabsTypeAddAttributes a0 t =
           | TComp (comp, a) -> TComp (comp, addA0To a)
           | TNamed (t, a) -> TNamed (t, addA0To a)
           | TBuiltin_va_list a -> TBuiltin_va_list (addA0To a)
-          | TDefault -> TDefault
   end
 
 
@@ -2463,7 +2461,7 @@ let rec doSpecList (suggestedAnonName: string) (* This string will be part of
     | [A.Tfloat128] -> TFloat(FLongDouble, []) (* TODO: Correct? *)
 
      (* Now the other type specifiers *)
-    | [A.Tdefault] -> TDefault
+    (* | [A.Tdefault] -> TDefault *)
     | [A.Tnamed n] -> begin
         if n = "__builtin_va_list" &&
           !Machdep.theMachine.Machdep.__builtin_va_list then begin
@@ -4864,7 +4862,7 @@ and doExp (asconst: bool)   (* This expression is used as a constant *)
         let default_typ = ref voidType in
         let typ = 
           let rec get_typ lst = match lst with 
-            | (TDefault, e) :: rest -> default_typ := typeOf e; get_typ rest
+            (* | (TDefault, e) :: rest -> default_typ := typeOf e; get_typ rest *)
             | (t, e) :: rest -> if t = exp_typ then typeOf e else get_typ rest
             | [] -> 
               if !default_typ = voidType then 
@@ -4873,7 +4871,8 @@ and doExp (asconst: bool)   (* This expression is used as a constant *)
           in
           get_typ cil_list
         in
-        finishExp empty (Generic(exp, (cil_list))) typ
+        (* finishExp empty (Generic(exp, (cil_list))) typ *)
+        failwith "TODO"
 
   with e when continueOnError -> begin
     (*ignore (E.log "error in doExp (%s)" (Printexc.to_string e));*)