Skip to content

[SYCLomatic] Fix coverity issue 0807 #2227

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
ziranzha merged 1 commit into from
Aug 12, 2024
Merged

[SYCLomatic] Fix coverity issue 0807 #2227

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
2 changes: 1 addition & 1 deletion clang/lib/DPCT/AnalysisInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ void DpctGlobalInfo::processCudaArchMacro() {
}

void DpctGlobalInfo::generateHostCode(tooling::Replacements &ProcessedReplList,
HostDeviceFuncLocInfo Info, unsigned ID) {
HostDeviceFuncLocInfo &Info, unsigned ID) {
std::vector<std::shared_ptr<ExtReplacement>> ExtraRepl;

unsigned int Pos, Len;
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/DPCT/AnalysisInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@ class DpctGlobalInfo {
void buildReplacements();
void processCudaArchMacro();
void generateHostCode(tooling::Replacements &ProcessedReplList,
HostDeviceFuncLocInfo Info, unsigned ID);
HostDeviceFuncLocInfo &Info, unsigned ID);
void postProcess();
void cacheFileRepl(clang::tooling::UnifiedPath FilePath,
std::pair<std::shared_ptr<ExtReplacements>,
Expand Down
5 changes: 5 additions & 0 deletions clang/lib/Lex/PPDirectives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,12 @@ Preprocessor::LookupEmbedFile(StringRef Filename, bool isAngled, bool OpenFile,
SeparateComponents(LookupPath, Entry, Filename, false);
llvm::Expected<FileEntryRef> ShouldBeEntry =
FM.getFileRef(LookupPath, OpenFile);
#ifdef SYCLomatic_CUSTOMIZATION
if(auto Result = llvm::expectedToOptional(std::move(ShouldBeEntry)))
return Result;
#else
return llvm::expectedToOptional(std::move(ShouldBeEntry));
#endif //SYCLomatic_CUSTOMIZATION
}
return std::nullopt;
}
Expand Down