From af6b489a1f4656d3922fbce571f0d1ec8fe293ec Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 16 Apr 2012 23:05:40 +0000
Subject: [PATCH] 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).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186511 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/go/gofrontend/expressions.cc | 18 ++++++++++++++++--
 1 file 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*
-- 
2.7.4