diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-04-16 23:05:40 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-04-16 23:05:40 +0000 |
| commit | 2dfc736cc774d78991712e80940446fc448d03ac (patch) | |
| tree | 2e167b8be082bf80ff042e1cedcf1a1f32f13286 /gcc/go | |
| parent | 4a1016814c2121920459d13ccb4c841b3a537951 (diff) | |
| download | gcc-2dfc736cc774d78991712e80940446fc448d03ac.zip gcc-2dfc736cc774d78991712e80940446fc448d03ac.tar.gz gcc-2dfc736cc774d78991712e80940446fc448d03ac.tar.bz2 | |
compiler: fix infinite recursion in string constant evaluation.
Fixes compilation of incorrect code:
const f, g = g, f
func S() []byte { return []byte(f) }
The problem was already handled for numerical constants.
Part of issue 3186 (go).
From-SVN: r186511
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index baff0c9..6ff0718 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -2403,8 +2403,7 @@ class Const_expression : public Expression do_numeric_constant_value(Numeric_constant* nc) const; bool - do_string_constant_value(std::string* val) const - { return this->constant_->const_value()->expr()->string_constant_value(val); } + do_string_constant_value(std::string* val) const; Type* do_type(); @@ -2514,6 +2513,21 @@ Const_expression::do_numeric_constant_value(Numeric_constant* nc) const return r; } +bool +Const_expression::do_string_constant_value(std::string* val) const +{ + if (this->seen_) + return false; + + Expression* e = this->constant_->const_value()->expr(); + + this->seen_ = true; + bool ok = e->string_constant_value(val); + this->seen_ = false; + + return ok; +} + // Return the type of the const reference. Type* |