Commit71009cb

authored

GH-131798: Narrow the result type of _BINARY_OP_SUBSCR_STR_INT to str in the JIT (GH-132153)

1 parent933c665 commit71009cbCopy full SHA for 71009cb

File tree

+27

-1

lines changed

+27

-1

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1646,6 +1646,26 @@ def f(n):`
`1646`	`1646`	`self.assertIn("_TO_BOOL_STR",uops)`
`1647`	`1647`	`self.assertNotIn("_GUARD_TOS_UNICODE",uops)`
`1648`	`1648`
	`1649`	`+deftest_binary_subcsr_str_int_narrows_to_str(self):`
	`1650`	`+deftestfunc(n):`
	`1651`	`+x= []`
	`1652`	`+s="foo"`
	`1653`	`+for_inrange(n):`
	`1654`	`+y=s[0]# _BINARY_OP_SUBSCR_STR_INT`
	`1655`	`+z="bar"+y# (_GUARD_TOS_UNICODE) + _BINARY_OP_ADD_UNICODE`
	`1656`	`+x.append(z)`
	`1657`	`+returnx`
	`1658`	`+`
	`1659`	`+res,ex=self._run_with_optimizer(testfunc,TIER2_THRESHOLD)`
	`1660`	`+self.assertEqual(res, ["barf"]*TIER2_THRESHOLD)`
	`1661`	`+self.assertIsNotNone(ex)`
	`1662`	`+uops=get_opnames(ex)`
	`1663`	`+self.assertIn("_BINARY_OP_SUBSCR_STR_INT",uops)`
	`1664`	`+# _BINARY_OP_SUBSCR_STR_INT narrows the result to 'str' so`
	`1665`	`+# the unicode guard before _BINARY_OP_ADD_UNICODE is removed.`
	`1666`	`+self.assertNotIn("_GUARD_TOS_UNICODE",uops)`
	`1667`	`+self.assertIn("_BINARY_OP_ADD_UNICODE",uops)`
	`1668`	`+`
`1649`	`1669`
`1650`	`1670`	`defglobal_identity(x):`
`1651`	`1671`	`returnx`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Allow the JIT to remove unicode guards after ``_BINARY_OP_SUBSCR_STR_INT``
	`2`	`+by setting the return type to string.`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,10 @@ dummy_func(void) {`
`366`	`366`	`ctx->done= true;`
`367`	`367`	`}`
`368`	`368`
	`369`	`+op(_BINARY_OP_SUBSCR_STR_INT, (left,right--res)) {`
	`370`	`+res=sym_new_type(ctx,&PyUnicode_Type);`
	`371`	`+ }`
	`372`	`+`
`369`	`373`	`op(_TO_BOOL, (value--res)) {`
`370`	`374`	`intalready_bool=optimize_to_bool(this_instr,ctx,value,&res);`
`371`	`375`	`if (!already_bool) {`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Comments

(0)