diff options
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 51098e7..8fc3878 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -274c88df4d6f9360dcd657b6e069a3b5a1d37a90 +8deaafd14414bb5cbbdf3e2673f61b6d836d7d2a 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/expressions.cc b/gcc/go/gofrontend/expressions.cc index 2c2ae1c..143f0a7 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -9635,13 +9635,9 @@ Call_expression::do_lower(Gogo* gogo, Named_object* function, "__builtin_return_address", 0); } - else if (this->args_ != NULL - && this->args_->size() == 1 + else if ((this->args_ == NULL || this->args_->size() == 0) && n == "getcallersp") { - // The actual argument to getcallersp is always the - // address of a parameter; we don't need that for the - // GCC builtin function, so we just ignore it. static Named_object* builtin_frame_address; return this->lower_to_builtin(&builtin_frame_address, "__builtin_frame_address", |