go-gcc.cc: #include "opts.h".

	* go-gcc.cc: #include "opts.h".
	(Gcc_backend::function): Compile thunks with -Os.

From-SVN: r268861

diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index d75aea951f5dc8cdd95e5712099f8677238851d6..ac2c2e185c96b4b7d1c920079182f54b64c43942 100644 (file)
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-13  Ian Lance Taylor  <iant@golang.org>
+
+       * go-gcc.cc: #include "opts.h".
+       (Gcc_backend::function): Compile thunks with -Os.
+
 2019-02-05  Nikhil Benesch  <nikhil.benesch@gmail.com>
 
         PR go/89019

diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 4e9e0e3026a64413e80c43349561e8b4f442a87b..d781ef5b3b2d2166bf61f8b401a10db7472551a2 100644 (file)
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -25,6 +25,7 @@
 #include <gmp.h>
 
 #include "tree.h"
+#include "opts.h"
 #include "fold-const.h"
 #include "stringpool.h"
 #include "stor-layout.h"
@@ -3103,6 +3104,41 @@ Gcc_backend::function(Btype* fntype, const std::string& name,
       DECL_DECLARED_INLINE_P(decl) = 1;
     }
 
+  // Optimize thunk functions for size.  A thunk created for a defer
+  // statement that may call recover looks like:
+  //     if runtime.setdeferretaddr(L1) {
+  //         goto L1
+  //     }
+  //     realfn()
+  // L1:
+  // The idea is that L1 should be the address to which realfn
+  // returns.  This only works if this little function is not over
+  // optimized.  At some point GCC started duplicating the epilogue in
+  // the basic-block reordering pass, breaking this assumption.
+  // Optimizing the function for size avoids duplicating the epilogue.
+  // This optimization shouldn't matter for any thunk since all thunks
+  // are small.
+  size_t pos = name.find("..thunk");
+  if (pos != std::string::npos)
+    {
+      for (pos += 7; pos < name.length(); ++pos)
+       {
+         if (name[pos] < '0' || name[pos] > '9')
+           break;
+       }
+      if (pos == name.length())
+       {
+         struct cl_optimization cur_opts;
+         cl_optimization_save(&cur_opts, &global_options);
+         global_options.x_optimize_size = 1;
+         global_options.x_optimize_fast = 0;
+         global_options.x_optimize_debug = 0;
+         DECL_FUNCTION_SPECIFIC_OPTIMIZATION(decl) =
+           build_optimization_node(&global_options);
+         cl_optimization_restore(&global_options, &cur_opts);
+       }
+    }
+
   go_preserve_from_gc(decl);
   return new Bfunction(decl);
 }