summaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-14 13:36:35 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-14 13:36:35 +0000
commitcd39797e6b2f7c44da632d518ac9b0a296ea208a (patch)
tree319b4c046950b68f79d46161f30121384b85c6be /gcc/go/gofrontend/MERGE
parente5664bb5adc302c90b29a4abd4276251c9d70ac8 (diff)
downloadgcc-cd39797e6b2f7c44da632d518ac9b0a296ea208a.tar.gz
runtime: copy cpuprof code from Go 1.7 runtime
This replaces runtime/cpuprof.goc with go/runtime/cpuprof.go and adjusts the supporting code in runtime/proc.c. This adds another case where the compiler needs to avoid heap allocation in the runtime package: when evaluating a method expression into a closure. Implementing this required moving the relevant code from do_get_backend to do_flatten, so that I could easily add a temporary variable. Doing that let me get rid of Bound_method_expression::do_lower. Reviewed-on: https://go-review.googlesource.com/31050 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241163 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go/gofrontend/MERGE')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 6e689f464a9..769defcc221 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e3913d96fb024b916c87a4dc01f413523467ead9
+5f043fc2bf0f92a84a1f7da57acd79a61c9d2592
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.