Commit08b4798

committed

Define slots before initialization

1 parent6e56a42 commit08b4798Copy full SHA for 08b4798

File tree

+14

-10

lines changed

+14

-10

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ private static StolenReference FromSpec(TypeSpec spec, PyTuple? bases = null)`
`155`	`155`	`usingvarnativeSpec=newNativeTypeSpec(spec);`
`156`	`156`	`varbasesRef=basesisnull?default:bases.Reference;`
`157`	`157`	`varresult=Runtime.PyType_FromSpecWithBases(innativeSpec,basesRef);`
	`158`	`+// Runtime.PyErr_Print();`
`158`	`159`	`returnresult.StealOrThrow();`
`159`	`160`	`}`
`160`	`161`	`}`

Lines changed: 13 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -475,17 +475,20 @@ internal static PyType CreateMetatypeWithGCHandleOffset()`
`475`	`475`	`intsize=Util.ReadInt32(Runtime.PyTypeType,TypeOffset.tp_basicsize)`
`476`	`476`	`+IntPtr.Size// tp_clr_inst_offset`
`477`	`477`	`;`
`478`		`-varresult=newPyType(newTypeSpec("clr._internal.GCOffsetBase",basicSize:size,`
`479`		`-newTypeSpec.Slot[]`
`480`		`-{`
`481`		`-`
`482`		`-},`
`483`		`-TypeFlags.Default\|TypeFlags.HeapType\|TypeFlags.HaveGC),`
`484`		`-bases:newPyTuple(new[]{py_type}));`
`485`	`478`
`486`		`-SetRequiredSlots(result,seen:newHashSet<string>());`
`487`		`-`
`488`		`-Runtime.PyType_Modified(result);`
	`479`	`+varslots=new[]{`
	`480`	`+newTypeSpec.Slot(TypeSlotID.tp_traverse,subtype_traverse),`
	`481`	`+newTypeSpec.Slot(TypeSlotID.tp_clear,subtype_clear)`
	`482`	`+};`
	`483`	`+varresult=newPyType(`
	`484`	`+newTypeSpec(`
	`485`	`+"clr._internal.GCOffsetBase",`
	`486`	`+basicSize:size,`
	`487`	`+slots:slots,`
	`488`	`+TypeFlags.Default\|TypeFlags.HeapType\|TypeFlags.HaveGC`
	`489`	`+),`
	`490`	`+bases:newPyTuple(new[]{py_type})`
	`491`	`+);`
`489`	`492`
`490`	`493`	`returnresult;`
`491`	`494`	`}`

Comments

(0)