From: Javier Miranda <miranda@adacore.com>
Date: Mon, 22 Jul 2019 13:56:36 +0000 (+0000)
Subject: [Ada] Crash in C++ constructor without external and link name
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2fdc20b65c2f3409591aeea810001a29ff1d6739;p=gcc.git

[Ada] Crash in C++ constructor without external and link name

The compiler blows up processing the declaration of a tagged type
variable that has a C++ constructor without external or link name. After
this patch the frontend reports an error.

2019-07-22  Javier Miranda  <miranda@adacore.com>

gcc/ada/

	* freeze.adb (Freeze_Subprogram): Check that C++ constructors
	must have external or link name.

gcc/testsuite/

	* gnat.dg/cpp_constructor2.adb: New testcase.

From-SVN: r273670
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c42164b0042..5cb3ab499e5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* freeze.adb (Freeze_Subprogram): Check that C++ constructors
+	must have external or link name.
+
 2019-07-22  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_res.adb (Resolve_Selected_Component): If the prefix has a
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index b29ff6705d7..728eaf2789f 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -62,6 +62,7 @@ with Sem_Util;  use Sem_Util;
 with Sinfo;     use Sinfo;
 with Snames;    use Snames;
 with Stand;     use Stand;
+with Stringt;   use Stringt;
 with Targparm;  use Targparm;
 with Tbuild;    use Tbuild;
 with Ttypes;    use Ttypes;
@@ -8766,6 +8767,20 @@ package body Freeze is
          Set_Is_Pure (E, False);
       end if;
 
+      --  For C++ constructors check that their external name has been given
+      --  (either in pragma CPP_Constructor or in a pragma import).
+
+      if Is_Constructor (E)
+        and then
+           (No (Interface_Name (E))
+              or else String_Equal
+                        (L => Strval (Interface_Name (E)),
+                         R => Strval (Get_Default_External_Name (E))))
+      then
+         Error_Msg_N
+           ("'C++ constructor must have external name or link name", E);
+      end if;
+
       --  We also reset the Pure indication on a subprogram with an Address
       --  parameter, because the parameter may be used as a pointer and the
       --  referenced data may change even if the address value does not.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f8372bae481..2fa30eb58dd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/cpp_constructor2.adb: New testcase.
+
 2019-07-22  Ed Schonberg  <schonberg@adacore.com>
 
 	* gnat.dg/warn22.adb: New testcase.
diff --git a/gcc/testsuite/gnat.dg/cpp_constructor2.adb b/gcc/testsuite/gnat.dg/cpp_constructor2.adb
new file mode 100644
index 00000000000..3b245b03aef
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/cpp_constructor2.adb
@@ -0,0 +1,19 @@
+--  { dg-do compile }
+
+procedure CPP_Constructor2 is
+
+   package P is
+      type X is tagged limited record
+         A, B, C, D : Integer;
+      end record;
+      pragma Import (Cpp, X);
+
+      procedure F1 (V : X);
+      pragma Import (Cpp, F1);
+
+      function F2 return X; --  { dg-error "C\\+\\+ constructor must have external name or link name" }
+      pragma Cpp_Constructor (F2);
+   end P;
+begin
+  null;
+end CPP_Constructor2;