From 5e17a506a10012422591047a00596acba28f1c6e Mon Sep 17 00:00:00 2001
From: Dirk Gouders <dirk@gouders.net>
Date: Tue, 21 May 2013 10:54:11 +0200
Subject: [PATCH] --- yaml --- r: 376703 b: refs/heads/master c:
 e983b7b17ad1a978e954e6aaa62cf12bfc747883 h: refs/heads/master i:   376701:
 e1b9441dcc35d957f8db4e546a553f6c335d5d87   376699:
 e54159746cfee765bde4b8b1f78dca9e43708aaa   376695:
 6d193f5e3224c3620d7df396adc2670e7ff83532   376687:
 b54deee51c2b3a453c3ebd3edef1812fae71fc06   376671:
 6ad4c4c74d3038628adac81167c01b4a83352246   376639:
 3f766cdb5bc7533726ed41ef1b6f2d11ee62a6b7   376575:
 e7a9d99e6b686700eb79e676652ae574dc74b928 v: v3

---
 [refs]                       |  2 +-
 trunk/scripts/kconfig/menu.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b34e2818bb9a..2b7c37de44b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 063f4661fde8c03c4c03f8a205071a52691c152e
+refs/heads/master: e983b7b17ad1a978e954e6aaa62cf12bfc747883
diff --git a/trunk/scripts/kconfig/menu.c b/trunk/scripts/kconfig/menu.c
index b5c7d90df9df..fd3f0180e08f 100644
--- a/trunk/scripts/kconfig/menu.c
+++ b/trunk/scripts/kconfig/menu.c
@@ -146,11 +146,24 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
 			struct menu *menu = current_entry;
 
 			while ((menu = menu->parent) != NULL) {
+				struct expr *dup_expr;
+
 				if (!menu->visibility)
 					continue;
+				/*
+				 * Do not add a reference to the
+				 * menu's visibility expression but
+				 * use a copy of it.  Otherwise the
+				 * expression reduction functions
+				 * will modify expressions that have
+				 * multiple references which can
+				 * cause unwanted side effects.
+				 */
+				dup_expr = expr_copy(menu->visibility);
+
 				prop->visible.expr
 					= expr_alloc_and(prop->visible.expr,
-							 menu->visibility);
+							 dup_expr);
 			}
 		}