From efbf5eaa01649749fc7f8adee03b63db407ec2a3 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Wed, 21 Sep 2022 21:25:30 +0200 Subject: [PATCH] Fix loading of ObjC protocol type after c8fee69345 That type lives in the objcbase unit, not in the system unit Resolves #39914 --- compiler/symdef.pas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 8216a33d16..6df5ed1478 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -7806,10 +7806,6 @@ implementation else if (objname^='IDISPATCH') then interface_idispatch:=self; - if (childof=nil) and - (objecttype=odt_objcclass) and - (objname^='PROTOCOL') then - objc_protocoltype:=self; if (objecttype=odt_javaclass) and not(oo_is_formal in objectoptions) then begin @@ -7835,6 +7831,10 @@ implementation java_procvarbase:=self; end; end; + if (childof=nil) and + (objecttype=odt_objcclass) and + (objname^='PROTOCOL') then + objc_protocoltype:=self; writing_class_record_dbginfo:=false; end;