Skip to content

P
Pyston
Commit 581cebc5 authored by Marius Wachtler's avatar Marius Wachtler
Browse files
Options

BST: merge MakeFunction with FunctionDef and MakeClass with ClassDef 

this simplifies the code and removes a lot of ugliness
parent eb4e7951
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 288 deletions
src/analysis/type_analysis.cpp
View file @ 581cebc5
...@@ -481,9 +481,7 @@ private: ...@@ -481,9 +481,7 @@ private:
} }
} }
void visit_makeclass(BST_MakeClass* mkclass) override { void visit_makeclass(BST_MakeClass* node) override {
auto* node = bst_cast<BST_ClassDef>(getCodeConstants().getFuncOrClass(mkclass->index_class_def).first);
for (int i = 0; i < node->num_decorator; ++i) { for (int i = 0; i < node->num_decorator; ++i) {
getType(node->decorator[i]); getType(node->decorator[i]);
} }
...@@ -492,7 +490,7 @@ private: ...@@ -492,7 +490,7 @@ private:
// TODO should we speculate that classdefs will generally return a class? // TODO should we speculate that classdefs will generally return a class?
// return typeFromClass(type_cls); // return typeFromClass(type_cls);
_doSet(mkclass->vreg_dst, UNKNOWN); _doSet(node->vreg_dst, UNKNOWN);
} }
void visit_deletesub(BST_DeleteSub* node) override { getType(node->vreg_value); } void visit_deletesub(BST_DeleteSub* node) override { getType(node->vreg_value); }
...@@ -507,9 +505,7 @@ private: ...@@ -507,9 +505,7 @@ private:
assert(node->vreg == VREG_UNDEFINED); assert(node->vreg == VREG_UNDEFINED);
} }
void visit_makefunction(BST_MakeFunction* mkfn) override { void visit_makefunction(BST_MakeFunction* node) override {
auto* node = bst_cast<BST_FunctionDef>(getCodeConstants().getFuncOrClass(mkfn->index_func_def).first);
for (int i = 0; i < node->num_defaults + node->num_decorator; ++i) { for (int i = 0; i < node->num_defaults + node->num_decorator; ++i) {
getType(node->elts[i]); getType(node->elts[i]);
} }
...@@ -517,7 +513,7 @@ private: ...@@ -517,7 +513,7 @@ private:
CompilerType* t = UNKNOWN; CompilerType* t = UNKNOWN;
if (node->num_decorator == 0) if (node->num_decorator == 0)
t = typeFromClass(function_cls); t = typeFromClass(function_cls);
_doSet(mkfn->vreg_dst, t); _doSet(node->vreg_dst, t);
} }
void visit_exec(BST_Exec* node) override { void visit_exec(BST_Exec* node) override {
......
src/codegen/ast_interpreter.cpp
View file @ 581cebc5
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
private: private:
Value executeStmt(BST_stmt* node); Value executeStmt(BST_stmt* node);
Value createFunction(BST_FunctionDef* node, BoxedCode* node_code); Value createFunction(BST_MakeFunction* node, BoxedCode* node_code);
Value doBinOp(BST_stmt* node, Value left, Value right, int op, BinExpType exp_type); Value doBinOp(BST_stmt* node, Value left, Value right, int op, BinExpType exp_type);
void doStore(int vreg, STOLEN(Value) value); void doStore(int vreg, STOLEN(Value) value);
void doStoreArg(BST_Name* name, STOLEN(Value) value); void doStoreArg(BST_Name* name, STOLEN(Value) value);
...@@ -1126,7 +1126,7 @@ Value ASTInterpreter::visit_return(BST_Return* node) { ...@@ -1126,7 +1126,7 @@ Value ASTInterpreter::visit_return(BST_Return* node) {
return s; return s;
} }
Value ASTInterpreter::createFunction(BST_FunctionDef* node, BoxedCode* code) { Value ASTInterpreter::createFunction(BST_MakeFunction* node, BoxedCode* code) {
assert(code); assert(code);
std::vector<Box*> defaults; std::vector<Box*> defaults;
...@@ -1205,16 +1205,17 @@ Value ASTInterpreter::createFunction(BST_FunctionDef* node, BoxedCode* code) { ...@@ -1205,16 +1205,17 @@ Value ASTInterpreter::createFunction(BST_FunctionDef* node, BoxedCode* code) {
return rtn; return rtn;
} }
Value ASTInterpreter::visit_makeFunction(BST_MakeFunction* mkfn) { Value ASTInterpreter::visit_makeFunction(BST_MakeFunction* node) {
auto func_entry = getCodeConstants().getFuncOrClass(mkfn->index_func_def); BoxedCode* code = (BoxedCode*)getCodeConstants().getConstant(node->vreg_code_obj);
auto node = bst_cast<BST_FunctionDef>(func_entry.first); assert(code);
assert(code->cls == code_cls);
std::vector<Value> decorators; std::vector<Value> decorators;
decorators.reserve(node->num_decorator); decorators.reserve(node->num_decorator);
for (int i = 0; i < node->num_decorator; ++i) for (int i = 0; i < node->num_decorator; ++i)
decorators.push_back(getVReg(node->elts[i])); decorators.push_back(getVReg(node->elts[i]));
Value func = createFunction(node, func_entry.second); Value func = createFunction(node, code);
for (int i = decorators.size() - 1; i >= 0; i--) { for (int i = decorators.size() - 1; i >= 0; i--) {
func.o = runtimeCall(autoDecref(decorators[i].o), ArgPassSpec(1), autoDecref(func.o), 0, 0, 0, 0); func.o = runtimeCall(autoDecref(decorators[i].o), ArgPassSpec(1), autoDecref(func.o), 0, 0, 0, 0);
...@@ -1227,12 +1228,9 @@ Value ASTInterpreter::visit_makeFunction(BST_MakeFunction* mkfn) { ...@@ -1227,12 +1228,9 @@ Value ASTInterpreter::visit_makeFunction(BST_MakeFunction* mkfn) {
return func; return func;
} }
Value ASTInterpreter::visit_makeClass(BST_MakeClass* mkclass) { Value ASTInterpreter::visit_makeClass(BST_MakeClass* node) {
abortJITing(); abortJITing();
auto class_entry = getCodeConstants().getFuncOrClass(mkclass->index_class_def);
auto node = bst_cast<BST_ClassDef>(class_entry.first);
BoxedTuple* bases_tuple = (BoxedTuple*)getVReg(node->vreg_bases_tuple).o; BoxedTuple* bases_tuple = (BoxedTuple*)getVReg(node->vreg_bases_tuple).o;
assert(bases_tuple->cls == tuple_cls); assert(bases_tuple->cls == tuple_cls);
AUTO_DECREF(bases_tuple); AUTO_DECREF(bases_tuple);
...@@ -1243,8 +1241,9 @@ Value ASTInterpreter::visit_makeClass(BST_MakeClass* mkclass) { ...@@ -1243,8 +1241,9 @@ Value ASTInterpreter::visit_makeClass(BST_MakeClass* mkclass) {
decorators.push_back(getVReg(node->decorator[i]).o); decorators.push_back(getVReg(node->decorator[i]).o);
} }
BoxedCode* code = class_entry.second; BoxedCode* code = (BoxedCode*)getCodeConstants().getConstant(node->vreg_code_obj);
assert(code); assert(code);
assert(code->cls == code_cls);
const ScopingResults& scope_info = code->source->scoping; const ScopingResults& scope_info = code->source->scoping;
......
src/codegen/irgen/irgenerator.cpp
View file @ 581cebc5
...@@ -1488,10 +1488,7 @@ private: ...@@ -1488,10 +1488,7 @@ private:
return new ConcreteCompilerVariable(UNKNOWN, rtn); return new ConcreteCompilerVariable(UNKNOWN, rtn);
} }
CompilerVariable* evalMakeClass(BST_MakeClass* mkclass, const UnwindInfo& unw_info) { CompilerVariable* evalMakeClass(BST_MakeClass* node, const UnwindInfo& unw_info) {
auto class_entry = irstate->getCodeConstants().getFuncOrClass(mkclass->index_class_def);
BST_ClassDef* node = bst_cast<BST_ClassDef>(class_entry.first);
CompilerVariable* _bases_tuple = evalVReg(node->vreg_bases_tuple); CompilerVariable* _bases_tuple = evalVReg(node->vreg_bases_tuple);
ConcreteCompilerVariable* bases_tuple = _bases_tuple->makeConverted(emitter, _bases_tuple->getBoxType()); ConcreteCompilerVariable* bases_tuple = _bases_tuple->makeConverted(emitter, _bases_tuple->getBoxType());
...@@ -1500,8 +1497,9 @@ private: ...@@ -1500,8 +1497,9 @@ private:
decorators.push_back(evalVReg(node->decorator[i])); decorators.push_back(evalVReg(node->decorator[i]));
} }
BoxedCode* code = class_entry.second; BoxedCode* code = (BoxedCode*)irstate->getCodeConstants().getConstant(node->vreg_code_obj);
assert(code); assert(code);
assert(code->cls == code_cls);
const ScopingResults& scope_info = code->source->scoping; const ScopingResults& scope_info = code->source->scoping;
// TODO duplication with _createFunction: // TODO duplication with _createFunction:
...@@ -1544,7 +1542,7 @@ private: ...@@ -1544,7 +1542,7 @@ private:
return cls; return cls;
} }
CompilerVariable* _createFunction(BST_FunctionDef* node, BoxedCode* code, const UnwindInfo& unw_info) { CompilerVariable* _createFunction(BST_MakeFunction* node, BoxedCode* code, const UnwindInfo& unw_info) {
assert(code); assert(code);
std::vector<ConcreteCompilerVariable*> defaults; std::vector<ConcreteCompilerVariable*> defaults;
...@@ -1572,16 +1570,17 @@ private: ...@@ -1572,16 +1570,17 @@ private:
return func; return func;
} }
CompilerVariable* evalMakeFunction(BST_MakeFunction* mkfn, const UnwindInfo& unw_info) { CompilerVariable* evalMakeFunction(BST_MakeFunction* node, const UnwindInfo& unw_info) {
auto func_entry = irstate->getCodeConstants().getFuncOrClass(mkfn->index_func_def); BoxedCode* code = (BoxedCode*)irstate->getCodeConstants().getConstant(node->vreg_code_obj);
BST_FunctionDef* node = bst_cast<BST_FunctionDef>(func_entry.first); assert(code);
assert(code->cls == code_cls);
std::vector<CompilerVariable*> decorators; std::vector<CompilerVariable*> decorators;
for (int i = 0; i < node->num_decorator; ++i) { for (int i = 0; i < node->num_decorator; ++i) {
decorators.push_back(evalVReg(node->elts[i])); decorators.push_back(evalVReg(node->elts[i]));
} }
CompilerVariable* func = _createFunction(node, func_entry.second, unw_info); CompilerVariable* func = _createFunction(node, code, unw_info);
for (int i = decorators.size() - 1; i >= 0; i--) { for (int i = decorators.size() - 1; i >= 0; i--) {
func = decorators[i]->call(emitter, getOpInfoForNode(node, unw_info), ArgPassSpec(1), { func }, NULL); func = decorators[i]->call(emitter, getOpInfoForNode(node, unw_info), ArgPassSpec(1), { func }, NULL);
......
src/core/bst.cpp
View file @ 581cebc5
...@@ -183,23 +183,6 @@ void BST_Compare::accept_stmt(StmtVisitor* v) { ...@@ -183,23 +183,6 @@ void BST_Compare::accept_stmt(StmtVisitor* v) {
return v->visit_compare(this); return v->visit_compare(this);
} }
void BST_ClassDef::accept(BSTVisitor* v) {
bool skip = v->visit_classdef(this);
if (skip)
return;
v->visit_vreg(&vreg_bases_tuple);
for (int i = 0; i < num_decorator; ++i) {
v->visit_vreg(&decorator[i]);
}
// we dont't visit the body
}
void BST_ClassDef::accept_stmt(StmtVisitor* v) {
v->visit_classdef(this);
}
void BST_DeleteAttr::accept(BSTVisitor* v) { void BST_DeleteAttr::accept(BSTVisitor* v) {
bool skip = v->visit_deleteattr(this); bool skip = v->visit_deleteattr(this);
if (skip) if (skip)
...@@ -276,21 +259,6 @@ void BST_Exec::accept_stmt(StmtVisitor* v) { ...@@ -276,21 +259,6 @@ void BST_Exec::accept_stmt(StmtVisitor* v) {
v->visit_exec(this); v->visit_exec(this);
} }
void BST_FunctionDef::accept(BSTVisitor* v) {
bool skip = v->visit_functiondef(this);
if (skip)
return;
for (int i = 0; i < num_decorator + num_defaults; ++i) {
v->visit_vreg(&elts[i]);
}
// we dont't visit the body
}
void BST_FunctionDef::accept_stmt(StmtVisitor* v) {
v->visit_functiondef(this);
}
void BST_Landingpad::accept(BSTVisitor* v) { void BST_Landingpad::accept(BSTVisitor* v) {
bool skip = v->visit_landingpad(this); bool skip = v->visit_landingpad(this);
if (skip) if (skip)
...@@ -717,7 +685,9 @@ void BST_MakeFunction::accept(BSTVisitor* v) { ...@@ -717,7 +685,9 @@ void BST_MakeFunction::accept(BSTVisitor* v) {
if (skip) if (skip)
return; return;
bst_cast<BST_FunctionDef>(v->getCodeConstants().getFuncOrClass(index_func_def).first)->accept(v); for (int i = 0; i < num_decorator + num_defaults; ++i) {
v->visit_vreg(&elts[i]);
}
v->visit_vreg(&vreg_dst, true); v->visit_vreg(&vreg_dst, true);
} }
...@@ -730,7 +700,10 @@ void BST_MakeClass::accept(BSTVisitor* v) { ...@@ -730,7 +700,10 @@ void BST_MakeClass::accept(BSTVisitor* v) {
if (skip) if (skip)
return; return;
bst_cast<BST_ClassDef>(v->getCodeConstants().getFuncOrClass(index_class_def).first)->accept(v); v->visit_vreg(&vreg_bases_tuple);
for (int i = 0; i < num_decorator; ++i) {
v->visit_vreg(&decorator[i]);
}
v->visit_vreg(&vreg_dst, true); v->visit_vreg(&vreg_dst, true);
} }
...@@ -931,35 +904,6 @@ bool PrintVisitor::visit_compare(BST_Compare* node) { ...@@ -931,35 +904,6 @@ bool PrintVisitor::visit_compare(BST_Compare* node) {
return true; return true;
} }
bool PrintVisitor::visit_classdef(BST_ClassDef* node) {
check_if_invoke(node);
for (int i = 0, n = node->num_decorator; i < n; i++) {
stream << "@";
visit_vreg(&node->decorator[i]);
stream << "\n";
printIndent();
}
stream << "class " << code_constants.getInternedString(node->index_name).s() << "(";
visit_vreg(&node->vreg_bases_tuple);
stream << ")";
indent += 4;
stream << '\n';
printIndent();
stream << "...";
#if 0
for (int i = 0, n = node->body.size(); i < n; i++) {
stream << "\n";
printIndent();
node->body[i]->accept(this);
}
#endif
indent -= 4;
return true;
}
bool PrintVisitor::visit_deletesub(BST_DeleteSub* node) { bool PrintVisitor::visit_deletesub(BST_DeleteSub* node) {
check_if_invoke(node); check_if_invoke(node);
...@@ -1033,48 +977,6 @@ bool PrintVisitor::visit_exec(BST_Exec* node) { ...@@ -1033,48 +977,6 @@ bool PrintVisitor::visit_exec(BST_Exec* node) {
return true; return true;
} }
bool PrintVisitor::visit_functiondef(BST_FunctionDef* node) {
check_if_invoke(node);
for (int i = 0; i < node->num_decorator; ++i) {
stream << "@";
visit_vreg(&node->elts[i]);
stream << "\n";
printIndent();
}
stream << "def ";
if (node->index_name != VREG_UNDEFINED)
stream << code_constants.getInternedString(node->index_name).s();
else
stream << "<lambda>";
stream << "(";
for (int i = 0; i < node->num_defaults; ++i) {
if (i > 0)
stream << ", ";
stream << "<default " << i << ">=";
visit_vreg(&node->elts[node->num_decorator + i]);
}
stream << ")";
indent += 4;
stream << '\n';
printIndent();
stream << "...";
#if 0
for (int i = 0; i < node->body.size(); i++) {
stream << "\n";
printIndent();
node->body[i]->accept(this);
}
#endif
indent -= 4;
return true;
}
bool PrintVisitor::visit_landingpad(BST_Landingpad* node) { bool PrintVisitor::visit_landingpad(BST_Landingpad* node) {
check_if_invoke(node); check_if_invoke(node);
...@@ -1483,15 +1385,64 @@ bool PrintVisitor::visit_makefunction(BST_MakeFunction* node) { ...@@ -1483,15 +1385,64 @@ bool PrintVisitor::visit_makefunction(BST_MakeFunction* node) {
check_if_invoke(node); check_if_invoke(node);
visit_vreg(&node->vreg_dst, true); visit_vreg(&node->vreg_dst, true);
stream << "make_"; stream << "make_def ";
return false;
for (int i = 0; i < node->num_decorator; ++i) {
stream << "@";
visit_vreg(&node->elts[i]);
stream << "\n";
printIndent();
}
if (node->index_name != VREG_UNDEFINED)
stream << code_constants.getInternedString(node->index_name).s();
else
stream << "<lambda>";
stream << "(";
for (int i = 0; i < node->num_defaults; ++i) {
if (i > 0)
stream << ", ";
stream << "<default " << i << ">=";
visit_vreg(&node->elts[node->num_decorator + i]);
}
stream << ")\n";
indent += 4;
printIndent();
visit_vreg(&node->vreg_code_obj);
stream << "\n";
printIndent();
stream << "...\n";
indent -= 4;
return true;
} }
bool PrintVisitor::visit_makeclass(BST_MakeClass* node) { bool PrintVisitor::visit_makeclass(BST_MakeClass* node) {
check_if_invoke(node); check_if_invoke(node);
visit_vreg(&node->vreg_dst, true); visit_vreg(&node->vreg_dst, true);
stream << "make_"; stream << "make_class ";
return false;
for (int i = 0, n = node->num_decorator; i < n; i++) {
stream << "@";
visit_vreg(&node->decorator[i]);
stream << "\n";
printIndent();
}
stream << code_constants.getInternedString(node->index_name).s() << "(";
visit_vreg(&node->vreg_bases_tuple);
stream << ")\n";
indent += 4;
printIndent();
visit_vreg(&node->vreg_code_obj);
stream << "\n";
printIndent();
stream << "...\n";
indent -= 4;
return true;
} }
} }
src/core/bst.h
View file @ 581cebc5
This diff is collapsed.
src/core/cfg.cpp
View file @ 581cebc5
...@@ -1464,8 +1464,10 @@ private: ...@@ -1464,8 +1464,10 @@ private:
static BoxedString* gen_name = getStaticString("<generator>"); static BoxedString* gen_name = getStaticString("<generator>");
BoxedCode* code = cfgizer->runRecursively(new_body, gen_name, node->lineno, genexp_args, node); BoxedCode* code = cfgizer->runRecursively(new_body, gen_name, node->lineno, genexp_args, node);
BST_FunctionDef* func = BST_FunctionDef::create(0, 0); BST_MakeFunction* mkfunc = allocAndPush<BST_MakeFunction>(0, 0);
BST_MakeFunction* mkfunc = allocAndPush<BST_MakeFunction>(func, code_constants.addFuncOrClass(func, code)); mkfunc->lineno = node->lineno;
mkfunc->vreg_code_obj = code_constants.createVRegEntryForConstant(code);
code_constants.addOwnedRef(code);
TmpValue func_var_name = createDstName(mkfunc); TmpValue func_var_name = createDstName(mkfunc);
return makeCall(func_var_name, { first }); return makeCall(func_var_name, { first });
...@@ -1522,8 +1524,10 @@ private: ...@@ -1522,8 +1524,10 @@ private:
static BoxedString* comp_name = getStaticString("<comperehension>"); static BoxedString* comp_name = getStaticString("<comperehension>");
BoxedCode* code = cfgizer->runRecursively(new_body, comp_name, node->lineno, args, node); BoxedCode* code = cfgizer->runRecursively(new_body, comp_name, node->lineno, args, node);
BST_FunctionDef* func = BST_FunctionDef::create(0, 0); BST_MakeFunction* mkfunc = allocAndPush<BST_MakeFunction>(0, 0);
BST_MakeFunction* mkfunc = allocAndPush<BST_MakeFunction>(func, code_constants.addFuncOrClass(func, code)); mkfunc->lineno = node->lineno;
mkfunc->vreg_code_obj = code_constants.createVRegEntryForConstant(code);
code_constants.addOwnedRef(code);
TmpValue func_var_name = createDstName(mkfunc); TmpValue func_var_name = createDstName(mkfunc);
return makeCall(func_var_name, { first }); return makeCall(func_var_name, { first });
...@@ -1564,16 +1568,22 @@ private: ...@@ -1564,16 +1568,22 @@ private:
stmt->value = node->body; // don't remap now; will be CFG'ed later stmt->value = node->body; // don't remap now; will be CFG'ed later
auto bdef = BST_FunctionDef::create(0 /* decorators */, node->args->defaults.size()); llvm::SmallVector<TmpValue, 8> remapped_defaults;
bdef->lineno = node->lineno; for (int i = 0; i < node->args->defaults.size(); ++i) {
remapped_defaults.emplace_back(remapExpr(node->args->defaults[i]));
}
auto mkfn = allocAndPush<BST_MakeFunction>(0 /* decorators */, node->args->defaults.size());
mkfn->lineno = node->lineno;
for (int i = 0; i < node->args->defaults.size(); ++i) { for (int i = 0; i < node->args->defaults.size(); ++i) {
unmapExpr(remapExpr(node->args->defaults[i]), &bdef->elts[i]); unmapExpr(remapped_defaults[i], &mkfn->elts[i]);
} }
auto name = getStaticString("<lambda>"); auto name = getStaticString("<lambda>");
auto* code = cfgizer->runRecursively({ stmt }, name, node->lineno, node->args, node); auto* code = cfgizer->runRecursively({ stmt }, name, mkfn->lineno, node->args, node);
auto mkfn = allocAndPush<BST_MakeFunction>(bdef, code_constants.addFuncOrClass(bdef, code)); mkfn->vreg_code_obj = code_constants.createVRegEntryForConstant(code);
code_constants.addOwnedRef(code);
return createDstName(mkfn); return createDstName(mkfn);
} }
...@@ -1896,18 +1906,20 @@ public: ...@@ -1896,18 +1906,20 @@ public:
} }
TmpValue bases_name = createDstName(bases); TmpValue bases_name = createDstName(bases);
auto def = BST_ClassDef::create(node->decorator_list.size()); auto mkclass = allocAndPush<BST_MakeClass>(node->decorator_list.size());
def->lineno = node->lineno; mkclass->lineno = node->lineno;
def->index_name = remapInternedString(node->name); mkclass->index_name = remapInternedString(node->name);
for (int i = 0; i < node->decorator_list.size(); ++i) { for (int i = 0; i < node->decorator_list.size(); ++i) {
unmapExpr(remapped_deco[i], &def->decorator[i]); unmapExpr(remapped_deco[i], &mkclass->decorator[i]);
} }
unmapExpr(bases_name, &def->vreg_bases_tuple); unmapExpr(bases_name, &mkclass->vreg_bases_tuple);
auto* code = cfgizer->runRecursively(node->body, node->name.getBox(), node->lineno, NULL, node); auto* code = cfgizer->runRecursively(node->body, node->name.getBox(), node->lineno, NULL, node);
auto mkclass = allocAndPush<BST_MakeClass>(def, code_constants.addFuncOrClass(def, code)); mkclass->vreg_code_obj = code_constants.createVRegEntryForConstant(code);
code_constants.addOwnedRef(code);
auto tmp = createDstName(mkclass); auto tmp = createDstName(mkclass);
pushAssign(TmpValue(scoping->mangleName(node->name), node->lineno), tmp); pushAssign(TmpValue(scoping->mangleName(node->name), node->lineno), tmp);
...@@ -1926,21 +1938,22 @@ public: ...@@ -1926,21 +1938,22 @@ public:
remapped_defaults.emplace_back(remapExpr(node->args->defaults[i])); remapped_defaults.emplace_back(remapExpr(node->args->defaults[i]));
} }
auto def = BST_FunctionDef::create(node->decorator_list.size(), node->args->defaults.size()); auto mkfunc = allocAndPush<BST_MakeFunction>(node->decorator_list.size(), node->args->defaults.size());
def->lineno = node->lineno; mkfunc->lineno = node->lineno;
def->index_name = remapInternedString(node->name); mkfunc->index_name = remapInternedString(node->name);
// Decorators are evaluated before the defaults, so this *must* go before remapArguments(). // Decorators are evaluated before the defaults, so this *must* go before remapArguments().
// TODO(rntz): do we have a test for this // TODO(rntz): do we have a test for this
for (int i = 0; i < node->decorator_list.size(); ++i) { for (int i = 0; i < node->decorator_list.size(); ++i) {
unmapExpr(remapped_deco[i], &def->elts[i]); unmapExpr(remapped_deco[i], &mkfunc->elts[i]);
} }
for (int i = 0; i < node->args->defaults.size(); ++i) { for (int i = 0; i < node->args->defaults.size(); ++i) {
unmapExpr(remapped_defaults[i], &def->elts[node->decorator_list.size() + i]); unmapExpr(remapped_defaults[i], &mkfunc->elts[node->decorator_list.size() + i]);
} }
auto* code = cfgizer->runRecursively(node->body, node->name.getBox(), node->lineno, node->args, node); auto* code = cfgizer->runRecursively(node->body, node->name.getBox(), node->lineno, node->args, node);
auto mkfunc = allocAndPush<BST_MakeFunction>(def, code_constants.addFuncOrClass(def, code)); mkfunc->vreg_code_obj = code_constants.createVRegEntryForConstant(code);
code_constants.addOwnedRef(code);
auto tmp = createDstName(mkfunc); auto tmp = createDstName(mkfunc);
pushAssign(TmpValue(scoping->mangleName(node->name), node->lineno), tmp); pushAssign(TmpValue(scoping->mangleName(node->name), node->lineno), tmp);
......
src/runtime/types.cpp
View file @ 581cebc5
...@@ -4053,12 +4053,6 @@ BORROWED(BoxedFloat*) CodeConstants::getFloatConstant(double d) const { ...@@ -4053,12 +4053,6 @@ BORROWED(BoxedFloat*) CodeConstants::getFloatConstant(double d) const {
void CodeConstants::dealloc() const { void CodeConstants::dealloc() const {
decrefArray(owned_refs.data(), owned_refs.size()); decrefArray(owned_refs.data(), owned_refs.size());
owned_refs.clear(); owned_refs.clear();
for (auto&& e : funcs_and_classes) {
Py_DECREF(e.second);
assert(e.first->type() == BST_TYPE::FunctionDef || e.first->type() == BST_TYPE::ClassDef);
delete[] e.first;
}
funcs_and_classes.clear();
} }
#ifndef Py_REF_DEBUG #ifndef Py_REF_DEBUG
......
src/runtime/types.h
View file @ 581cebc5
...@@ -1079,8 +1079,6 @@ private: ...@@ -1079,8 +1079,6 @@ private:
// all objects we need to decref when the code object dies // all objects we need to decref when the code object dies
mutable std::vector<Box*> owned_refs; mutable std::vector<Box*> owned_refs;
mutable std::vector<std::pair<BST_stmt*, BoxedCode*>> funcs_and_classes;
// Note: DenseMap doesn't work here since we don't prevent the tombstone/empty // Note: DenseMap doesn't work here since we don't prevent the tombstone/empty
// keys from reaching it. // keys from reaching it.
mutable std::unordered_map<int64_t, BoxedInt*> int_constants; mutable std::unordered_map<int64_t, BoxedInt*> int_constants;
...@@ -1113,17 +1111,8 @@ public: ...@@ -1113,17 +1111,8 @@ public:
BORROWED(BoxedInt*) getIntConstant(int64_t n) const; BORROWED(BoxedInt*) getIntConstant(int64_t n) const;
BORROWED(BoxedFloat*) getFloatConstant(double d) const; BORROWED(BoxedFloat*) getFloatConstant(double d) const;
std::pair<BST_stmt*, BORROWED(BoxedCode*)> getFuncOrClass(int constant) const {
return funcs_and_classes[constant];
}
int addInternedString(InternedString s) { return createVRegEntryForConstant(s.getBox()); } int addInternedString(InternedString s) { return createVRegEntryForConstant(s.getBox()); }
int addFuncOrClass(BST_stmt* stmt, STOLEN(BoxedCode*) code) {
funcs_and_classes.emplace_back(stmt, code);
return funcs_and_classes.size() - 1;
}
int addKeywordNames(llvm::ArrayRef<BoxedString*> name) { int addKeywordNames(llvm::ArrayRef<BoxedString*> name) {
keyword_names.emplace_back(new std::vector<BoxedString*>(name.begin(), name.end())); keyword_names.emplace_back(new std::vector<BoxedString*>(name.begin(), name.end()));
return keyword_names.size() - 1; return keyword_names.size() - 1;
......
test/unittests/analysis.cpp
View file @ 581cebc5
...@@ -30,10 +30,11 @@ static BoxedCode* getCodeObjectOfFirstMakeFunction(BoxedCode* module_code) { ...@@ -30,10 +30,11 @@ static BoxedCode* getCodeObjectOfFirstMakeFunction(BoxedCode* module_code) {
for (BST_stmt* stmt : *module_code->source->cfg->getStartingBlock()) { for (BST_stmt* stmt : *module_code->source->cfg->getStartingBlock()) {
if (stmt->type() != BST_TYPE::MakeFunction) if (stmt->type() != BST_TYPE::MakeFunction)
continue; continue;
code = module_code->code_constants.getFuncOrClass(bst_cast<BST_MakeFunction>(stmt)->index_func_def).second; code = (BoxedCode*)module_code->code_constants.getConstant(bst_cast<BST_MakeFunction>(stmt)->vreg_code_obj);
assert(code);
assert(code->cls == code_cls);
break; break;
} }
assert(code);
return code; return code;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7