UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #100 from alliedmodders/delete-crash

Browse Source 
Mark usage correctly when invoking special natives.
This commit is contained in:
David Anderson 2014-07-17 22:38:25 -07:00
commit 8436a3ea6c
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sourcepawn/compiler/sc1.c
View File

@ -4214,7 +4214,10 @@ static void dodelete()
{ {
pushval(1); pushval(1);
ffcall(map->dtor->target, NULL, 1); ffcall(map->dtor->target, NULL, 1);
markusage(map->dtor->target, uREAD);
// Only mark usage if we're not skipping codegen.
if (sc_status != statSKIP)
markusage(map->dtor->target, uREAD);
} }
if (zap) { if (zap) {

8
sourcepawn/compiler/sc4.c
View File

@ -1415,7 +1415,9 @@ SC_FUNC void invoke_getter(methodmap_method_t *method)
pushreg(sPRI); pushreg(sPRI);
pushval(1); pushval(1);
ffcall(method->getter, NULL, 1); ffcall(method->getter, NULL, 1);
markusage(method->getter, uREAD);
if (sc_status != statSKIP)
markusage(method->getter, uREAD);
} }
SC_FUNC void invoke_setter(methodmap_method_t *method, int save) SC_FUNC void invoke_setter(methodmap_method_t *method, int save)
@ -1433,5 +1435,7 @@ SC_FUNC void invoke_setter(methodmap_method_t *method, int save)
ffcall(method->setter, NULL, 2); ffcall(method->setter, NULL, 2);
if (save) if (save)
popreg(sPRI); popreg(sPRI);
markusage(method->setter, uREAD);
if (sc_status != statSKIP)
markusage(method->setter, uREAD);
} }

12
sourcepawn/compiler/tests/ok-reparse-delete.sp Normal file
View File

@ -0,0 +1,12 @@
methodmap Handle {
public native ~Handle();
}
stock Crab(Handle h)
{
delete h;
}
public main()
{
}