# HG changeset patch
# User mir3636
# Date 1511865075 -32400
# Node ID 4cb7a319550d77d401a6de810965cc4272f3285d
# Parent  e234ee7b7292e9b8182b480420ef828549ff2740
fix c-parser.c

diff -r e234ee7b7292 -r 4cb7a319550d gcc/c/c-parser.c
--- a/gcc/c/c-parser.c	Fri Nov 17 19:25:43 2017 +0900
+++ b/gcc/c/c-parser.c	Tue Nov 28 19:31:15 2017 +0900
@@ -8060,7 +8060,6 @@
   struct c_declspecs *specs;
   struct c_typespec t;
   {
-    tree expr;
     push_scope ();
     declare_parm_level ();
     /*tree retval_type = TREE_TYPE(retval_decl);*/
@@ -8077,15 +8076,8 @@
     DECL_ARG_TYPE (_envp_decl) = ptr_type_node;
     pushdecl (_envp_decl);
     finish_decl (_envp_decl, loc, NULL_TREE, NULL_TREE, NULL_TREE);
-    struct c_declarator declarator;
-    struct c_parm* parm;
-    struct c_declspecs *specs_parm = build_null_declspecs();
-    declspecs_add_type (loc, specs_parm, TREE_TYPE(retval_decl));
-    finish_declspecs (specs_parm);
-    parm = build_c_parm (specs_parm, NULL_TREE,
-                       &declarator, loc);
-
-    args = get_parm_info(false, expr);
+
+    args = get_parm_info(false, NULL);
     pop_scope();
   }
 
diff -r e234ee7b7292 -r 4cb7a319550d gcc/gimple.h
--- a/gcc/gimple.h	Fri Nov 17 19:25:43 2017 +0900
+++ b/gcc/gimple.h	Tue Nov 28 19:31:15 2017 +0900
@@ -137,7 +137,6 @@
 enum gf_mask {
     GF_ASM_INPUT		= 1 << 0,
     GF_ASM_VOLATILE		= 1 << 1,
-<<<<<<< local
     GF_CALL_FROM_THUNK		= 1 << 0,
     GF_CALL_RETURN_SLOT_OPT	= 1 << 1,
     GF_CALL_TAILCALL		= 1 << 2,
@@ -150,17 +149,9 @@
     GF_CALL_MUST_TAIL_CALL	= 1 << 9,
     GF_CALL_BY_DESCRIPTOR	= 1 << 10,
     GF_CALL_NOCF_CHECK		= 1 << 11,
-=======
-    GF_CALL_CANNOT_INLINE	= 1 << 0,
-    GF_CALL_FROM_THUNK		= 1 << 1,
-    GF_CALL_RETURN_SLOT_OPT	= 1 << 2,
-    GF_CALL_TAILCALL		= 1 << 3,
-    GF_CALL_VA_ARG_PACK		= 1 << 4,
-    GF_CALL_NOTHROW		= 1 << 5,
 #ifndef noCbC
 	GF_CALL_CBC_GOTO		= 1 << 5,
 #endif
->>>>>>> other
     GF_OMP_PARALLEL_COMBINED	= 1 << 0,
     GF_OMP_PARALLEL_GRID_PHONY = 1 << 1,
     GF_OMP_TASK_TASKLOOP	= 1 << 0,
@@ -3267,7 +3258,6 @@
 /* Return true if GIMPLE_CALL S is marked as a tail call.  */
 
 static inline bool
-<<<<<<< local
 gimple_call_tail_p (gcall *s)
 {
   return (s->subcode & GF_CALL_TAILCALL) != 0;
@@ -3280,13 +3270,6 @@
 {
   if (must_tail_p)
     s->subcode |= GF_CALL_MUST_TAIL_CALL;
-=======
-gimple_call_tail_p (gimple s)
-{
-  GIMPLE_CHECK (s, GIMPLE_CALL);
-  return (s->gsbase.subcode & GF_CALL_TAILCALL) != 0;
-}
-
 #ifndef noCbC
 /* Return true if GIMPLE_CALL S is marked as a cbc goto.  */
 
@@ -3297,16 +3280,6 @@
   return (s->gsbase.subcode & GF_CALL_CBC_GOTO) != 0;
 }
 #endif
-
-/* Set the inlinable status of GIMPLE_CALL S to INLINABLE_P.  */
-
-static inline void
-gimple_call_set_cannot_inline (gimple s, bool inlinable_p)
-{
-  GIMPLE_CHECK (s, GIMPLE_CALL);
-  if (inlinable_p)
-    s->gsbase.subcode |= GF_CALL_CANNOT_INLINE;
->>>>>>> other
   else
     s->subcode &= ~GF_CALL_MUST_TAIL_CALL;
 }