From: Gary Dismukes <dismukes@adacore.com>
Date: Fri, 24 Jan 2014 15:15:04 +0000 (+0000)
Subject: exp_disp.adb (Expand_Dispatching_Call): Call Unqualify on Param when comparing it... 
X-Git-Tag: releases/gcc-4.9.0~1389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6d5d9405e8eb8bf5dd093a30bc2b6f00085c9b2;p=thirdparty%2Fgcc.git

exp_disp.adb (Expand_Dispatching_Call): Call Unqualify on Param when comparing it with Ctrl_Arg...

2014-01-24  Gary Dismukes  <dismukes@adacore.com>

	* exp_disp.adb (Expand_Dispatching_Call): Call Unqualify on Param when
	comparing it with Ctrl_Arg, since Ctrl_Arg may have had qualification
	stripped off.

From-SVN: r207043
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 576d30643bb6..084fb96c16b2 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-24  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_disp.adb (Expand_Dispatching_Call): Call Unqualify on Param when
+	comparing it with Ctrl_Arg, since Ctrl_Arg may have had qualification
+	stripped off.
+
 2014-01-24  Robert Dewar  <dewar@adacore.com>
 
 	* sinfo.ads, make.adb, prj-env.adb: Minor reformatting.
diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
index b4c56accb0f8..1f84738985fa 100644
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -777,11 +777,12 @@ package body Exp_Disp is
 
          Param := First_Actual (Call_Node);
          while Present (Param) loop
-            --  Cases in which we may have generated runtime checks
 
-            if Param = Ctrl_Arg
-              or else Subp = Eq_Prim_Op
-            then
+            --  Cases in which we may have generated run-time checks. Note that
+            --  we strip any qualification from Param before comparing with the
+            --  already-stripped controlling argument.
+
+            if Unqualify (Param) = Ctrl_Arg or else Subp = Eq_Prim_Op then
                Append_To (New_Params,
                  Duplicate_Subexpr_Move_Checks (Param));