fbc: g++ ABI - prepare for addition of deleting destructor

- internal changes
- rename FB_PROCATTRIB_DESTRUCTOR to FB_PROCATTRIB_DESTRUCTOR1 for the complete destructor
- add FB_PROCATTRIB_DESTRUCTOR0 for the deleting destructor
- add mangling for complete dtor (D1) and deleting dtor (D0)

Author: jayrm

src/compiler/ast-node-proc.bas

@@ -500,7 +500,7 @@ sub astProcBegin( byval sym as FBSYMBOL ptr, byval ismain as integer )
 			astNewVAR( symbGetParamVar( argv ) ) )
 
 	'' Destructor?
-	elseif( symbIsDestructor( sym ) and enable_implicit_code ) then
+	elseif( symbIsDestructor1( sym ) and enable_implicit_code ) then
 		''
 		'' If the UDT has a vptr, reset it at the top of destructors,
 		'' such that the vptr always matches the type of object that
@@ -673,7 +673,7 @@ function astProcEnd( byval callrtexit as integer ) as integer
 
 	if( res ) then
 		'' Destructor?
-		if( symbIsDestructor( sym ) and enable_implicit_code ) then
+		if( symbIsDestructor1( sym ) and enable_implicit_code ) then
 			'' Call destructors, behind the exit label, so they'll
 			'' always be called, even with early returns.
 			hCallDtors( sym )

src/compiler/error.bas

@@ -878,7 +878,7 @@ private function hMakeParamDesc _
 				pname = strptr( s )
 			'' method?
 			elseif( (proc->pattrib and (FB_PROCATTRIB_CONSTRUCTOR or _
-							FB_PROCATTRIB_DESTRUCTOR or _
+							FB_PROCATTRIB_DESTRUCTOR1 or FB_PROCATTRIB_DESTRUCTOR0 or _
 							FB_PROCATTRIB_OPERATOR)) <> 0 ) then
 				s = symbMethodToStr( proc )
 				pname = strptr( s )

src/compiler/parser-compound.bas

@@ -317,7 +317,7 @@ sub cExitStatement( )
 			if( symbGetType( parser.currproc ) = FB_DATATYPE_VOID ) then
 				if( (parser.currproc->pattrib and _
 					 (FB_PROCATTRIB_PROPERTY or FB_PROCATTRIB_OPERATOR or _
-					  FB_PROCATTRIB_CONSTRUCTOR or FB_PROCATTRIB_DESTRUCTOR)) <> 0 ) then
+					  FB_PROCATTRIB_CONSTRUCTOR or FB_PROCATTRIB_DESTRUCTOR1 or FB_PROCATTRIB_DESTRUCTOR0)) <> 0 ) then
 					errnum = FB_ERRMSG_ILLEGALOUTSIDEASUB
 				end if
 			else
@@ -328,7 +328,7 @@ sub cExitStatement( )
 			if( symbGetType( parser.currproc ) <> FB_DATATYPE_VOID ) then
 				if( (parser.currproc->pattrib and _
 					 (FB_PROCATTRIB_PROPERTY or FB_PROCATTRIB_OPERATOR or _
-					  FB_PROCATTRIB_CONSTRUCTOR or FB_PROCATTRIB_DESTRUCTOR)) <> 0 ) then
+					  FB_PROCATTRIB_CONSTRUCTOR or FB_PROCATTRIB_DESTRUCTOR1 or FB_PROCATTRIB_DESTRUCTOR0)) <> 0 ) then
 					errnum = FB_ERRMSG_ILLEGALOUTSIDEAFUNCTION
 				else
 					errnum = hCheckForCtorResult( )
@@ -357,7 +357,7 @@ sub cExitStatement( )
 			end if
 
 		case FB_TK_DESTRUCTOR
-			if( symbIsDestructor( parser.currproc ) = FALSE ) then
+			if( symbIsDestructor1( parser.currproc ) = FALSE ) then
 				errnum = FB_ERRMSG_ILLEGALOUTSIDEADTOR
 			end if
 

src/compiler/parser-proc.bas

@@ -1056,7 +1056,9 @@ function cProcHeader _
 		if( tk = FB_TK_CONSTRUCTOR ) then
 			pattrib or= FB_PROCATTRIB_CONSTRUCTOR or FB_PROCATTRIB_OVERLOADED
 		else
-			pattrib or= FB_PROCATTRIB_DESTRUCTOR
+			'' destructor defined by user source is always the complete dtor
+			'' the deleting dtor is implicitly defined later
+			pattrib or= FB_PROCATTRIB_DESTRUCTOR1
 		end if
 
 	case FB_TK_OPERATOR
