--- a/gcc/gimple.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/gimple.c	Tue Nov 28 21:17:15 2017 +0900
@@ -38,49 +38,15 @@
 #include "gimple-walk.h"
 #include "gimplify.h"
 #include "target.h"
-<<<<<<< local
 #include "builtins.h"
 #include "selftest.h"
 #include "gimple-pretty-print.h"
 #include "stringpool.h"
 #include "attribs.h"
 #include "asan.h"
-
-=======
-#include "tree.h"
-#include "ggc.h"
-#include "hard-reg-set.h"
-#include "basic-block.h"
-#include "gimple.h"
-#include "diagnostic.h"
-#include "tree-flow.h"
-#include "value-prof.h"
-#include "flags.h"
 #ifndef noCbC
-#include "cbc-tree.h"
+#include "c/cbc-tree.h"
 #endif
-#include "alias.h"
-#include "demangle.h"
-#include "langhooks.h"
-
-/* Global type table.  FIXME lto, it should be possible to re-use some
-   of the type hashing routines in tree.c (type_hash_canon, type_hash_lookup,
-   etc), but those assume that types were built with the various
-   build_*_type routines which is not the case with the streamer.  */
-static GTY((if_marked ("ggc_marked_p"), param_is (union tree_node)))
-  htab_t gimple_types;
-static GTY((if_marked ("ggc_marked_p"), param_is (union tree_node)))
-  htab_t gimple_canonical_types;
-static GTY((if_marked ("tree_int_map_marked_p"), param_is (struct tree_int_map)))
-  htab_t type_hash_cache;
-static GTY((if_marked ("tree_int_map_marked_p"), param_is (struct tree_int_map)))
-  htab_t canonical_type_hash_cache;
-
-/* Global type comparison cache.  This is by TYPE_UID for space efficiency
-   and thus cannot use and does not need GC.  */
-static htab_t gtc_visited;
-static struct obstack gtc_ob;
->>>>>>> other
 
 /* All the tuples have their operand vector (if present) at the very bottom
    of the structure.  Therefore, the offset required to find the
@@ -410,14 +376,11 @@
   else
     gimple_call_set_from_thunk (call, CALL_FROM_THUNK_P (t));
   gimple_call_set_va_arg_pack (call, CALL_EXPR_VA_ARG_PACK (t));
-<<<<<<< local
   gimple_call_set_nothrow (call, TREE_NOTHROW (t));
   gimple_call_set_by_descriptor (call, CALL_EXPR_BY_DESCRIPTOR (t));
-=======
 #ifndef noCbC
   gimple_call_set_cbc_goto (call, CALL_EXPR_CbC_GOTO (t));
 #endif
->>>>>>> other
   gimple_set_no_warning (call, TREE_NO_WARNING (t));
   gimple_call_set_with_bounds (call, CALL_WITH_BOUNDS_P (t));