aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/sem_util.adb20
1 files changed, 18 insertions, 2 deletions
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 3fd3eb4..3a64047d 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;