diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 47400e25a45..c62877fe8fb 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-04  Ian Lance Taylor  <iant@golang.org>
+
+	PR tree-optimization/91663
+	* go-lang.c (go_langhook_post_options): Clear
+	flag_partial_inlining.
+
 2019-08-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/91283
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index a6bda936ed7..75d98933820 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -300,6 +300,11 @@ go_langhook_post_options (const char **pfilename ATTRIBUTE_UNUSED)
   if (!global_options_set.x_flag_optimize_sibling_calls)
     global_options.x_flag_optimize_sibling_calls = 0;
 
+  /* Partial inlining can confuses uses of runtime.Callers.
+     See https://gcc.gnu.org/PR91663.  */
+  if (!global_options_set.x_flag_partial_inlining)
+    global_options.x_flag_partial_inlining = 0;
+
   /* If the debug info level is still 1, as set in init_options, make
      sure that some debugging type is selected.  */
   if (global_options.x_debug_info_level == DINFO_LEVEL_TERSE