diff mbox series

[COMMITTED] ada: Crash on C++ constructor of private type

Message ID 20230615080355.938913-1-poulhies@adacore.com
State Committed
Commit 63c8e3a136860f967ba29ba64ef261f94ceb6fc8
Headers
Series [COMMITTED] ada: Crash on C++ constructor of private type |

Commit Message

Marc Poulhiès June 15, 2023, 8:03 a.m. UTC 
  From: Javier Miranda <miranda@adacore.com>

The compiler crashes compiling a function that has pragma
CPP_constructor when its return type is a private type.

gcc/ada/

	* sem_util.adb
	(Is_CPP_Constructor_Call): Add missing support for calls to
	functions returning a private type.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/sem_util.adb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 3fd3eb45f33..3a64047d45c 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -16153,9 +16153,25 @@  package body Sem_Util is
    -----------------------------
 
    function Is_CPP_Constructor_Call (N : Node_Id) return Boolean is
+      Ret_Typ : Entity_Id;
+
    begin
-      return Nkind (N) = N_Function_Call
-        and then Is_CPP_Class (Etype (Etype (N)))
+      if Nkind (N) /= N_Function_Call then
+         return False;
+      end if;
+
+      Ret_Typ := Base_Type (Etype (N));
+
+      if Is_Class_Wide_Type (Ret_Typ) then
+         Ret_Typ := Root_Type (Ret_Typ);
+      end if;
+
+      if Is_Private_Type (Ret_Typ) then
+         Ret_Typ := Underlying_Type (Ret_Typ);
+      end if;
+
+      return Present (Ret_Typ)
+        and then Is_CPP_Class (Ret_Typ)
         and then Is_Constructor (Entity (Name (N)))
         and then Is_Imported (Entity (Name (N)));
    end Is_CPP_Constructor_Call;