Skip to content

Commit

Permalink
[clang] Fix static analyzer concerns in #embed code
Browse files Browse the repository at this point in the history
1. Dead code int LookupEmbedFile. The loop always exited on the first
   iteration. This was also causing a bug of not checking all
   directories provided by --embed-dir

2. Use of uninitialized variable CurTok LexEmbedParameters. It was used
   to initialize the field which seems to be unused. Removed unused
   field, this way CurTok should be initialized by Lex method.
  • Loading branch information
Fznamznon committed Jul 17, 2024
1 parent 9b9194a commit 178c66c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion clang/include/clang/Lex/PPEmbedParameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ struct LexEmbedParametersResult {
std::optional<PPEmbedParameterIfEmpty> MaybeIfEmptyParam;
std::optional<PPEmbedParameterPrefix> MaybePrefixParam;
std::optional<PPEmbedParameterSuffix> MaybeSuffixParam;
SourceRange ParamRange;
int UnrecognizedParams;

size_t PrefixTokenCount() const {
Expand Down
8 changes: 3 additions & 5 deletions clang/lib/Lex/PPDirectives.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,9 @@ Preprocessor::LookupEmbedFile(StringRef Filename, bool isAngled, bool OpenFile,
SeparateComponents(LookupPath, Entry, Filename, false);
llvm::Expected<FileEntryRef> ShouldBeEntry =
FM.getFileRef(LookupPath, OpenFile);
return llvm::expectedToOptional(std::move(ShouldBeEntry));
if (ShouldBeEntry)
return llvm::expectedToOptional(std::move(ShouldBeEntry));
llvm::consumeError(ShouldBeEntry.takeError());
}
return std::nullopt;
}
Expand Down Expand Up @@ -3624,12 +3626,10 @@ Preprocessor::LexEmbedParameters(Token &CurTok, bool ForHasEmbed) {
LexEmbedParametersResult Result{};
SmallVector<Token, 2> ParameterTokens;
tok::TokenKind EndTokenKind = ForHasEmbed ? tok::r_paren : tok::eod;
Result.ParamRange = {CurTok.getLocation(), CurTok.getLocation()};

auto DiagMismatchedBracesAndSkipToEOD =
[&](tok::TokenKind Expected,
std::pair<tok::TokenKind, SourceLocation> Matches) {
Result.ParamRange.setEnd(CurTok.getEndLoc());
Diag(CurTok, diag::err_expected) << Expected;
Diag(Matches.second, diag::note_matching) << Matches.first;
if (CurTok.isNot(tok::eod))
Expand All @@ -3638,7 +3638,6 @@ Preprocessor::LexEmbedParameters(Token &CurTok, bool ForHasEmbed) {

auto ExpectOrDiagAndSkipToEOD = [&](tok::TokenKind Kind) {
if (CurTok.isNot(Kind)) {
Result.ParamRange.setEnd(CurTok.getEndLoc());
Diag(CurTok, diag::err_expected) << Kind;
if (CurTok.isNot(tok::eod))
DiscardUntilEndOfDirective(CurTok);
Expand Down Expand Up @@ -3872,7 +3871,6 @@ Preprocessor::LexEmbedParameters(Token &CurTok, bool ForHasEmbed) {
}
}
}
Result.ParamRange.setEnd(CurTok.getLocation());
return Result;
}

Expand Down
3 changes: 2 additions & 1 deletion clang/test/Preprocessor/embed_file_not_found_chevron.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -std=c23 %s -E -verify
// RUN: %clang_cc1 -std=c23 %s -E -verify --embed-dir=%S --embed-dir=%S/Inputs

#embed <jk.txt>
#embed <nfejfNejAKFe>
// expected-error@-1 {{'nfejfNejAKFe' file not found}}

0 comments on commit 178c66c

Please sign in to comment.