qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct the emission of meta class ivars. 

type_obj_class is no longer a class, so its ivars are not stored in
type_obj_class.t.class->ivars but rather type_obj_class.t.symtab.

This fixes the segfault Spirit and Randy were experiencing.

In passing, correct the unneeded emission of meta class ivars for non-root
classes. This should make for much smaller progs that use classes.
This commit is contained in:
Bill Currie 2013-01-30 18:05:07 +09:00
parent 831f84a47b
commit 6a3c775270
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/qfcc/source/class.c
View File

@ -642,8 +642,15 @@ begin_class (class_t *class)
EMIT_STRING (space, meta->name, class->name); EMIT_STRING (space, meta->name, class->name);
meta->info = _PR_CLS_META; meta->info = _PR_CLS_META;
meta->instance_size = type_size (&type_obj_class); meta->instance_size = type_size (&type_obj_class);
EMIT_DEF (space, meta->ivars, if (!class->super_class) {
emit_ivars (type_obj_class.t.class->ivars, "Class")); // The ivars list for the meta class struct get emitted only for the
// root class of the hierachy.
// NOTE: type_obj_class is not actually a class
EMIT_DEF (space, meta->ivars,
emit_ivars (type_obj_class.t.symtab, "Class"));
} else {
meta->ivars = 0;
}
current_class = &class->class_type; current_class = &class->class_type;
sym = class_symbol (current_class, 0); sym = class_symbol (current_class, 0);
class->def = def = sym->s.def; class->def = def = sym->s.def;