From b3b28b0cd6d53af39cc2dec4d7b6d89d027127a3 Mon Sep 17 00:00:00 2001 From: Javier Miranda Date: Tue, 2 Aug 2011 14:42:28 +0000 Subject: [PATCH] exp_ch6.adb (Expand_N_Subprogram_Body): Temporarily restrict the generation of TSDs to the DOTNET compiler. 2011-08-02 Javier Miranda * 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 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/exp_ch6.adb | 3 +++ gcc/ada/exp_ch7.adb | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e401f48668d..f980c7321af 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2011-08-02 Javier Miranda + + * 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 * 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 aa8775c3dbf..cb4b6c853d8 100644 --- 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 d52740a659b..40e0221461f 100644 --- 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 -- 2.30.2