Mercurial > hg > CbC > CbC_gcc

comparison gcc/gimple.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
36 #include "tree-eh.h" 36 #include "tree-eh.h"
37 #include "gimple-iterator.h" 37 #include "gimple-iterator.h"
38 #include "gimple-walk.h" 38 #include "gimple-walk.h"
39 #include "gimplify.h" 39 #include "gimplify.h"
40 #include "target.h" 40 #include "target.h"
41 <<<<<<< local
42 #include "builtins.h" 41 #include "builtins.h"
43 #include "selftest.h" 42 #include "selftest.h"
44 #include "gimple-pretty-print.h" 43 #include "gimple-pretty-print.h"
45 #include "stringpool.h" 44 #include "stringpool.h"
46 #include "attribs.h" 45 #include "attribs.h"
47 #include "asan.h" 46 #include "asan.h"
48
49 =======
50 #include "tree.h"
51 #include "ggc.h"
52 #include "hard-reg-set.h"
53 #include "basic-block.h"
54 #include "gimple.h"
55 #include "diagnostic.h"
56 #include "tree-flow.h"
57 #include "value-prof.h"
58 #include "flags.h"
59 #ifndef noCbC 47 #ifndef noCbC
60 #include "cbc-tree.h" 48 #include "c/cbc-tree.h"
61 #endif 49 #endif
62 #include "alias.h"
63 #include "demangle.h"
64 #include "langhooks.h"
65
66 /* Global type table. FIXME lto, it should be possible to re-use some
67 of the type hashing routines in tree.c (type_hash_canon, type_hash_lookup,
68 etc), but those assume that types were built with the various
69 build_*_type routines which is not the case with the streamer. */
70 static GTY((if_marked ("ggc_marked_p"), param_is (union tree_node)))
71 htab_t gimple_types;
72 static GTY((if_marked ("ggc_marked_p"), param_is (union tree_node)))
73 htab_t gimple_canonical_types;
74 static GTY((if_marked ("tree_int_map_marked_p"), param_is (struct tree_int_map)))
75 htab_t type_hash_cache;
76 static GTY((if_marked ("tree_int_map_marked_p"), param_is (struct tree_int_map)))
77 htab_t canonical_type_hash_cache;
78
79 /* Global type comparison cache. This is by TYPE_UID for space efficiency
80 and thus cannot use and does not need GC. */
81 static htab_t gtc_visited;
82 static struct obstack gtc_ob;
83 >>>>>>> other
84 50
85 /* All the tuples have their operand vector (if present) at the very bottom 51 /* All the tuples have their operand vector (if present) at the very bottom
86 of the structure. Therefore, the offset required to find the 52 of the structure. Therefore, the offset required to find the
87 operands vector the size of the structure minus the size of the 1 53 operands vector the size of the structure minus the size of the 1
88 element tree array at the end (see gimple_ops). */ 54 element tree array at the end (see gimple_ops). */
408 && ALLOCA_FUNCTION_CODE_P (DECL_FUNCTION_CODE (fndecl))) 374 && ALLOCA_FUNCTION_CODE_P (DECL_FUNCTION_CODE (fndecl)))
409 gimple_call_set_alloca_for_var (call, CALL_ALLOCA_FOR_VAR_P (t)); 375 gimple_call_set_alloca_for_var (call, CALL_ALLOCA_FOR_VAR_P (t));
410 else 376 else
411 gimple_call_set_from_thunk (call, CALL_FROM_THUNK_P (t)); 377 gimple_call_set_from_thunk (call, CALL_FROM_THUNK_P (t));
412 gimple_call_set_va_arg_pack (call, CALL_EXPR_VA_ARG_PACK (t)); 378 gimple_call_set_va_arg_pack (call, CALL_EXPR_VA_ARG_PACK (t));
413 <<<<<<< local
414 gimple_call_set_nothrow (call, TREE_NOTHROW (t)); 379 gimple_call_set_nothrow (call, TREE_NOTHROW (t));
415 gimple_call_set_by_descriptor (call, CALL_EXPR_BY_DESCRIPTOR (t)); 380 gimple_call_set_by_descriptor (call, CALL_EXPR_BY_DESCRIPTOR (t));
416 =======
417 #ifndef noCbC 381 #ifndef noCbC
418 gimple_call_set_cbc_goto (call, CALL_EXPR_CbC_GOTO (t)); 382 gimple_call_set_cbc_goto (call, CALL_EXPR_CbC_GOTO (t));
419 #endif 383 #endif
420 >>>>>>> other
421 gimple_set_no_warning (call, TREE_NO_WARNING (t)); 384 gimple_set_no_warning (call, TREE_NO_WARNING (t));
422 gimple_call_set_with_bounds (call, CALL_WITH_BOUNDS_P (t)); 385 gimple_call_set_with_bounds (call, CALL_WITH_BOUNDS_P (t));
423 386
424 if (fnptrtype) 387 if (fnptrtype)
425 { 388 {