[Python-checkins] bpo-41132: Use pymalloc allocator in the f-string parser (GH-21173)

[Lysandros Nikolaou]

https://github.com/python/cpython/commit/6dcbc2422de9e2a7ff89a4689572d84001e230b2
commit: 6dcbc2422de9e2a7ff89a4689572d84001e230b2
branch: master
author: Lysandros Nikolaou <lisandrosnik at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-06-27T18:47:00+01:00
summary:

bpo-41132: Use pymalloc allocator in the f-string parser (GH-21173)

files:
M Parser/pegen.c
M Parser/string_parser.c

diff --git a/Parser/pegen.c b/Parser/pegen.c
index 79fcd2f5999de..b4216fa2beaa7 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -395,7 +395,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
         const char *fstring_msg = "f-string: ";
         Py_ssize_t len = strlen(fstring_msg) + strlen(errmsg);
 
-        char *new_errmsg = PyMem_RawMalloc(len + 1); // Lengths of both strings plus NULL character
+        char *new_errmsg = PyMem_Malloc(len + 1); // Lengths of both strings plus NULL character
         if (!new_errmsg) {
             return (void *) PyErr_NoMemory();
         }
@@ -443,7 +443,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
     Py_DECREF(errstr);
     Py_DECREF(value);
     if (p->start_rule == Py_fstring_input) {
-        PyMem_RawFree((void *)errmsg);
+        PyMem_Free((void *)errmsg);
     }
     return NULL;
 
@@ -451,7 +451,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
     Py_XDECREF(errstr);
     Py_XDECREF(error_line);
     if (p->start_rule == Py_fstring_input) {
-        PyMem_RawFree((void *)errmsg);
+        PyMem_Free((void *)errmsg);
     }
     return NULL;
 }
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index f8e2427276cd3..ed7ca7ff834f8 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -592,7 +592,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     len = expr_end - expr_start;
     /* Allocate 3 extra bytes: open paren, close paren, null byte. */
-    str = PyMem_RawMalloc(len + 3);
+    str = PyMem_Malloc(len + 3);
     if (str == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -605,7 +605,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     struct tok_state* tok = PyTokenizer_FromString(str, 1);
     if (tok == NULL) {
-        PyMem_RawFree(str);
+        PyMem_Free(str);
         return NULL;
     }
     Py_INCREF(p->tok->filename);
@@ -631,7 +631,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
     result = expr;
 
 exit:
-    PyMem_RawFree(str);
+    PyMem_Free(str);
     _PyPegen_Parser_Free(p2);
     PyTokenizer_Free(tok);
     return result;
@@ -1143,7 +1143,7 @@ ExprList_Append(ExprList *l, expr_ty exp)
             Py_ssize_t i;
             /* We're still using the cached data. Switch to
                alloc-ing. */
-            l->p = PyMem_RawMalloc(sizeof(expr_ty) * new_size);
+            l->p = PyMem_Malloc(sizeof(expr_ty) * new_size);
             if (!l->p) {
                 return -1;
             }
@@ -1153,9 +1153,9 @@ ExprList_Append(ExprList *l, expr_ty exp)
             }
         } else {
             /* Just realloc. */
-            expr_ty *tmp = PyMem_RawRealloc(l->p, sizeof(expr_ty) * new_size);
+            expr_ty *tmp = PyMem_Realloc(l->p, sizeof(expr_ty) * new_size);
             if (!tmp) {
-                PyMem_RawFree(l->p);
+                PyMem_Free(l->p);
                 l->p = NULL;
                 return -1;
             }
@@ -1183,7 +1183,7 @@ ExprList_Dealloc(ExprList *l)
         /* Do nothing. */
     } else {
         /* We have dynamically allocated. Free the memory. */
-        PyMem_RawFree(l->p);
+        PyMem_Free(l->p);
     }
     l->p = NULL;
     l->size = -1;