Skip to content

Commit 0d9cfe8

Browse files
Chris DoddChrisDodd
Chris Dodd
authored and
ChrisDodd
committed
cleanup -- remove unnecessary default args to constructors
1 parent 1297646 commit 0d9cfe8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+409
-578
lines changed

‎backends/bmv2/jsonconverter.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ArithmeticFixup : public Transform {
3939
const IR::Expression* fix(const IR::Expression* expr, const IR::Type_Bits* type) {
4040
unsigned width = type->size;
4141
if (!type->isSigned) {
42-
auto mask = new IR::Constant(Util::SourceInfo(), type, Util::mask(width), 16);
42+
auto mask = new IR::Constant(type, Util::mask(width), 16);
4343
typeMap->setType(mask, type);
4444
auto result = new IR::BAnd(expr->srcInfo, expr, mask);
4545
typeMap->setType(result, type);
@@ -817,12 +817,12 @@ cstring JsonConverter::createCalculation(cstring algo, const IR::Expression* fie
817817
auto type = typeMap->getType(fields, true);
818818
BUG_CHECK(type->is<IR::Type_StructLike>(), "%1%: expected a struct", fields);
819819
for (auto f : *type->to<IR::Type_StructLike>()->fields) {
820-
auto e = new IR::Member(Util::SourceInfo(), fields, f->name);
820+
auto e = new IR::Member(fields, f->name);
821821
auto ftype = typeMap->getType(f);
822822
typeMap->setType(e, ftype);
823823
vec->push_back(e);
824824
}
825-
fields = new IR::ListExpression(Util::SourceInfo(), vec);
825+
fields = new IR::ListExpression(vec);
826826
typeMap->setType(fields, type);
827827
}
828828
auto jright = conv->convert(fields);
@@ -982,8 +982,7 @@ JsonConverter::convertActionBody(const IR::Vector<IR::StatOrDecl>* body,
982982
if (ef->method->name == v1model.clone.name) {
983983
BUG_CHECK(mc->arguments->size() == 2, "Expected 2 arguments for %1%", mc);
984984
cstring name = refMap->newName("fl");
985-
auto emptylist = new IR::ListExpression(
986-
Util::SourceInfo(), new IR::Vector<IR::Expression>());
985+
auto emptylist = new IR::ListExpression(new IR::Vector<IR::Expression>());
987986
id = createFieldList(emptylist, "field_lists", name, fieldLists);
988987
} else {
989988
BUG_CHECK(mc->arguments->size() == 3, "Expected 3 arguments for %1%", mc);
@@ -1129,7 +1128,7 @@ void JsonConverter::addToFieldList(const IR::Expression* expr, Util::JsonArray*
11291128
// recursively add all fields
11301129
auto st = type->to<IR::Type_StructLike>();
11311130
for (auto f : *st->fields) {
1132-
auto member = new IR::Member(Util::SourceInfo(), expr, f->name);
1131+
auto member = new IR::Member(expr, f->name);
11331132
typeMap->setType(member, typeMap->getType(f, true));
11341133
addToFieldList(member, fl);
11351134
}
@@ -2695,7 +2694,7 @@ Util::IJson* JsonConverter::convertParserStatement(const IR::StatOrDecl* stat) {
26952694
} else if (minst->is<P4::BuiltInMethod>()) {
26962695
auto bi = minst->to<P4::BuiltInMethod>();
26972696
if (bi->name == IR::Type_Header::setValid || bi->name == IR::Type_Header::setInvalid) {
2698-
auto mem = new IR::Member(Util::SourceInfo(), bi->appliedTo, "$valid$");
2697+
auto mem = new IR::Member(bi->appliedTo, "$valid$");
26992698
typeMap->setType(mem, IR::Type_Void::get());
27002699
auto jexpr = conv->convert(mem, true, false);
27012700
result->emplace("op", "set");

‎backends/bmv2/lower.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -401,12 +401,10 @@ const IR::PathExpression*
401401
RemoveComplexExpressions::createTemporary(const IR::Expression* expression) {
402402
auto type = typeMap->getType(expression, true);
403403
auto name = refMap->newName("tmp");
404-
auto decl = new IR::Declaration_Variable(Util::SourceInfo(), IR::ID(name),
405-
IR::Annotations::empty, type->getP4Type(), nullptr);
404+
auto decl = new IR::Declaration_Variable(IR::ID(name), type->getP4Type());
406405
newDecls.push_back(decl);
407406
typeMap->setType(decl, type);
408-
auto assign = new IR::AssignmentStatement(
409-
Util::SourceInfo(), new IR::PathExpression(name), expression);
407+
auto assign = new IR::AssignmentStatement(new IR::PathExpression(name), expression);
410408
assignments.push_back(assign);
411409
return new IR::PathExpression(name);
412410
}
@@ -488,7 +486,7 @@ RemoveComplexExpressions::postorder(IR::Statement* statement) {
488486
return statement;
489487
auto vec = new IR::IndexedVector<IR::StatOrDecl>(assignments);
490488
vec->push_back(statement);
491-
auto block = new IR::BlockStatement(Util::SourceInfo(), IR::Annotations::empty, vec);
489+
auto block = new IR::BlockStatement(vec);
492490
assignments.clear();
493491
return block;
494492
}

‎backends/ebpf/ebpfType.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ EBPFType* EBPFTypeFactory::create(const IR::Type* type) {
3434
auto canon = typeMap->getTypeType(type, true);
3535
result = create(canon);
3636
auto path = new IR::Path(type->to<IR::Type_Typedef>()->name);
37-
result = new EBPFTypeName(new IR::Type_Name(Util::SourceInfo(), path), result);
37+
result = new EBPFTypeName(new IR::Type_Name(path), result);
3838
} else if (type->is<IR::Type_Name>()) {
3939
auto canon = typeMap->getTypeType(type, true);
4040
result = create(canon);

‎frontends/common/constantFolding.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ const IR::Node* DoConstantFolding::postorder(IR::Concat* e) {
524524
return e;
525525
}
526526

527-
auto resultType = IR::Type_Bits::get(Util::SourceInfo(), lt->size + rt->size, lt->isSigned);
527+
auto resultType = IR::Type_Bits::get(lt->size + rt->size, lt->isSigned);
528528
mpz_class value = Util::shift_left(left->value, static_cast<unsigned>(rt->size)) + right->value;
529529
auto result = new IR::Constant(e->srcInfo, resultType, value, left->base);
530530
setConstant(e, result);
@@ -785,8 +785,7 @@ const IR::Node* DoConstantFolding::postorder(IR::SelectExpression* expression) {
785785
changes = true;
786786
finished = true;
787787
if (someUnknown) {
788-
auto newc = new IR::SelectCase(
789-
c->srcInfo, new IR::DefaultExpression(Util::SourceInfo()), c->state);
788+
auto newc = new IR::SelectCase(c->srcInfo, new IR::DefaultExpression(), c->state);
790789
cases.push_back(newc);
791790
} else {
792791
// This is the result.

‎frontends/p4-14/p4-14-parse.ypp

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ table_body: /* epsilon */ { $$ = new IR::V1Table(getPragmas()); }
638638
$$->default_action_args = $6; }
639639
| table_body IDENTIFIER ':' expression ';'
640640
{ auto exp = new IR::ExpressionValue(@4, $4);
641-
auto prop = new IR::Property(@2, IR::ID(@2, $2), IR::Annotations::empty, exp, false);
641+
auto prop = new IR::Property(@2, IR::ID(@2, $2), exp, false);
642642
$1->addProperty(prop);
643643
$$ = $1; }
644644
| table_body error ';' { $$=$1; }

‎frontends/p4/createBuiltins.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@ limitations under the License.
2020
namespace P4 {
2121
void CreateBuiltins::postorder(IR::P4Parser* parser) {
2222
auto newStates = new IR::IndexedVector<IR::ParserState>(*parser->states);
23-
IR::ParserState* ac = new IR::ParserState(Util::SourceInfo(),
24-
IR::ParserState::accept,
25-
IR::Annotations::empty,
23+
IR::ParserState* ac = new IR::ParserState(IR::ParserState::accept,
2624
new IR::IndexedVector<IR::StatOrDecl>(),
2725
nullptr);
28-
IR::ParserState* rj = new IR::ParserState(Util::SourceInfo(),
29-
IR::ParserState::reject,
30-
IR::Annotations::empty,
26+
IR::ParserState* rj = new IR::ParserState(IR::ParserState::reject,
3127
new IR::IndexedVector<IR::StatOrDecl>(),
3228
nullptr);
3329
newStates->push_back(ac);

‎frontends/p4/fromv1.0/converters.cpp

+14-21
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ const IR::Node* ExpressionConverter::postorder(IR::Mask* expression) {
4848
return exp;
4949
if (value != range.value)
5050
return new IR::BAnd(expression->srcInfo, exp, cst);
51-
return new IR::Slice(Util::SourceInfo(), exp,
52-
new IR::Constant(range.highIndex), new IR::Constant(range.lowIndex));
51+
return new IR::Slice(exp, new IR::Constant(range.highIndex), new IR::Constant(range.lowIndex));
5352
}
5453

5554
const IR::Node* ExpressionConverter::postorder(IR::Constant* expression) {
@@ -95,13 +94,11 @@ const IR::Node* ExpressionConverter::postorder(IR::Primitive* primitive) {
9594
}
9695

9796
const IR::Expression* method = new IR::Member(
98-
Util::SourceInfo(),
9997
structure->paramReference(structure->parserPacketIn),
10098
P4::P4CoreLibrary::instance.packetIn.lookahead.Id());
10199
auto typeargs = new IR::Vector<IR::Type>();
102100
typeargs->push_back(IR::Type_Bits::get(aval + bval));
103-
auto lookahead = new IR::MethodCallExpression(
104-
Util::SourceInfo(), method, typeargs, new IR::Vector<IR::Expression>());
101+
auto lookahead = new IR::MethodCallExpression(method, typeargs);
105102
auto result = new IR::Slice(primitive->srcInfo, lookahead,
106103
new IR::Constant(bval - 1),
107104
new IR::Constant(0));
@@ -112,7 +109,7 @@ const IR::Node* ExpressionConverter::postorder(IR::Primitive* primitive) {
112109
auto base = primitive->operands.at(0);
113110
auto method = new IR::Member(primitive->srcInfo, base, IR::ID(IR::Type_Header::isValid));
114111
auto result = new IR::MethodCallExpression(primitive->srcInfo, IR::Type::Boolean::get(),
115-
method, new IR::Vector<IR::Type>(), new IR::Vector<IR::Expression>());
112+
method);
116113
return result;
117114
}
118115
BUG("Unexpected primitive %1%", primitive);
@@ -145,7 +142,7 @@ const IR::Node* ExpressionConverter::postorder(IR::ConcreteHeaderRef* nhr) {
145142
else
146143
ref = structure->conversionContext.userMetadata->clone();
147144
}
148-
auto result = new IR::Member(Util::SourceInfo(), ref, nhr->ref->name);
145+
auto result = new IR::Member(ref, nhr->ref->name);
149146
result->type = nhr->type;
150147
return result;
151148
}
@@ -178,11 +175,8 @@ const IR::Node* StatementConverter::preorder(IR::Apply* apply) {
178175
auto table = structure->tables.get(apply->name);
179176
auto newname = structure->tables.get(table);
180177
auto tbl = new IR::PathExpression(newname);
181-
auto method = new IR::Member(Util::SourceInfo(), tbl,
182-
IR::ID(IR::IApply::applyMethodName));
183-
auto call = new IR::MethodCallExpression(apply->srcInfo, method,
184-
structure->emptyTypeArguments,
185-
new IR::Vector<IR::Expression>());
178+
auto method = new IR::Member(tbl, IR::ID(IR::IApply::applyMethodName));
179+
auto call = new IR::MethodCallExpression(apply->srcInfo, method);
186180
if (apply->actions.size() == 0) {
187181
auto stat = new IR::MethodCallStatement(apply->srcInfo, call);
188182
prune();
@@ -210,9 +204,9 @@ const IR::Node* StatementConverter::preorder(IR::Apply* apply) {
210204

211205
if (!otherLabels) {
212206
StatementConverter conv(structure, renameMap);
213-
auto hitcase = hit ? conv.convert(hit) : new IR::EmptyStatement(Util::SourceInfo());
207+
auto hitcase = hit ? conv.convert(hit) : new IR::EmptyStatement();
214208
auto misscase = miss ? conv.convert(miss) : nullptr;
215-
auto check = new IR::Member(Util::SourceInfo(), call, IR::Type_Table::hit);
209+
auto check = new IR::Member(call, IR::Type_Table::hit);
216210
auto ifstat = new IR::IfStatement(apply->srcInfo, check, hitcase, misscase);
217211
prune();
218212
return ifstat;
@@ -230,7 +224,7 @@ const IR::Node* StatementConverter::preorder(IR::Apply* apply) {
230224
stat = conv.convert(a.second); }
231225
const IR::Expression* destination;
232226
if (a.first == "default") {
233-
destination = new IR::DefaultExpression(Util::SourceInfo());
227+
destination = new IR::DefaultExpression();
234228
} else {
235229
cstring act_name = a.first;
236230
cstring full_name = table->name + '.' + act_name;
@@ -239,7 +233,7 @@ const IR::Node* StatementConverter::preorder(IR::Apply* apply) {
239233
destination = new IR::PathExpression(IR::ID(act_name)); }
240234
auto swcase = new IR::SwitchCase(a.second->srcInfo, destination, stat);
241235
cases.insert(insert_at, swcase); }
242-
auto check = new IR::Member(Util::SourceInfo(), call, IR::Type_Table::action_run);
236+
auto check = new IR::Member(call, IR::Type_Table::action_run);
243237
auto sw = new IR::SwitchStatement(apply->srcInfo, check, std::move(cases));
244238
prune();
245239
return sw;
@@ -252,13 +246,12 @@ const IR::Node* StatementConverter::preorder(IR::Primitive* primitive) {
252246
if (control != nullptr) {
253247
auto instanceName = get(renameMap, control->name);
254248
auto ctrl = new IR::PathExpression(IR::ID(instanceName));
255-
auto method = new IR::Member(Util::SourceInfo(), ctrl, IR::ID(IR::IApply::applyMethodName));
249+
auto method = new IR::Member(ctrl, IR::ID(IR::IApply::applyMethodName));
256250
auto args = new IR::Vector<IR::Expression>();
257251
args->push_back(structure->conversionContext.header->clone());
258252
args->push_back(structure->conversionContext.userMetadata->clone());
259253
args->push_back(structure->conversionContext.standardMetadata->clone());
260-
auto call = new IR::MethodCallExpression(primitive->srcInfo, method,
261-
structure->emptyTypeArguments, args);
254+
auto call = new IR::MethodCallExpression(primitive->srcInfo, method, args);
262255
auto stat = new IR::MethodCallStatement(primitive->srcInfo, call);
263256
return stat;
264257
}
@@ -273,7 +266,7 @@ const IR::Node* StatementConverter::preorder(IR::If* cond) {
273266
BUG_CHECK(pred != nullptr, "Expected to get an expression when converting %1%", cond->pred);
274267
const IR::Statement* t, *f;
275268
if (cond->ifTrue == nullptr)
276-
t = new IR::EmptyStatement(Util::SourceInfo());
269+
t = new IR::EmptyStatement();
277270
else
278271
t = conv.convert(cond->ifTrue);
279272

@@ -293,7 +286,7 @@ const IR::Statement* StatementConverter::convert(const IR::Vector<IR::Expression
293286
auto s = convert(e);
294287
stats->push_back(s);
295288
}
296-
auto result = new IR::BlockStatement(toConvert->srcInfo, IR::Annotations::empty, stats);
289+
auto result = new IR::BlockStatement(toConvert->srcInfo, stats);
297290
return result;
298291
}
299292

0 commit comments

Comments
 (0)