diff options
| author | Andrew Wilkins <axwalk@gmail.com> | 2016-03-15 05:36:43 +0000 |
|---|---|---|
| committer | Andrew Wilkins <axwalk@gmail.com> | 2016-03-15 05:36:43 +0000 |
| commit | 6436a4abd7a2f3a60b230453295dba199d8a59c3 (patch) | |
| tree | 125aef80fc2cf46c5d1758a8ece1fde14e7b13fd /llgo/third_party/gofrontend/libgo/runtime/go-caller.c | |
| parent | 36761bf92427846ce40fdd849615732c852e44dd (diff) | |
| download | bcm5719-llvm-6436a4abd7a2f3a60b230453295dba199d8a59c3.tar.gz bcm5719-llvm-6436a4abd7a2f3a60b230453295dba199d8a59c3.zip | |
[llgo] Roll gofrontend forward
Switch gofrontend to using go.googlesource.com, and
update to 81eb6a3f425b2158c67ee32c0cc973a72ce9d6be.
There are various changes required to update to the
go 1.5 runtime:
typemap.go is changed to accommodate the change in representation for equal/hash algorithms, and the removal of the zero value/type.
CMakeLists.txt is updated to add the build tree to the package search path, so internal packages, which are not installed, are found.
various files changes due to removal of __go_new_nopointers; the same change as in D11863, but with NoUnwindAttribute added to the added runtime functions which are called with "callOnly".
minor cleanups in ssa.go while investigating issues with unwinding/panic handling.
Differential Revisision: http://reviews.llvm.org/D15188
llvm-svn: 263536
Diffstat (limited to 'llgo/third_party/gofrontend/libgo/runtime/go-caller.c')
| -rw-r--r-- | llgo/third_party/gofrontend/libgo/runtime/go-caller.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llgo/third_party/gofrontend/libgo/runtime/go-caller.c b/llgo/third_party/gofrontend/libgo/runtime/go-caller.c index ad151ecea8e..d6901e07377 100644 --- a/llgo/third_party/gofrontend/libgo/runtime/go-caller.c +++ b/llgo/third_party/gofrontend/libgo/runtime/go-caller.c @@ -166,7 +166,7 @@ Caller (int skip) runtime_memclr (&ret, sizeof ret); n = runtime_callers (skip + 1, &loc, 1, false); - if (n < 1) + if (n < 1 || loc.pc == 0) return ret; ret.pc = loc.pc; ret.file = loc.filename; @@ -231,6 +231,8 @@ String runtime_funcname_go (Func *f) String runtime_funcname_go (Func *f) { + if (f == NULL) + return runtime_gostringnocopy ((const byte *) ""); return f->name; } |

