diff options
author | Alex Lorenz <arphaman@gmail.com> | 2017-07-31 13:37:50 +0000 |
---|---|---|
committer | Alex Lorenz <arphaman@gmail.com> | 2017-07-31 13:37:50 +0000 |
commit | 8d50601757e659c9ef58452c57abe0940fc7bac3 (patch) | |
tree | 56a806aefba47442c8c31741dbdddcfad843a0cb /lib/Sema | |
parent | 9d0a93f0ec7b529cdbfaa2a553ffee1a4f7088ff (diff) | |
download | clang-8d50601757e659c9ef58452c57abe0940fc7bac3.tar.gz |
-Wpragma-pack: add an additional note and fixit when warning
about unterminated push directives that are followed by a reset
('#pragma pack()')
This has been suggested by Hans Wennborg.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@309559 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema')
-rw-r--r-- | lib/Sema/SemaAttr.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/Sema/SemaAttr.cpp b/lib/Sema/SemaAttr.cpp index f7f1f61873..4ba2a317e1 100644 --- a/lib/Sema/SemaAttr.cpp +++ b/lib/Sema/SemaAttr.cpp @@ -250,8 +250,22 @@ void Sema::DiagnoseNonDefaultPragmaPack(PragmaPackDiagnoseKind Kind, void Sema::DiagnoseUnterminatedPragmaPack() { if (PackStack.Stack.empty()) return; - for (const auto &StackSlot : llvm::reverse(PackStack.Stack)) + bool IsInnermost = true; + for (const auto &StackSlot : llvm::reverse(PackStack.Stack)) { Diag(StackSlot.PragmaPushLocation, diag::warn_pragma_pack_no_pop_eof); + // The user might have already reset the alignment, so suggest replacing + // the reset with a pop. + if (IsInnermost && PackStack.CurrentValue == PackStack.DefaultValue) { + DiagnosticBuilder DB = Diag(PackStack.CurrentPragmaLocation, + diag::note_pragma_pack_pop_instead_reset); + SourceLocation FixItLoc = Lexer::findLocationAfterToken( + PackStack.CurrentPragmaLocation, tok::l_paren, SourceMgr, LangOpts, + /*SkipTrailing=*/false); + if (FixItLoc.isValid()) + DB << FixItHint::CreateInsertion(FixItLoc, "pop"); + } + IsInnermost = false; + } } void Sema::ActOnPragmaMSStruct(PragmaMSStructKind Kind) { |