@@ -1762,7 +1764,9 @@ sub cProcStmtBegin( byval attrib as FB_SYMBATTRIB, byval pattrib as FB_PROCATTRI
 		if( fbLangOptIsSet( FB_LANG_OPT_CLASS ) = FALSE ) then
 			errReportNotAllowed( FB_LANG_OPT_CLASS )
 		else
-			pattrib or= FB_PROCATTRIB_DESTRUCTOR
+			'' destructor defined by user source is always the complete dtor
+			'' the deleting dtor is implicitly defined later
+			pattrib or= FB_PROCATTRIB_DESTRUCTOR1
 		end if
 
 		hDisallowStaticAttrib( attrib, pattrib )

src/compiler/rtl-array.bas

@@ -331,7 +331,7 @@ private sub hCheckDtor _
 
 	if( dtor = NULL ) then exit sub
 
-	assert( symbIsDestructor( dtor ) )
+	assert( symbIsDestructor1( dtor ) )
 
 	if( check_access ) then
 		if( symbCheckAccess( dtor ) = FALSE ) then

src/compiler/symb-comp.bas

@@ -619,8 +619,8 @@ sub symbUdtDeclareDefaultMembers _
 
 		'' no default dtor explicitly defined?
 		if( udt->udt.ext->dtor = NULL ) then
-			'' Dtor
-			default.dtor = hDeclareProc( udt, INVALID, FB_DATATYPE_INVALID, FB_SYMBATTRIB_NONE, FB_PROCATTRIB_DESTRUCTOR )
+			'' Complete Dtor
+			default.dtor = hDeclareProc( udt, INVALID, FB_DATATYPE_INVALID, FB_SYMBATTRIB_NONE, FB_PROCATTRIB_DESTRUCTOR1 )
 
 			'' Don't allow the implicit dtor to override a FINAL dtor from the base
 			symbProcCheckOverridden( default.dtor, TRUE )
@@ -785,7 +785,7 @@ end sub
 
 sub symbSetCompDtor( byval sym as FBSYMBOL ptr, byval proc as FBSYMBOL ptr )
 	if( symbIsStruct( sym ) ) then
-		assert( symbIsDestructor( proc ) )
+		assert( symbIsDestructor1( proc ) )
 		symbUdtAllocExt( sym )
 		if( sym->udt.ext->dtor = NULL ) then
 			'' Add dtor

src/compiler/symb-mangling.bas

@@ -1278,7 +1278,9 @@ private sub hMangleProc( byval sym as FBSYMBOL ptr )
 		end if
 	elseif( symbIsConstructor( sym ) ) then
 		mangled += "C1"
-	elseif( symbIsDestructor( sym ) ) then
+	elseif( symbIsDestructor0( sym ) ) then
+		mangled += "D0"
+	elseif( symbIsDestructor1( sym ) ) then
 		mangled += "D1"
 	else
 		if( symbGetMangling( sym ) = FB_MANGLING_BASIC ) then

src/compiler/symb-proc.bas

@@ -716,7 +716,7 @@ private function hSetupProc _
 
 	'' ctor/dtor?
 	if( (pattrib and (FB_PROCATTRIB_CONSTRUCTOR or _
-					 FB_PROCATTRIB_DESTRUCTOR)) <> 0 ) then
+					 FB_PROCATTRIB_DESTRUCTOR1 or FB_PROCATTRIB_DESTRUCTOR0)) <> 0 ) then
 
 		assert( pattrib and FB_PROCATTRIB_METHOD )
 
@@ -748,7 +748,7 @@ private function hSetupProc _
 		'' otherwise, try to overload
 		else
 			'' dtor?
-			if( (pattrib and FB_PROCATTRIB_DESTRUCTOR) <> 0 ) then
+			if( (pattrib and (FB_PROCATTRIB_DESTRUCTOR1 or FB_PROCATTRIB_DESTRUCTOR0)) <> 0 ) then
 				'' can't overload
 				return NULL
 			end if
@@ -920,8 +920,8 @@ add_proc:
 		overridden = NULL
 		if( parent->udt.base ) then
 			'' Destructor?
-			if( symbIsDestructor( proc ) ) then
-				'' There can always only be one, so there is no
+			if( symbIsDestructor1( proc ) ) then
+				'' There can always only be one complete dtor, so there is no
 				'' need to do a lookup and/or overload checks.
 				overridden = symbGetCompDtor( parent->udt.base->subtype )
 			elseif( symbIsOperator( proc ) ) then
@@ -1601,7 +1601,7 @@ function symbFindCtorProc _
 	) as FBSYMBOL ptr
 
 	'' dtor? can't overload..
-	if( symbIsDestructor( ovl_head_proc ) ) then
+	if( symbIsDestructor1( ovl_head_proc ) ) then
 		return ovl_head_proc
 	else
 		return symbFindOverloadProc( ovl_head_proc, proc )
