exp_ch6.adb (Expand_N_Subprogram_Body): Temporarily restrict the generation of TSDs...

2011-08-02  Javier Miranda  <miranda@adacore.com>

	* exp_ch6.adb (Expand_N_Subprogram_Body): Temporarily restrict the
	generation of TSDs to the DOTNET compiler.
	* exp_ch7.adb (Expand_N_Package_Body): Temporarily restrict the
	generation of TSDs to the DOTNET compiler.

From-SVN: r177164

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e401f48668d4ea1b2c146a5d948e5a8e2eafd5d7..f980c7321afbdfbd375698c936bfb6d51dea247a 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-02  Javier Miranda  <miranda@adacore.com>
+
+       * exp_ch6.adb (Expand_N_Subprogram_Body): Temporarily restrict the
+       generation of TSDs to the DOTNET compiler.
+       * exp_ch7.adb (Expand_N_Package_Body): Temporarily restrict the
+       generation of TSDs to the DOTNET compiler.
+
 2011-08-02  Javier Miranda  <miranda@adacore.com>
 
        * exp_disp.ads (Build_VM_TSDs): Build the runtime Type Specific Data

diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index aa8775c3dbf2c04836222a667ba56e8b6bf8cfe1..cb4b6c853d81de582c334cdd39e53c54b96390e1 100644 (file)
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -5125,8 +5125,11 @@ package body Exp_Ch6 is
       --  VM targets we generate now the Type Specific Data record of all the
       --  enclosing tagged type declarations
 
+      --  Temporarily restrict this support to the .NET compiler???
+
       if not Tagged_Type_Expansion
         and then Unit (Cunit (Main_Unit)) = N
+        and then VM_Target = CLI_Target
       then
          Build_VM_TSDs (N);
       end if;

diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index d52740a659beb27e3891b8e86d8085f131e13a2c..40e0221461f7a4a4b048cdb277a63eff6c902da7 100644 (file)
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -1559,7 +1559,11 @@ package body Exp_Ch7 is
             --  In VM targets there is no need to build dispatch tables but
             --  we must generate the corresponding Type Specific Data record
 
-            elsif Unit (Cunit (Main_Unit)) = N then
+            --  Temporarily restrict this support to the .NET compiler???
+
+            elsif Unit (Cunit (Main_Unit)) = N
+              and then VM_Target = CLI_Target
+            then
                Build_VM_TSDs (N);
             end if;
          end if;
@@ -1668,7 +1672,11 @@ package body Exp_Ch7 is
          --  In VM targets there is no need to build dispatch tables but
          --  we must generate the corresponding Type Specific Data record
 
-         elsif Unit (Cunit (Main_Unit)) = N then
+         --  Temporarily restrict this support to the .NET compiler???
+
+         elsif Unit (Cunit (Main_Unit)) = N
+           and then VM_Target = CLI_Target
+         then
 
             --  Enter the scope of the package because the new declarations
             --  are appended at the end of the package and must be analyzed