aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-08-03 17:54:50 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-08-03 17:54:50 +0000
commit3d6d2a63b2457450d93cfaa9787a27359264b2c3 (patch)
tree9571b922399290511f15ae0d488782d6fc9ee6fc
parent8a9212788db6800b478389b5db1b9807c58286e9 (diff)
downloadgcc-3d6d2a63b2457450d93cfaa9787a27359264b2c3.zip
gcc-3d6d2a63b2457450d93cfaa9787a27359264b2c3.tar.gz
gcc-3d6d2a63b2457450d93cfaa9787a27359264b2c3.tar.bz2
re PR go/67101 (mprof.goc:408:5: error: calling ‘__builtin_frame_address’ with a nonzero argument is unsafe [-Werror=frame-address])
PR go/67101 runtime: Remove call to __builtin_frame_address. __builtin_frame_address was only supposed to use nonzero arguments for debugging purposes. Calling it with nonzero arguments can have unpredictable results and uses are now marked unsafe when -Wframe-address is enabled. Reviewed-on: https://go-review.googlesource.com/13063 From-SVN: r226525
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/runtime/mprof.goc4
2 files changed, 2 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4ebc803..2632f4e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2bf7c643a1d2f8503070c8e6cb87852026e32400
+d5aad2f400a0f21724e33e4ae48e1583ed8b1a87
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/runtime/mprof.goc b/libgo/runtime/mprof.goc
index d9c220b..c9022df 100644
--- a/libgo/runtime/mprof.goc
+++ b/libgo/runtime/mprof.goc
@@ -402,10 +402,9 @@ func ThreadCreateProfile(p Slice) (n int, ok bool) {
}
func Stack(b Slice, all bool) (n int) {
- byte *pc, *sp;
+ byte *pc;
bool enablegc;
- sp = runtime_getcallersp(&b);
pc = (byte*)(uintptr)runtime_getcallerpc(&b);
if(all) {
@@ -423,7 +422,6 @@ func Stack(b Slice, all bool) (n int) {
g->writebuf = (byte*)b.__values;
g->writenbuf = b.__count;
USED(pc);
- USED(sp);
runtime_goroutineheader(g);
runtime_traceback();
runtime_printcreatedby(g);