Commit 31b1c23a authored by Marius Wachtler's avatar Marius Wachtler

Fix some issues found during a search for another bug

parent 7d9da5ef
...@@ -1058,7 +1058,7 @@ private: ...@@ -1058,7 +1058,7 @@ private:
AST_List* rtn = new AST_List(); AST_List* rtn = new AST_List();
rtn->lineno = node->lineno; rtn->lineno = node->lineno;
rtn->col_offset = node->col_offset; rtn->col_offset = node->col_offset;
rtn->ctx_type == node->ctx_type; rtn->ctx_type = node->ctx_type;
for (auto elt : node->elts) { for (auto elt : node->elts) {
rtn->elts.push_back(remapExpr(elt)); rtn->elts.push_back(remapExpr(elt));
...@@ -1104,7 +1104,7 @@ private: ...@@ -1104,7 +1104,7 @@ private:
AST_Tuple* rtn = new AST_Tuple(); AST_Tuple* rtn = new AST_Tuple();
rtn->lineno = node->lineno; rtn->lineno = node->lineno;
rtn->col_offset = node->col_offset; rtn->col_offset = node->col_offset;
rtn->ctx_type == node->ctx_type; rtn->ctx_type = node->ctx_type;
for (auto elt : node->elts) { for (auto elt : node->elts) {
rtn->elts.push_back(remapExpr(elt)); rtn->elts.push_back(remapExpr(elt));
......
...@@ -1490,7 +1490,7 @@ Box* BoxedCApiFunction::tppCall(Box* _self, CallRewriteArgs* rewrite_args, ArgPa ...@@ -1490,7 +1490,7 @@ Box* BoxedCApiFunction::tppCall(Box* _self, CallRewriteArgs* rewrite_args, ArgPa
bool rewrite_success = false; bool rewrite_success = false;
rearrangeArguments(paramspec, NULL, self->method_def->ml_name, NULL, rewrite_args, rewrite_success, argspec, arg1, rearrangeArguments(paramspec, NULL, self->method_def->ml_name, NULL, rewrite_args, rewrite_success, argspec, arg1,
arg2, arg3, args, keyword_names, oarg1, oarg2, oarg3, args); arg2, arg3, args, keyword_names, oarg1, oarg2, oarg3, oargs);
if (!rewrite_success) if (!rewrite_success)
rewrite_args = NULL; rewrite_args = NULL;
......
...@@ -532,7 +532,7 @@ Box* BoxedWrapperObject::tppCall(Box* _self, CallRewriteArgs* rewrite_args, ArgP ...@@ -532,7 +532,7 @@ Box* BoxedWrapperObject::tppCall(Box* _self, CallRewriteArgs* rewrite_args, ArgP
bool rewrite_success = false; bool rewrite_success = false;
rearrangeArguments(paramspec, NULL, self->descr->wrapper->name.data(), NULL, rewrite_args, rewrite_success, argspec, rearrangeArguments(paramspec, NULL, self->descr->wrapper->name.data(), NULL, rewrite_args, rewrite_success, argspec,
arg1, arg2, arg3, args, keyword_names, oarg1, oarg2, oarg3, args); arg1, arg2, arg3, args, keyword_names, oarg1, oarg2, oarg3, oargs);
assert(oarg1 && oarg1->cls == tuple_cls); assert(oarg1 && oarg1->cls == tuple_cls);
if (!paramspec.takes_kwargs) if (!paramspec.takes_kwargs)
......
...@@ -407,7 +407,7 @@ extern "C" void generatorGCHandler(GCVisitor* v, Box* b) { ...@@ -407,7 +407,7 @@ extern "C" void generatorGCHandler(GCVisitor* v, Box* b) {
if (g->running) { if (g->running) {
v->visitPotentialRange((void**)&g->returnContext, v->visitPotentialRange((void**)&g->returnContext,
((void**)&g->returnContext) + sizeof(g->returnContext) / sizeof(void*)); ((void**)&g->returnContext) + sizeof(*g->returnContext) / sizeof(void*));
} else { } else {
// g->context is always set for a running generator, but we can trigger a GC while constructing // g->context is always set for a running generator, but we can trigger a GC while constructing
// a generator in which case we can see a NULL context // a generator in which case we can see a NULL context
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment