From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 12 Sep 2014 11:06:49 +0000 (+0000)
Subject: 2014-09-12  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f96f6527707998a24a6364137e5a06febb060d8;p=thirdparty%2Fgcc.git

2014-09-12  Richard Biener  <rguenther@suse.de>

	PR middle-end/63237
	* gimple-fold.c (get_maxval_strlen): Gimplify string length.

	* g++.dg/torture/pr63237.C: New testcase.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215212 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 98586be01d1c..52825bb6cf22 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-12  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/63237
+	* gimple-fold.c (get_maxval_strlen): Gimplify string length.
+
 2014-09-12  Marc Glisse  <marc.glisse@inria.fr>
 
 	* tree.c (integer_each_onep): New function.
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 4aa1f4c1eda5..3d5e3b91c040 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -2411,6 +2411,7 @@ gimple_fold_builtin_strlen (gimple_stmt_iterator *gsi)
   tree len = get_maxval_strlen (gimple_call_arg (stmt, 0), 0);
   if (!len)
     return false;
+  len = force_gimple_operand_gsi (gsi, len, true, NULL, true, GSI_SAME_STMT);
   replace_call_with_value (gsi, len);
   return true;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb727bf04648..20defa5bc3ec 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-12  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/63237
+	* g++.dg/torture/pr63237.C: New testcase.
+
 2014-09-12  Marc Glisse  <marc.glisse@inria.fr>
 
 	* gcc.dg/vec-andxor1.c: New file.
diff --git a/gcc/testsuite/g++.dg/torture/pr63237.C b/gcc/testsuite/g++.dg/torture/pr63237.C
new file mode 100644
index 000000000000..d1eaadab0435
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr63237.C
@@ -0,0 +1,21 @@
+// { dg-do compile }
+
+class A {
+    int Length;
+public:
+    A(const char *p1) { Length = __builtin_strlen(p1); }
+};
+class B {
+public:
+    void m_fn1(int, A);
+};
+class C {
+public:
+    B &m_fn2();
+};
+int a;
+void RewriteMacrosInInput() {
+    C b;
+    B &c = b.m_fn2();
+    c.m_fn1(0, &""[a]);
+}