From 8cacd31f850b0ad51145c21459177f80c6ec12cd Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Thu, 1 Sep 2016 04:31:35 -0700
Subject: [PATCH] Remove unused typedef and enum Typename's

Reviewed By: jvillard

Differential Revision: D3797359

fbshipit-source-id: a8776d3
---
 infer/src/IR/Typename.re       | 12 +-----------
 infer/src/IR/Typename.rei      |  2 +-
 infer/src/clang/cTypes.ml      |  5 +----
 infer/src/clang/cTypes.mli     |  2 --
 infer/src/clang/cTypes_decl.ml |  1 -
 infer/src/clang/printing.ml    |  3 ---
 6 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/infer/src/IR/Typename.re b/infer/src/IR/Typename.re
index 075e96086..16c58b6ba 100644
--- a/infer/src/IR/Typename.re
+++ b/infer/src/IR/Typename.re
@@ -16,30 +16,20 @@ let module F = Format;
 
 
 /** Named types. */
-type t = | TN_typedef of Mangled.t | TN_enum of Mangled.t | TN_csu of Csu.t Mangled.t;
+type t = | TN_csu of Csu.t Mangled.t;
 
 let to_string =
   fun
-  | TN_enum name
-  | TN_typedef name => Mangled.to_string name
   | TN_csu csu name => Csu.name csu ^ " " ^ Mangled.to_string name;
 
 let pp f typename => F.fprintf f "%s" (to_string typename);
 
 let name =
   fun
-  | TN_enum name
-  | TN_typedef name
   | TN_csu _ name => Mangled.to_string name;
 
 let compare tn1 tn2 =>
   switch (tn1, tn2) {
-  | (TN_typedef n1, TN_typedef n2) => Mangled.compare n1 n2
-  | (TN_typedef _, _) => (-1)
-  | (_, TN_typedef _) => 1
-  | (TN_enum n1, TN_enum n2) => Mangled.compare n1 n2
-  | (TN_enum _, _) => (-1)
-  | (_, TN_enum _) => 1
   | (TN_csu csu1 n1, TN_csu csu2 n2) =>
     let n = Csu.compare csu1 csu2;
     if (n != 0) {
diff --git a/infer/src/IR/Typename.rei b/infer/src/IR/Typename.rei
index bd3d6b38d..b0ab06ab8 100644
--- a/infer/src/IR/Typename.rei
+++ b/infer/src/IR/Typename.rei
@@ -14,7 +14,7 @@ open! Utils;
 
 
 /** Named types. */
-type t = | TN_typedef of Mangled.t | TN_enum of Mangled.t | TN_csu of Csu.t Mangled.t;
+type t = | TN_csu of Csu.t Mangled.t;
 
 
 /** convert the typename to a string */
diff --git a/infer/src/clang/cTypes.ml b/infer/src/clang/cTypes.ml
index 0abbae25e..b5b2193f2 100644
--- a/infer/src/clang/cTypes.ml
+++ b/infer/src/clang/cTypes.ml
@@ -30,8 +30,7 @@ let remove_pointer_to_typ typ =
 let classname_of_type typ =
   match typ with
   | Typ.Tvar (Typename.TN_csu (_, name) )
-  | Typ.Tstruct { Typ.struct_name =  Some name }
-  | Typ.Tvar (Typename.TN_typedef name) -> Mangled.to_string name
+  | Typ.Tstruct { struct_name =  Some name } -> Mangled.to_string name
   | Typ.Tfun _ -> CFrontend_config.objc_object
   | _ ->
       Printing.log_out
@@ -42,8 +41,6 @@ let mk_classname n ck = Typename.TN_csu (Csu.Class ck, Mangled.from_string n)
 
 let mk_structname n = Typename.TN_csu (Csu.Struct, Mangled.from_string n)
 
-let mk_enumname n = Typename.TN_enum (Mangled.from_string n)
-
 let is_class typ =
   match typ with
   | Typ.Tptr (Typ.Tstruct { Typ.struct_name = Some name }, _)
diff --git a/infer/src/clang/cTypes.mli b/infer/src/clang/cTypes.mli
index 330371604..53ee768dc 100644
--- a/infer/src/clang/cTypes.mli
+++ b/infer/src/clang/cTypes.mli
@@ -19,8 +19,6 @@ val mk_classname : string -> Csu.class_kind -> Typename.t
 
 val mk_structname : string -> Typename.t
 
-val mk_enumname : string -> Typename.t
-
 val get_name_from_struct: Typ.t -> Mangled.t
 
 val remove_pointer_to_typ : Typ.t -> Typ.t
diff --git a/infer/src/clang/cTypes_decl.ml b/infer/src/clang/cTypes_decl.ml
index b8536d179..58437f5af 100644
--- a/infer/src/clang/cTypes_decl.ml
+++ b/infer/src/clang/cTypes_decl.ml
@@ -285,7 +285,6 @@ let get_type_from_expr_info ei tenv =
 
 let class_from_pointer_type tenv type_ptr =
   match type_ptr_to_sil_type tenv type_ptr with
-  | Typ.Tptr( Typ.Tvar (Typename.TN_typedef name), _) -> Mangled.to_string name
   | Typ.Tptr( Typ.Tvar (Typename.TN_csu (_, name)), _) -> Mangled.to_string name
   | _ -> assert false
 
diff --git a/infer/src/clang/printing.ml b/infer/src/clang/printing.ml
index 7dc3f4f6f..e509ce06e 100644
--- a/infer/src/clang/printing.ml
+++ b/infer/src/clang/printing.ml
@@ -65,9 +65,6 @@ let print_tenv_struct_unions tenv =
                     (Typ.to_string typ)^"\n") struct_t.instance_fields
               )
           )
-      | Typename.TN_typedef typname ->
-          print_endline
-            ((Mangled.to_string typname)^"-->"^(Typ.to_string (Typ.Tstruct struct_t)))
       | _ -> ()
     ) tenv