Mercurial > hg > CbC > CbC_gcc

comparison 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
comparison
equal deleted inserted replaced
116:367f9f4f266e 117:f81c5aa9f14f
55 #include "omp-low.h" 55 #include "omp-low.h"
56 #include "gimple-low.h" 56 #include "gimple-low.h"
57 #include "cilk.h" 57 #include "cilk.h"
58 #include "gomp-constants.h" 58 #include "gomp-constants.h"
59 #include "splay-tree.h" 59 #include "splay-tree.h"
60 <<<<<<< local
61 #include "gimple-walk.h" 60 #include "gimple-walk.h"
62 #include "langhooks-def.h" /* FIXME: for lhd_set_decl_assembler_name */ 61 #include "langhooks-def.h" /* FIXME: for lhd_set_decl_assembler_name */
63 #include "builtins.h" 62 #include "builtins.h"
64 #include "stringpool.h" 63 #include "stringpool.h"
65 #include "attribs.h" 64 #include "attribs.h"
66 #include "asan.h" 65 #include "asan.h"
67 #include "dbgcnt.h" 66 #include "dbgcnt.h"
68 67
69 /* Hash set of poisoned variables in a bind expr. */ 68 /* Hash set of poisoned variables in a bind expr. */
70 static hash_set<tree> *asan_poisoned_variables = NULL; 69 static hash_set<tree> *asan_poisoned_variables = NULL;
71 =======
72 #include "vec.h"
73 #include "gimple.h"
74 #include "tree-pass.h" 70 #include "tree-pass.h"
75 #ifndef noCbC 71 #ifndef noCbC
76 #include "cbc-tree.h" 72 #include "c/cbc-tree.h"
77 #endif 73 #endif
78
79 #include "langhooks-def.h" /* FIXME: for lhd_set_decl_assembler_name. */
80 #include "expr.h" /* FIXME: for can_move_by_pieces
81 and STACK_CHECK_MAX_VAR_SIZE. */
82 >>>>>>> other
83 74
84 enum gimplify_omp_var_data 75 enum gimplify_omp_var_data
85 { 76 {
86 GOVD_SEEN = 1, 77 GOVD_SEEN = 1,
87 GOVD_EXPLICIT = 2, 78 GOVD_EXPLICIT = 2,