Mercurial > hg > CbC > CbC_gcc

diff gcc/gimplify.c @ 117:f81c5aa9f14f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author mir3636
date Tue, 28 Nov 2017 21:17:15 +0900
parents ab0bcb71f44d
children d34655255c78
line wrap: on
line diff
--- a/gcc/gimplify.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/gimplify.c	Tue Nov 28 21:17:15 2017 +0900
@@ -57,7 +57,6 @@
 #include "cilk.h"
 #include "gomp-constants.h"
 #include "splay-tree.h"
-<<<<<<< local
 #include "gimple-walk.h"
 #include "langhooks-def.h"	/* FIXME: for lhd_set_decl_assembler_name */
 #include "builtins.h"
@@ -68,19 +67,11 @@
 
 /* Hash set of poisoned variables in a bind expr.  */
 static hash_set<tree> *asan_poisoned_variables = NULL;
-=======
-#include "vec.h"
-#include "gimple.h"
 #include "tree-pass.h"
 #ifndef noCbC
-#include "cbc-tree.h"
+#include "c/cbc-tree.h"
 #endif
 
-#include "langhooks-def.h"	/* FIXME: for lhd_set_decl_assembler_name.  */
-#include "expr.h"		/* FIXME: for can_move_by_pieces
-				   and STACK_CHECK_MAX_VAR_SIZE.  */
->>>>>>> other
-
 enum gimplify_omp_var_data
 {
   GOVD_SEEN = 1,