Skip to content

[sycl-post-link] Avoid copying from nullptr #3963

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

Merged
merged 2 commits into from
Jun 22, 2021
Merged

[sycl-post-link] Avoid copying from nullptr #3963

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fcd84e
[sycl-post-link] Avoid copying from nullptr
vmaksimo Jun 21, 2021
e611841
Update llvm/tools/sycl-post-link/SpecConstants.cpp
vmaksimo Jun 22, 2021
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
3 changes: 2 additions & 1 deletion llvm/tools/sycl-post-link/SpecConstants.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ void collectCompositeElementsDefaultValuesRecursive(
} else { // Assume that we encountered some scalar element
int NumBytes = Ty->getScalarSizeInBits() / CHAR_BIT +
(Ty->getScalarSizeInBits() % 8 != 0);
char *CharPtr;
char *CharPtr = nullptr;

if (auto IntConst = dyn_cast<ConstantInt>(C)) {
auto Val = IntConst->getValue().getZExtValue();
Expand All @@ -336,6 +336,7 @@ void collectCompositeElementsDefaultValuesRecursive(
CharPtr = reinterpret_cast<char *>(&v);
}
}
assert(CharPtr && "Unexpected constant type");
std::copy_n(CharPtr, NumBytes, std::back_inserter(DefaultValues));
Offset += NumBytes;
}
Expand Down