From 703201ea4e783cc787be9fc2077382bc5e90d697 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu@cs.umass.edu>
Date: Sat, 6 Nov 2004 19:16:59 +0000
Subject: [PATCH] fold-const.c (non_lvalue): Don't construct NON_LVALUE_EXPR if
 we are in GIMPLE.

	* fold-const.c (non_lvalue): Don't construct NON_LVALUE_EXPR
	if we are in GIMPLE.

From-SVN: r90187
---
 gcc/ChangeLog    | 5 +++++
 gcc/fold-const.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00d25f18f9c..76bab59a888 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-06  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* fold-const.c (non_lvalue): Don't construct NON_LVALUE_EXPR
+	if we are in GIMPLE.
+
 2004-11-06  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	PR rtl-optimization/17933
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 01054d192bd..00840205979 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -1978,6 +1978,11 @@ fold_convert (tree type, tree arg)
 tree
 non_lvalue (tree x)
 {
+  /* While we are in GIMPLE, NON_LVALUE_EXPR doesn't mean anything to
+     us.  */
+  if (in_gimple_form)
+    return x;
+
   /* We only need to wrap lvalue tree codes.  */
   switch (TREE_CODE (x))
   {