Fix crash running TaskTester

rdb · rdb · commit ba919b0948ce · 2016-06-11T01:11:03.000+02:00
diff --git a/dtool/src/interrogate/interfaceMaker.cxx b/dtool/src/interrogate/interfaceMaker.cxx
@@ -145,7 +145,8 @@ check_protocols() {
     if (func->_ifunc.get_name() == "__traverse__") {
       // If we have a method named __traverse__, we implement Python's
       // cyclic garbage collection protocol.
-      _protocol_types |= PT_python_gc;
+      //XXX disabled for now because it's too unstable.
+      //_protocol_types |= PT_python_gc;
     }
   }
 
diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
@@ -2730,10 +2730,9 @@ write_module_class(ostream &out, Object *obj) {
   }
 
   string gcflag;
-  // Disabled for now because it's too unstable.
-  /*if (obj->_protocol_types & Object::PT_python_gc) {
+  if (obj->_protocol_types & Object::PT_python_gc) {
     gcflag = " | Py_TPFLAGS_HAVE_GC";
-  }*/
+  }
 
   // long tp_flags;
   if (has_local_getbuffer) {
@@ -2759,10 +2758,12 @@ write_module_class(ostream &out, Object *obj) {
   }
 
   // traverseproc tp_traverse;
-  write_function_slot(out, 4, slots, "tp_traverse");
+  out << "    0, // tp_traverse\n";
+  //write_function_slot(out, 4, slots, "tp_traverse");
 
   // inquiry tp_clear;
-  write_function_slot(out, 4, slots, "tp_clear");
+  out << "    0, // tp_clear\n";
+  //write_function_slot(out, 4, slots, "tp_clear");
 
   // richcmpfunc tp_richcompare;
   if (has_local_richcompare) {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ check_protocols() {`
`145`	`145`	`if (func->_ifunc.get_name() == "__traverse__") {`
`146`	`146`	`// If we have a method named __traverse__, we implement Python's`
`147`	`147`	`// cyclic garbage collection protocol.`
`148`		`- _protocol_types \|= PT_python_gc;`
	`148`	`+ //XXX disabled for now because it's too unstable.`
	`149`	`+ //_protocol_types \|= PT_python_gc;`
`149`	`150`	`}`
`150`	`151`	`}`
`151`	`152`