NotificationsYou must be signed in to change notification settings
Fork750
Star5.1k

Commitc1e5622

committed

It was incorrect to callPyType_Ready on a type returned byPyType.tp_new. It should have not been allowed in the first place, but we accidentally clearedReady fromtp_flags. Instead, we will extendtp_flags and callPyType_Modified at the end of CLR MetaType.tp_new

1 parentea61b03 commitc1e5622Copy full SHA for c1e5622

File tree

1 file changed

-3

lines changed

src/runtime
- metatype.cs

1 file changed

-3

lines changed

`‎src/runtime/metatype.cs`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,9 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)`
`145`	`145`	`returnIntPtr.Zero;`
`146`	`146`	`}`
`147`	`147`
`148`		`-varflags=TypeFlags.Default;`
	`148`	`+varflags=(TypeFlags)Util.ReadCLong(type,TypeOffset.tp_flags);`
	`149`	`+if(!flags.HasFlag(TypeFlags.Ready))`
	`150`	`+thrownewNotSupportedException("PyType.tp_new returned an incomplete type");`
`149`	`151`	`flags\|=TypeFlags.HasClrInstance;`
`150`	`152`	`flags\|=TypeFlags.HeapType;`
`151`	`153`	`flags\|=TypeFlags.BaseType;`
`@@ -170,8 +172,7 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)`
`170`	`172`	`IntPtrgc=Marshal.ReadIntPtr(base_type,Offsets.tp_clr_inst);`
`171`	`173`	`Marshal.WriteIntPtr(type,Offsets.tp_clr_inst,gc);`
`172`	`174`
`173`		`-if(Runtime.PyType_Ready(type)!=0)`
`174`		`-throwPythonException.ThrowLastAsClrException();`
	`175`	`+Runtime.PyType_Modified(newBorrowedReference(type));`
`175`	`176`
`176`	`177`	`returntype;`
`177`	`178`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc1e5622

File tree

1 file changed

1 file changed

`‎src/runtime/metatype.cs`

0 commit comments