From: Arnaud Charlet <charlet@adacore.com>
Date: Thu, 10 Oct 2019 15:25:32 +0000 (+0000)
Subject: [Ada] Ensure constructor is a C++ constructor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebeabe0454975d7600af111a9461a85e75863641;p=gcc.git

[Ada] Ensure constructor is a C++ constructor

2019-10-10  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* freeze.adb (Freeze_Subprogram): Ensure constructor is a C++
	constructor.

From-SVN: r276835
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a0084fa9431..b17b60829d7 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,4 @@
-2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+2019-10-10  Arnaud Charlet  <charlet@adacore.com>
 
-	* libgnat/a-ststio.ads (File_Type): Apply pragma
-	Preelaborable_Initialization to the type.
\ No newline at end of file
+	* freeze.adb (Freeze_Subprogram): Ensure constructor is a C++
+	constructor.
\ No newline at end of file
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 93e91b2a9ba..5e1b77511c6 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -8780,6 +8780,7 @@ package body Freeze is
       --  (either in pragma CPP_Constructor or in a pragma import).
 
       if Is_Constructor (E)
+        and then Convention (E) = Convention_CPP
         and then
            (No (Interface_Name (E))
               or else String_Equal