# HG changeset patch
# User mir3636
# Date 1511871435 -32400
# Node ID f81c5aa9f14f8fdbc18d5e8adcc3fd22c7ea758e
# Parent  367f9f4f266efd57064551b115d8fa4787a32898
fix

diff -r 367f9f4f266e -r f81c5aa9f14f gcc/calls.c
--- a/gcc/calls.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/calls.c	Tue Nov 28 21:17:15 2017 +0900
@@ -3427,7 +3427,7 @@
       && try_tail_call == 0)
     {
       location_t loc = EXPR_LOCATION (exp);
-      char *name_callee = IDENTIFIER_POINTER(DECL_NAME(fndecl));
+     const  char *name_callee = IDENTIFIER_POINTER(DECL_NAME(fndecl));
       warning_at (loc, 0, "transition to code segment \"%s\" with CbC goto, but tail call optimization was cut.",
                         name_callee);
       try_tail_call = 1;
diff -r 367f9f4f266e -r f81c5aa9f14f gcc/cfgexpand.c
--- a/gcc/cfgexpand.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/cfgexpand.c	Tue Nov 28 21:17:15 2017 +0900
@@ -64,19 +64,12 @@
 #include "params.h"
 #include "tree-inline.h"
 #include "value-prof.h"
-<<<<<<< local
 #include "tree-ssa-live.h"
 #include "tree-outof-ssa.h"
 #include "cfgloop.h"
-=======
-#include "target.h"
 #ifndef noCbC
-#include "cbc-tree.h"
+#include "c/cbc-tree.h"
 #endif
-#include "ssaexpand.h"
-#include "bitmap.h"
-#include "sbitmap.h"
->>>>>>> other
 #include "insn-attr.h" /* For INSN_SCHEDULING.  */
 #include "stringpool.h"
 #include "attribs.h"
diff -r 367f9f4f266e -r f81c5aa9f14f gcc/gimple.c
--- 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));
 
diff -r 367f9f4f266e -r f81c5aa9f14f gcc/gimplify.c
--- 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,
diff -r 367f9f4f266e -r f81c5aa9f14f gcc/passes.c
--- a/gcc/passes.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/passes.c	Tue Nov 28 21:17:15 2017 +0900
@@ -1541,7 +1541,6 @@
   all_late_ipa_passes (NULL), passes_by_id (NULL), passes_by_id_size (0),
   m_ctxt (ctxt), m_name_to_pass_map (NULL)
 {
-<<<<<<< local
   opt_pass **p;
 
   /* Zero-initialize pass members.  */
@@ -1623,39 +1622,6 @@
 delete_pass_tree (opt_pass *pass)
 {
   while (pass)
-=======
-  struct opt_pass **p;
-
-#define NEXT_PASS(PASS)  (p = next_pass_1 (p, &((PASS).pass)))
-
- /* All passes needed to lower the function into shape optimizers can
-    operate on.  These passes are always run first on the function, but
-    backend might produce already lowered functions that are not processed
-    by these passes.  */
-  p = &all_lowering_passes;
-  NEXT_PASS (pass_warn_unused_result);
-  NEXT_PASS (pass_diagnose_omp_blocks);
-  NEXT_PASS (pass_mudflap_1);
-  NEXT_PASS (pass_lower_omp);
-  NEXT_PASS (pass_lower_cf);
-  NEXT_PASS (pass_refactor_eh);
-  NEXT_PASS (pass_lower_eh);
-  NEXT_PASS (pass_build_cfg);
-
-#ifndef noCbC
-  //NEXT_PASS (pass_warn_function_return);
-#else
-  NEXT_PASS (pass_warn_function_return);
-#endif
-  NEXT_PASS (pass_build_cgraph_edges);
-  *p = NULL;
-
-  /* Interprocedural optimization passes.  */
-  p = &all_small_ipa_passes;
-  NEXT_PASS (pass_ipa_free_lang_data);
-  NEXT_PASS (pass_ipa_function_and_variable_visibility);
-  NEXT_PASS (pass_early_local_passes);
->>>>>>> other
     {
       /* Recurse into child passes.  */
       delete_pass_tree (pass->sub);
diff -r 367f9f4f266e -r f81c5aa9f14f gcc/tree-ssa-operands.c
--- a/gcc/tree-ssa-operands.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/tree-ssa-operands.c	Tue Nov 28 21:17:15 2017 +0900
@@ -26,24 +26,13 @@
 #include "timevar.h"
 #include "ssa.h"
 #include "gimple-pretty-print.h"
-<<<<<<< local
 #include "diagnostic-core.h"
 #include "stmt.h"
 #include "print-tree.h"
 #include "dumpfile.h"
-
-=======
-#include "tree-flow.h"
-#include "tree-inline.h"
-#include "tree-pass.h"
-#include "ggc.h"
-#include "timevar.h"
-#include "langhooks.h"
-#include "ipa-reference.h"
 #ifndef noCbC
-  #include "cbc-tree.h"
+  #include "c/cbc-tree.h"
 #endif
->>>>>>> other
 
 /* This file contains the code required to manage the operands cache of the
    SSA optimizer.  For every stmt, we maintain an operand cache in the stmt
diff -r 367f9f4f266e -r f81c5aa9f14f gcc/tree.c
--- a/gcc/tree.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/tree.c	Tue Nov 28 21:17:15 2017 +0900
@@ -106,7 +106,7 @@
 #undef END_OF_BASE_TREE_CODES
 
 #ifndef noCbC
-#include "cbc-tree.h"
+#include "c/cbc-tree.h"
 #endif
 
 /* Each tree code class has an associated string representation.
@@ -11493,7 +11493,6 @@
   return NULL;
 }
 
-<<<<<<< local
 void
 tree_set_block (tree t, tree b)
 {
@@ -11507,24 +11506,6 @@
     gcc_unreachable ();
 }
 
-=======
-/* Build and return a TREE_LIST of arguments in the CALL_EXPR exp.                                                                    
-   FIXME: don't use this function.  It exists for compatibility with                                                                  
-   the old representation of CALL_EXPRs where a list was used to hold the                                                             
-   arguments.  Places that currently extract the arglist from a CALL_EXPR                                                             
-   ought to be rewritten to use the CALL_EXPR itself.  */
-tree
-call_expr_arglist (tree exp)
-{
-  tree arglist = NULL_TREE;
-  int i;
-  for (i = call_expr_nargs (exp) - 1; i >= 0; i--)
-    arglist = tree_cons (NULL_TREE, CALL_EXPR_ARG (exp, i), arglist);
-  return arglist;
-}
-
-
->>>>>>> other
 /* Create a nameless artificial label and put it in the current
    function context.  The label has a location of LOC.  Returns the
    newly created label.  */