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

Fix for issue #638 #640

Closed
wants to merge 1 commit into from
Closed

Fix for issue #638 #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions frontends/p4/simplifyDefUse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,10 @@ class FindUninitialized : public Inspector {
bool preorder(const IR::Operation_Unary* expression) override {
BUG_CHECK(!lhs, "%1%: Unary operation on LHS?", expression);
visit(expression->expr);
auto storage = getReads(expression->expr, true);
reads(expression, storage);
// This expression in fact reads the result of the operation,
// which is a temporary storage location, which we do not model
// in the def-use analysis.
reads(expression, LocationSet::empty);
registerUses(expression);
return false;
}
Expand All @@ -485,9 +487,10 @@ class FindUninitialized : public Inspector {
BUG_CHECK(!lhs, "%1%: Binary operation on LHS?", expression);
visit(expression->left);
visit(expression->right);
auto storageLeft = getReads(expression->left, true);
auto storageRight = getReads(expression->right, true);
reads(expression, storageLeft->join(storageRight));
// This expression in fact reads the result of the operation,
// which is a temporary storage location, which we do not model
// in the def-use analysis.
reads(expression, LocationSet::empty);
registerUses(expression);
return false;
}
Expand Down
9 changes: 0 additions & 9 deletions testdata/p4_16_samples_outputs/issue561.p4-stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@
../testdata/p4_16_samples/issue561.p4(35): warning: u.h2.g may be uninitialized
x = u.h1.f + u.h2.g;
^^^^^^
../testdata/p4_16_samples/issue561.p4(35): warning: + may be uninitialized
x = u.h1.f + u.h2.g;
^^^^^^^^^^^^^^^
../testdata/p4_16_samples/issue561.p4(45): warning: [].h2.g may be uninitialized
x = x + u2[1].h2.g + u2[0].h1.f;
^^^^^^^^^^
../testdata/p4_16_samples/issue561.p4(45): warning: + may be uninitialized
x = x + u2[1].h2.g + u2[0].h1.f;
^^^^^^^^^^^^^^
../testdata/p4_16_samples/issue561.p4(45): warning: + may be uninitialized
x = x + u2[1].h2.g + u2[0].h1.f;
^^^^^^^^^^^^^^^^^^^^^^^^^^^
18 changes: 0 additions & 18 deletions testdata/p4_16_samples_outputs/uninit.p4-stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,24 @@
../testdata/p4_16_samples/uninit.p4(41): warning: h.data3 may be uninitialized
h.data2 = h.data3 + 1; // uninitialized
^^^^^^^
../testdata/p4_16_samples/uninit.p4(41): warning: + may be uninitialized
h.data2 = h.data3 + 1; // uninitialized
^^^^^^^^^^^
../testdata/p4_16_samples/uninit.p4(42): warning: [] may not be completely initialized
stack[0] = stack[1]; // uninitialized
^^^^^^^^
../testdata/p4_16_samples/uninit.p4(62): warning: c may be uninitialized
c = !c; // uninitialized;
^
../testdata/p4_16_samples/uninit.p4(62): warning: ! may be uninitialized
c = !c; // uninitialized;
^^
../testdata/p4_16_samples/uninit.p4(82): warning: b may be uninitialized
b = b + 1; // uninitialized
^
../testdata/p4_16_samples/uninit.p4(82): warning: + may be uninitialized
b = b + 1; // uninitialized
^^^^^
../testdata/p4_16_samples/uninit.p4(86): warning: e may be uninitialized
if (e > 0) { // uninitialized
^
../testdata/p4_16_samples/uninit.p4(86): warning: > may be uninitialized
if (e > 0) { // uninitialized
^^^^^
../testdata/p4_16_samples/uninit.p4(92): warning: e may be uninitialized
e = e + 1; // uninitialized
^
../testdata/p4_16_samples/uninit.p4(92): warning: + may be uninitialized
e = e + 1; // uninitialized
^^^^^
../testdata/p4_16_samples/uninit.p4(97): warning: touched may be uninitialized
touched = !touched; // uninitialized
^^^^^^^
../testdata/p4_16_samples/uninit.p4(97): warning: ! may be uninitialized
touched = !touched; // uninitialized
^^^^^^^^
../testdata/p4_16_samples/uninit.p4(68): warning: out parameter v may be uninitialized when c terminates
control c(out bit<32> v) { // uninitialized
^
Expand Down