Commitfb202af

authored

gh-99606: Make code generated for an empty f-string identical to that of a normal empty string (#112407)

1 parent418d585 commitfb202afCopy full SHA for fb202af

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`# Unicode identifiers in tests is allowed by PEP 3131.`
`9`	`9`
`10`	`10`	`importast`
	`11`	`+importdis`
`11`	`12`	`importos`
`12`	`13`	`importre`
`13`	`14`	`importtypes`
`@@ -1738,5 +1739,14 @@ def test_syntax_warning_infinite_recursion_in_file(self):`
`1738`	`1739`	`self.assertIn(rb'\1',stdout)`
`1739`	`1740`	`self.assertEqual(len(stderr.strip().splitlines()),2)`
`1740`	`1741`
	`1742`	`+deftest_fstring_without_formatting_bytecode(self):`
	`1743`	`+# f-string without any formatting should emit the same bytecode`
	`1744`	`+# as a normal string. See gh-99606.`
	`1745`	`+defget_code(s):`
	`1746`	`+return [(i.opname,i.oparg)foriindis.get_instructions(s)]`
	`1747`	`+`
	`1748`	`+forsin ["","some string"]:`
	`1749`	`+self.assertEqual(get_code(f"'{s}'"),get_code(f"f'{s}'"))`
	`1750`	`+`
`1741`	`1751`	`if__name__=='__main__':`
`1742`	`1752`	`unittest.main()`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Make code generated for an empty f-string identical to the code of an empty`
	`2`	`+normal string.`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5042,8 +5042,12 @@ compiler_joined_str(struct compiler *c, expr_ty e)`
`5042`	`5042`	`}`
`5043`	`5043`	`else {`
`5044`	`5044`	`VISIT_SEQ(c,expr,e->v.JoinedStr.values);`
`5045`		`-if (asdl_seq_LEN(e->v.JoinedStr.values)!=1) {`
`5046`		`-ADDOP_I(c,loc,BUILD_STRING,asdl_seq_LEN(e->v.JoinedStr.values));`
	`5045`	`+if (value_count>1) {`
	`5046`	`+ADDOP_I(c,loc,BUILD_STRING,value_count);`
	`5047`	`+ }`
	`5048`	`+elseif (value_count==0) {`
	`5049`	`+_Py_DECLARE_STR(empty,"");`
	`5050`	`+ADDOP_LOAD_CONST_NEW(c,loc,Py_NewRef(&_Py_STR(empty)));`
`5047`	`5051`	`}`
`5048`	`5052`	`}`
`5049`	`5053`	`returnSUCCESS;`

Comments

(0)