summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-06-22 15:42:50 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-06-22 15:42:50 +0000
commit50aca7c7511112b9520d0a7b67f2c34fb8e3822f (patch)
treeabb280971cc5dd4c6d9ceff40182137740e572ae
parent583af268abdf79361fcbb0ca05f70d448adccd31 (diff)
downloadgcc-50aca7c7511112b9520d0a7b67f2c34fb8e3822f.tar.gz
compiler: fix stale comment in lexer
Remove stale comment in code that accepts "go:nowritebarrier" pragma. Update comment for "go:nowritebarrierrec". Reviewed-on: https://go-review.googlesource.com/46416 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249564 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/lex.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 296cd0f2890..dbff708d932 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-8804c912363320e0c229c5a471fb6f4b9e5965e6
+54d83c2d67c35ad4f622936d2fbf81c17354fff9
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/lex.cc b/gcc/go/gofrontend/lex.cc
index e834c13aaf9..beb365297fe 100644
--- a/gcc/go/gofrontend/lex.cc
+++ b/gcc/go/gofrontend/lex.cc
@@ -1909,7 +1909,6 @@ Lex::skip_cpp_comment()
// Applies to the next function. If the function needs to use
// any write barriers, it should emit an error instead.
// FIXME: Should only work when compiling the runtime package.
- // FIXME: Not implemented.
this->pragmas_ |= GOPRAGMA_NOWRITEBARRIER;
}
else if (verb == "go:nowritebarrierrec")
@@ -1918,7 +1917,7 @@ Lex::skip_cpp_comment()
// function that it calls, needs to use any write barriers, it
// should emit an error instead.
// FIXME: Should only work when compiling the runtime package.
- // FIXME: Not implemented.
+ // FIXME: currently treated the same as go:nowritebarrier
this->pragmas_ |= GOPRAGMA_NOWRITEBARRIERREC;
}
else if (verb == "go:cgo_unsafe_args")