bpo-33270: Intern names for all anonymous code objects (#6472)

ZackerySpytz · serhiy-storchaka · commit f303639e3ac9 · 2018-04-16T01:12:29.000+03:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-14-13-12-50.bpo-33270.UmVV6i.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-14-13-12-50.bpo-33270.UmVV6i.rst
@@ -0,0 +1 @@
+Intern the names for all anonymous code objects.  Patch by Zackery Spytz.
diff --git a/Python/compile.c b/Python/compile.c
@@ -4145,7 +4145,7 @@ compiler_genexp(struct compiler *c, expr_ty e)
 {
     static identifier name;
     if (!name) {
-        name = PyUnicode_FromString("<genexpr>");
+        name = PyUnicode_InternFromString("<genexpr>");
         if (!name)
             return 0;
     }
@@ -4160,7 +4160,7 @@ compiler_listcomp(struct compiler *c, expr_ty e)
 {
     static identifier name;
     if (!name) {
-        name = PyUnicode_FromString("<listcomp>");
+        name = PyUnicode_InternFromString("<listcomp>");
         if (!name)
             return 0;
     }
@@ -4175,7 +4175,7 @@ compiler_setcomp(struct compiler *c, expr_ty e)
 {
     static identifier name;
     if (!name) {
-        name = PyUnicode_FromString("<setcomp>");
+        name = PyUnicode_InternFromString("<setcomp>");
         if (!name)
             return 0;
     }
@@ -4191,7 +4191,7 @@ compiler_dictcomp(struct compiler *c, expr_ty e)
 {
     static identifier name;
     if (!name) {
-        name = PyUnicode_FromString("<dictcomp>");
+        name = PyUnicode_InternFromString("<dictcomp>");
         if (!name)
             return 0;
     }
diff --git a/Python/importlib.h b/Python/importlib.h
@@ -561,7 +561,7 @@ const unsigned char _Py_M__importlib[] = {
     1,100,0,107,9,86,0,1,0,113,2,100,0,83,0,41,
     1,78,114,10,0,0,0,41,2,90,2,46,48,90,3,97,
     114,103,114,10,0,0,0,114,10,0,0,0,114,11,0,0,
-    0,250,9,60,103,101,110,101,120,112,114,62,65,1,0,0,
+    0,218,9,60,103,101,110,101,120,112,114,62,65,1,0,0,
     115,2,0,0,0,4,0,122,45,95,105,110,115,116,97,108,
     108,101,100,95,115,97,102,101,108,121,46,95,95,101,120,105,
     116,95,95,46,60,108,111,99,97,108,115,62,46,60,103,101,
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
@@ -132,7 +132,7 @@ const unsigned char _Py_M__importlib_external[] = {
     116,114,105,112,218,15,112,97,116,104,95,115,101,112,97,114,
     97,116,111,114,115,41,2,218,2,46,48,218,4,112,97,114,
     116,114,2,0,0,0,114,2,0,0,0,114,4,0,0,0,
-    250,10,60,108,105,115,116,99,111,109,112,62,58,0,0,0,
+    218,10,60,108,105,115,116,99,111,109,112,62,58,0,0,0,
     115,2,0,0,0,6,1,122,30,95,112,97,116,104,95,106,
     111,105,110,46,60,108,111,99,97,108,115,62,46,60,108,105,
     115,116,99,111,109,112,62,41,2,218,8,112,97,116,104,95,
@@ -1678,7 +1678,7 @@ const unsigned char _Py_M__importlib_external[] = {
     2,86,0,1,0,113,2,100,1,83,0,41,2,114,186,0,
     0,0,78,114,2,0,0,0,41,2,114,22,0,0,0,218,
     6,115,117,102,102,105,120,41,1,218,9,102,105,108,101,95,
-    110,97,109,101,114,2,0,0,0,114,4,0,0,0,250,9,
+    110,97,109,101,114,2,0,0,0,114,4,0,0,0,218,9,
     60,103,101,110,101,120,112,114,62,33,4,0,0,115,2,0,
     0,0,4,1,122,49,69,120,116,101,110,115,105,111,110,70,
     105,108,101,76,111,97,100,101,114,46,105,115,95,112,97,99,
@@ -2350,7 +2350,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,104,0,124,0,93,12,125,1,124,1,160,0,161,0,146,
     2,113,4,83,0,114,2,0,0,0,41,1,114,90,0,0,
     0,41,2,114,22,0,0,0,90,2,102,110,114,2,0,0,
-    0,114,2,0,0,0,114,4,0,0,0,250,9,60,115,101,
+    0,114,2,0,0,0,114,4,0,0,0,218,9,60,115,101,
     116,99,111,109,112,62,153,5,0,0,115,2,0,0,0,6,
     0,122,41,70,105,108,101,70,105,110,100,101,114,46,95,102,
     105,108,108,95,99,97,99,104,101,46,60,108,111,99,97,108,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Intern the names for all anonymous code objects. Patch by Zackery Spytz.`
Original file line number	Diff line number	Diff line change
`@@ -4145,7 +4145,7 @@ compiler_genexp(struct compiler *c, expr_ty e)`
`4145`	`4145`	`{`
`4146`	`4146`	`static identifier name;`
`4147`	`4147`	`if (!name) {`
`4148`		`- name = PyUnicode_FromString("<genexpr>");`
	`4148`	`+ name = PyUnicode_InternFromString("<genexpr>");`
`4149`	`4149`	`if (!name)`
`4150`	`4150`	`return 0;`
`4151`	`4151`	`}`
`@@ -4160,7 +4160,7 @@ compiler_listcomp(struct compiler *c, expr_ty e)`
`4160`	`4160`	`{`
`4161`	`4161`	`static identifier name;`
`4162`	`4162`	`if (!name) {`
`4163`		`- name = PyUnicode_FromString("<listcomp>");`
	`4163`	`+ name = PyUnicode_InternFromString("<listcomp>");`
`4164`	`4164`	`if (!name)`
`4165`	`4165`	`return 0;`
`4166`	`4166`	`}`
`@@ -4175,7 +4175,7 @@ compiler_setcomp(struct compiler *c, expr_ty e)`
`4175`	`4175`	`{`
`4176`	`4176`	`static identifier name;`
`4177`	`4177`	`if (!name) {`
`4178`		`- name = PyUnicode_FromString("<setcomp>");`
	`4178`	`+ name = PyUnicode_InternFromString("<setcomp>");`
`4179`	`4179`	`if (!name)`
`4180`	`4180`	`return 0;`
`4181`	`4181`	`}`
`@@ -4191,7 +4191,7 @@ compiler_dictcomp(struct compiler *c, expr_ty e)`
`4191`	`4191`	`{`
`4192`	`4192`	`static identifier name;`
`4193`	`4193`	`if (!name) {`
`4194`		`- name = PyUnicode_FromString("<dictcomp>");`
	`4194`	`+ name = PyUnicode_InternFromString("<dictcomp>");`
`4195`	`4195`	`if (!name)`
`4196`	`4196`	`return 0;`
`4197`	`4197`	`}`