Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More code improvements based on static analysis #4258

Merged
merged 11 commits into from
Nov 24, 2023
Merged

More code improvements based on static analysis #4258

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69938dd
Add operator= where copy ctor is present, drop implemetation of ctors…
vlstill Nov 20, 2023
62cc2e5
Avoid possible NULL derefrence
vlstill Nov 20, 2023
ed35736
Avoid returning garbage for negatively sized stack declarations.
vlstill Nov 20, 2023
9a7881c
Add missing va_end
vlstill Nov 20, 2023
5045649
Avoid unnecessary copy, modernize
vlstill Nov 20, 2023
55951c6
Avoid null dereference after error
vlstill Nov 22, 2023
1e254d2
Provide assignment operator to match the copy constructor
vlstill Nov 22, 2023
812a5e5
Avoid doble-copying in frontend constructor/addDebugHook
vlstill Nov 22, 2023
efbcd43
Avoid extra copies
vlstill Nov 22, 2023
252b157
Fix formatting
vlstill Nov 23, 2023
9d52e5c
Avoid sending null Node to ::error
vlstill Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Avoid null dereference after error
  • Loading branch information
@vlstill
vlstill committed Nov 23, 2023
commit 55951c6a57a89392477a7be71755297de3f5975e
21 changes: 16 additions & 5 deletions frontends/p4/fromv1.0/converters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,10 @@ class ComputeCallGraph : public Inspector {
ctr = gr->obj->to<IR::Counter>();
else if (auto nr = ctrref->to<IR::PathExpression>())
ctr = structure->counters.get(nr->path->name);
if (ctr == nullptr)
if (ctr == nullptr) {
::error(ErrorType::ERR_NOT_FOUND, "%1%: Cannot find counter", ctrref);
return;
}
auto parent = findContext<IR::ActionFunction>();
BUG_CHECK(parent != nullptr, "%1%: Counter call not within action", primitive);
structure->calledCounters.calls(parent->name, ctr->name.name);
Expand All @@ -340,7 +342,10 @@ class ComputeCallGraph : public Inspector {
mtr = gr->obj->to<IR::Meter>();
else if (auto nr = mtrref->to<IR::PathExpression>())
mtr = structure->meters.get(nr->path->name);
if (mtr == nullptr) ::error(ErrorType::ERR_NOT_FOUND, "%1%: Cannot find meter", mtrref);
if (mtr == nullptr) {
::error(ErrorType::ERR_NOT_FOUND, "%1%: Cannot find meter", mtrref);
return;
}
auto parent = findContext<IR::ActionFunction>();
BUG_CHECK(parent != nullptr, "%1%: not within action", primitive);
structure->calledMeters.calls(parent->name, mtr->name.name);
Expand All @@ -356,8 +361,10 @@ class ComputeCallGraph : public Inspector {
reg = gr->obj->to<IR::Register>();
else if (auto nr = regref->to<IR::PathExpression>())
reg = structure->registers.get(nr->path->name);
if (reg == nullptr)
if (reg == nullptr) {
::error(ErrorType::ERR_NOT_FOUND, "%1%: Cannot find register", regref);
return;
}
auto parent = findContext<IR::ActionFunction>();
BUG_CHECK(parent != nullptr, "%1%: not within action", primitive);
structure->calledRegisters.calls(parent->name, reg->name.name);
Expand Down Expand Up @@ -407,11 +414,15 @@ class ComputeTableCallGraph : public Inspector {
void postorder(const IR::Apply *apply) override {
LOG3("Scanning " << apply->name);
auto tbl = structure->tables.get(apply->name.name);
if (tbl == nullptr)
if (tbl == nullptr) {
::error(ErrorType::ERR_NOT_FOUND, "%1%: Could not find table", apply->name);
return;
}
auto parent = findContext<IR::V1Control>();
if (!parent)
if (!parent) {
::error(ErrorType::ERR_UNEXPECTED, "%1%: Apply not within a control block?", apply);
return;
}

auto ctrl = get(structure->tableMapping, tbl);

Expand Down