From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 10 Aug 2016 00:46:35 +0000 (+0000)
Subject: compiler: implement go:noinline and go:nosplit directives
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a36cb5b1d411315e2f2b565151e648056d0ae7bb;p=gcc.git

compiler: implement go:noinline and go:nosplit directives

    Reviewed-on: https://go-review.googlesource.com/26652

From-SVN: r239315
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d4c7a90d8b7..72d8f1e531c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-85a9c6992d9660e36972c279a5252fd9591bb765
+8da2129a005cc1f44d4d993b0b7312b64c0d68a4
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index a72ef9520ec..0bbf6ac7191 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -5083,11 +5083,19 @@ Function::get_or_make_decl(Gogo* gogo, Named_object* no)
       if (this->calls_defer_retaddr_)
 	is_inlinable = false;
 
+      // Check the //go:noinline compiler directive.
+      if ((this->pragmas_ & GOPRAGMA_NOINLINE) != 0)
+	is_inlinable = false;
+
       // If this is a thunk created to call a function which calls
       // the predeclared recover function, we need to disable
       // stack splitting for the thunk.
       bool disable_split_stack = this->is_recover_thunk_;
 
+      // Check the //go:nosplit compiler directive.
+      if ((this->pragmas_ & GOPRAGMA_NOSPLIT) != 0)
+	disable_split_stack = true;
+
       // This should go into a unique section if that has been
       // requested elsewhere, or if this is a nointerface function.
       // We want to put a nointerface function into a unique section
diff --git a/gcc/go/gofrontend/lex.cc b/gcc/go/gofrontend/lex.cc
index 9498c7dfc0b..692aa502fec 100644
--- a/gcc/go/gofrontend/lex.cc
+++ b/gcc/go/gofrontend/lex.cc
@@ -1842,13 +1842,11 @@ Lex::skip_cpp_comment()
     {
       // Applies to the next function.  Do not split the stack when
       // entering the function.
-      // FIXME: Not implemented.
       this->pragmas_ |= GOPRAGMA_NOSPLIT;
     }
   else if (verb == "go:noinline")
     {
       // Applies to the next function.  Do not inline the function.
-      // FIXME: Not implemented.
       this->pragmas_ |= GOPRAGMA_NOINLINE;
     }
   else if (verb == "go:systemstack")