@@ -2845,7 +2845,7 @@ sub symbProcCheckOverridden _
 				'' implicit dtors and LET overloads. Since they
 				'' are not visible in the original code,
 				'' the error message must have more info.
-				if( symbIsDestructor( proc ) ) then
+				if( symbIsDestructor1( proc ) ) then
 					errmsg = FB_ERRMSG_IMPLICITDTOROVERRIDECALLCONVDIFFERS
 				else
 					errmsg = FB_ERRMSG_IMPLICITLETOVERRIDECALLCONVDIFFERS
@@ -2916,7 +2916,7 @@ end sub
 '' Append calling convention, if it differs from the default
 private sub hProcModeToStr( byref s as string, byval proc as FBSYMBOL ptr )
 	'' Ctors/Dtors currently always default to CDECL, see cProcHeader()
-	if( symbIsConstructor( proc ) or symbIsDestructor( proc ) ) then
+	if( symbIsConstructor( proc ) or symbIsDestructor1( proc ) or symbIsDestructor0( proc ) ) then
 		select case( symbGetProcMode( proc ) )
 		case FB_FUNCMODE_STDCALL, FB_FUNCMODE_STDCALL_MS
 			s += " stdcall"
@@ -3045,7 +3045,9 @@ function symbGetFullProcName( byval proc as FBSYMBOL ptr ) as zstring ptr
 
 	if( symbIsConstructor( proc ) ) then
 	 	res += "constructor"
-	elseif( symbIsDestructor( proc ) ) then
+	elseif( symbIsDestructor1( proc ) ) then
+		res += "destructor"
+	elseif( symbIsDestructor0( proc ) ) then
 		res += "destructor"
 	elseif( symbIsOperator( proc ) ) then
 		res += "operator."

src/compiler/symb.bas

@@ -2506,7 +2506,8 @@ function symbDumpToStr _
 	checkPAttrib( OVERLOADED )
 	checkPAttrib( METHOD )
 	checkPAttrib( CONSTRUCTOR )
-	checkPAttrib( DESTRUCTOR )
+	checkPAttrib( DESTRUCTOR1 )
+	checkPAttrib( DESTRUCTOR0 )
 	checkPAttrib( OPERATOR )
 	checkPAttrib( PROPERTY )
 	checkPAttrib( RETURNBYREF )

src/compiler/symb.bi

@@ -191,7 +191,7 @@ enum FB_PROCATTRIB
 	FB_PROCATTRIB_OVERLOADED       = &h00000001  '' PROCs / METHODs only
 	FB_PROCATTRIB_METHOD           = &h00000002  '' Non-STATIC UDT member procs, i.e. procs with implicit THIS ptr
 	FB_PROCATTRIB_CONSTRUCTOR      = &h00000004  '' methods only
-	FB_PROCATTRIB_DESTRUCTOR       = &h00000008  '' methods only
+	FB_PROCATTRIB_DESTRUCTOR1      = &h00000008  '' methods only
 	FB_PROCATTRIB_OPERATOR         = &h00000010  '' methods only
 	FB_PROCATTRIB_PROPERTY         = &h00000020  '' methods only
 	FB_PROCATTRIB_STATICLOCALS     = &h00000040  '' PROCs only
@@ -200,6 +200,7 @@ enum FB_PROCATTRIB
 	FB_PROCATTRIB_ABSTRACT         = &h00000200  '' methods only: pure virtuals (only)
 	FB_PROCATTRIB_NOTHISCONSTNESS  = &h00000400  '' PROCs only
 	FB_PROCATTRIB_RETURNBYREF      = &h00000800  '' PROCs (functions/function pointers returning BYREF)
+	FB_PROCATTRIB_DESTRUCTOR0      = &h00001000  '' methods only - deleting destructor
 end enum
 
 '' parameter modes
@@ -2498,7 +2499,9 @@ declare sub symbProcRecalcRealType( byval proc as FBSYMBOL ptr )
 
 #define symbIsConstructor(s) ((s->pattrib and FB_PROCATTRIB_CONSTRUCTOR) <> 0)
 
-#define symbIsDestructor(s) ((s->pattrib and FB_PROCATTRIB_DESTRUCTOR) <> 0)
+#define symbIsDestructor0(s) ((s->pattrib and FB_PROCATTRIB_DESTRUCTOR0) <> 0)
+
+#define symbIsDestructor1(s) ((s->pattrib and FB_PROCATTRIB_DESTRUCTOR1) <> 0)
 
 #define symbIsOperator(s) ((s->pattrib and FB_PROCATTRIB_OPERATOR) <> 0)