--- a/gcc/gimple.h	Tue Nov 28 19:31:15 2017 +0900
+++ b/gcc/gimple.h	Tue Nov 28 20:22:01 2017 +0900
@@ -3245,13 +3245,13 @@
    candidate for tail call optimization.  */
 
 static inline void
-gimple_call_set_cbc_goto (gimple s, bool cbcgoto_p)
+gimple_call_set_cbc_goto (gimple *s, bool cbcgoto_p)
 {
   GIMPLE_CHECK (s, GIMPLE_CALL);
   if (cbcgoto_p)
-    s->gsbase.subcode |= GF_CALL_CBC_GOTO;
+    s->subcode |= GF_CALL_CBC_GOTO;
   else
-    s->gsbase.subcode &= ~GF_CALL_CBC_GOTO;
+    s->subcode &= ~GF_CALL_CBC_GOTO;
 }
 #endif
 
@@ -3270,19 +3270,20 @@
 {
   if (must_tail_p)
     s->subcode |= GF_CALL_MUST_TAIL_CALL;
+  else
+    s->subcode &= ~GF_CALL_MUST_TAIL_CALL;
+}
+
 #ifndef noCbC
 /* Return true if GIMPLE_CALL S is marked as a cbc goto.  */
 
 static inline bool
-gimple_call_cbc_goto_p (gimple s)
+gimple_call_cbc_goto_p (gimple *s)
 {
   GIMPLE_CHECK (s, GIMPLE_CALL);
-  return (s->gsbase.subcode & GF_CALL_CBC_GOTO) != 0;
+  return (s->subcode & GF_CALL_CBC_GOTO) != 0;
 }
 #endif
-  else
-    s->subcode &= ~GF_CALL_MUST_TAIL_CALL;
-}
 
 /* Return true if call statement has been marked as requiring
    tail call optimization.  */