@@ -2849,7 +2849,7 @@ package body Sem_Type is
return False;
else
- return In_Generic_Actual (Parent (Par));
+ return In_Generic_Actual (Par);
end if;
end In_Generic_Actual;
@@ -26689,7 +26689,7 @@ package body Sem_Util is
return;
-- In an instance, there is an ongoing problem with completion of
- -- type derived from private types. Their structure is what Gigi
+ -- types derived from private types. Their structure is what Gigi
-- expects, but the Etype is the parent type rather than the
-- derived private type itself. Do not flag error in this case. The
-- private completion is an entity without a parent, like an Itype.
@@ -26700,7 +26700,17 @@ package body Sem_Util is
-- same reason: inserted body may be outside of the original package
-- and only partial views are visible at the point of insertion.
- elsif In_Instance or else In_Inlined_Body then
+ -- If In_Generic_Actual (Expr) is True then we cannot assume that
+ -- the successful semantic analysis of the generic guarantees anything
+ -- useful about type checking of this instance, so we ignore
+ -- In_Instance in that case. There may be cases where this is not
+ -- right (the symptom would probably be rejecting something
+ -- that ought to be accepted) but we don't currently have any
+ -- concrete examples of this.
+
+ elsif (In_Instance and then not In_Generic_Actual (Expr))
+ or else In_Inlined_Body
+ then
if Etype (Etype (Expr)) = Etype (Expected_Type)
and then
(Has_Private_Declaration (Expected_Type)
Sem_Util.Wrong_Type usually emits an error message, but in some cases it does not. The code which prevents emitting an error message was going too far in some cases, causing illegal constructs to be accepted. For example, a qualified expression such as Integer'(null) might be passed in as an actual parameter in an instantiation of a generic and generate no error message. Running this command: gcc -c inst.ads On the following sources: package Inst is type Ptr is new Integer; generic type TElement is private; NonDefini : TElement; package ArbMgr is end ArbMgr; package Pack is new ArbMgr (Ptr, Ptr'(null)); procedure Dummy; end Inst; Should produce the following output: inst.ads:10:42: expected type "Ptr" defined at line 2 inst.ads:10:42: found an access type compilation abandoned due to previous error Tested on x86_64-pc-linux-gnu, committed on trunk 2019-09-17 Steve Baird <baird@adacore.com> gcc/ada/ * sem_util.adb (Wrong_Type): In deciding to suppress a message, it is not enough for In_Instance to be True; in addition, In_Generic_Actual (Expr) must be False. * sem_type.adb (In_Generic_Actual): Fix bug where traversal of parents skips every other node.