Mercurial > hg > CbC > CbC_gcc

diff gcc/tree-ssa-operands.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/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