@@ -23,7 +23,8 @@ typedef struct _pycontexttokenobject PyContextToken;
 
 
 PyAPI_FUNC(PyContext *) PyContext_New(void);
-PyAPI_FUNC(PyContext *) PyContext_Copy(void);
+PyAPI_FUNC(PyContext *) PyContext_Copy(PyContext *);
+PyAPI_FUNC(PyContext *) PyContext_CopyCurrent(void);
 
 PyAPI_FUNC(int) PyContext_Enter(PyContext *);
 PyAPI_FUNC(int) PyContext_Exit(PyContext *);
 
@@ -16,7 +16,7 @@ static PyObject *
 _contextvars_copy_context_impl(PyObject *module)
 /*[clinic end generated code: output=1fcd5da7225c4fa9 input=89bb9ae485888440]*/
 {
-    return (PyObject *)PyContext_Copy();
+    return (PyObject *)PyContext_CopyCurrent();
 }
 
 
 
@@ -30,9 +30,6 @@ context_new_from_vars(PyHamtObject *vars);
 static inline PyContext *
 context_get(void);
 
-static inline PyContext *
-context_copy(void);
-
 static PyContextToken *
 token_new(PyContext *ctx, PyContextVar *var, PyObject *val);
 
@@ -61,9 +58,21 @@ PyContext_New(void)
 
 
 PyContext *
-PyContext_Copy(void)
+PyContext_Copy(PyContext * ctx)
+{
+    return context_new_from_vars(ctx->ctx_vars);
+}
+
+
+PyContext *
+PyContext_CopyCurrent(void)
 {
-    return context_copy();
+    PyContext *ctx = context_get();
+    if (ctx == NULL) {
+        return NULL;
+    }
+
+    return context_new_from_vars(ctx->ctx_vars);
 }
 
 
@@ -341,17 +350,6 @@ context_get(void)
     return current_ctx;
 }
 
-static inline PyContext *
-context_copy(void)
-{
-    PyContext *ctx = context_get();
-    if (ctx == NULL) {
-        return NULL;
-    }
-
-    return context_new_from_vars(ctx->ctx_vars);
-}
-
 static int
 context_check_key_type(PyObject *key)
 {
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ static PyObject *`
`16`	`16`	`_contextvars_copy_context_impl(PyObject *module)`
`17`	`17`	`/[clinic end generated code: output=1fcd5da7225c4fa9 input=89bb9ae485888440]/`
`18`	`18`	`{`
`19`		`- return (PyObject *)PyContext_Copy();`
	`19`	`+ return (PyObject *)PyContext_CopyCurrent();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`