Skip to content

Commit 0bb7fa0

Browse files
frederick-vs-jafrederick-vs-ja
committed
Merge branch 'main' into fix-deque-const_iterator
2 parents bbaa690 + 7df458b commit 0bb7fa0

File tree

22 files changed

+2033
-357
lines changed

22 files changed

+2033
-357
lines changed

‎clang-tools-extra/clangd/IncludeCleaner.cpp

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ bool mayConsiderUnused(const Inclusion &Inc, ParsedAST &AST,
117117

118118
std::vector<Diag> generateMissingIncludeDiagnostics(
119119
ParsedAST &AST, llvm::ArrayRef<MissingIncludeDiagInfo> MissingIncludes,
120-
llvm::StringRef Code, HeaderFilter IgnoreHeaders, const ThreadsafeFS &TFS) {
120+
llvm::StringRef Code, HeaderFilter IgnoreHeaders,
121+
HeaderFilter AngledHeaders, HeaderFilter QuotedHeaders,
122+
const ThreadsafeFS &TFS) {
121123
std::vector<Diag> Result;
122124
const SourceManager &SM = AST.getSourceManager();
123125
const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID());
@@ -141,7 +143,18 @@ std::vector<Diag> generateMissingIncludeDiagnostics(
141143
AST.getPreprocessor().getHeaderSearchInfo(), MainFile});
142144

143145
llvm::StringRef HeaderRef{Spelling};
146+
144147
bool Angled = HeaderRef.starts_with("<");
148+
if (SymbolWithMissingInclude.Providers.front().kind() ==
149+
include_cleaner::Header::Kind::Physical) {
150+
for (auto &Filter : Angled ? QuotedHeaders : AngledHeaders) {
151+
if (Filter(ResolvedPath)) {
152+
Angled = !Angled;
153+
break;
154+
}
155+
}
156+
}
157+
145158
// We might suggest insertion of an existing include in edge cases, e.g.,
146159
// include is present in a PP-disabled region, or spelling of the header
147160
// turns out to be the same as one of the unresolved includes in the
@@ -151,6 +164,11 @@ std::vector<Diag> generateMissingIncludeDiagnostics(
151164
if (!Replacement.has_value())
152165
continue;
153166

167+
if (Angled != (Spelling.front() == '<')) {
168+
Spelling.front() = Angled ? '<' : '"';
169+
Spelling.back() = Angled ? '>' : '"';
170+
}
171+
154172
Diag &D = Result.emplace_back();
155173
D.Message =
156174
llvm::formatv("No header providing \"{0}\" is directly included",
@@ -481,18 +499,19 @@ bool isPreferredProvider(const Inclusion &Inc,
481499
return false; // no header provides the symbol
482500
}
483501

484-
std::vector<Diag>
485-
issueIncludeCleanerDiagnostics(ParsedAST &AST, llvm::StringRef Code,
486-
const IncludeCleanerFindings &Findings,
487-
const ThreadsafeFS &TFS,
488-
HeaderFilter IgnoreHeaders) {
502+
std::vector<Diag> issueIncludeCleanerDiagnostics(
503+
ParsedAST &AST, llvm::StringRef Code,
504+
const IncludeCleanerFindings &Findings, const ThreadsafeFS &TFS,
505+
HeaderFilter IgnoreHeaders, HeaderFilter AngledHeaders,
506+
HeaderFilter QuotedHeaders) {
489507
trace::Span Tracer("IncludeCleaner::issueIncludeCleanerDiagnostics");
490508
std::vector<Diag> UnusedIncludes = generateUnusedIncludeDiagnostics(
491509
AST.tuPath(), Findings.UnusedIncludes, Code, IgnoreHeaders);
492510
std::optional<Fix> RemoveAllUnused = removeAllUnusedIncludes(UnusedIncludes);
493511

494512
std::vector<Diag> MissingIncludeDiags = generateMissingIncludeDiagnostics(
495-
AST, Findings.MissingIncludes, Code, IgnoreHeaders, TFS);
513+
AST, Findings.MissingIncludes, Code, IgnoreHeaders, AngledHeaders,
514+
QuotedHeaders, TFS);
496515
std::optional<Fix> AddAllMissing = addAllMissingIncludes(MissingIncludeDiags);
497516

498517
std::optional<Fix> FixAll;

‎clang-tools-extra/clangd/IncludeCleaner.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ IncludeCleanerFindings
5757
computeIncludeCleanerFindings(ParsedAST &AST,
5858
bool AnalyzeAngledIncludes = false);
5959

60-
std::vector<Diag>
61-
issueIncludeCleanerDiagnostics(ParsedAST &AST, llvm::StringRef Code,
62-
const IncludeCleanerFindings &Findings,
63-
const ThreadsafeFS &TFS,
64-
HeaderFilter IgnoreHeader = {});
60+
std::vector<Diag> issueIncludeCleanerDiagnostics(
61+
ParsedAST &AST, llvm::StringRef Code,
62+
const IncludeCleanerFindings &Findings, const ThreadsafeFS &TFS,
63+
HeaderFilter IgnoreHeader = {}, HeaderFilter AngledHeaders = {},
64+
HeaderFilter QuotedHeaders = {});
6565

6666
/// Converts the clangd include representation to include-cleaner
6767
/// include representation.

‎clang-tools-extra/clangd/ParsedAST.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,9 @@ std::vector<Diag> getIncludeCleanerDiags(ParsedAST &AST, llvm::StringRef Code,
381381
Findings.MissingIncludes.clear();
382382
if (SuppressUnused)
383383
Findings.UnusedIncludes.clear();
384-
return issueIncludeCleanerDiagnostics(AST, Code, Findings, TFS,
385-
Cfg.Diagnostics.Includes.IgnoreHeader);
384+
return issueIncludeCleanerDiagnostics(
385+
AST, Code, Findings, TFS, Cfg.Diagnostics.Includes.IgnoreHeader,
386+
Cfg.Style.AngledHeaders, Cfg.Style.QuotedHeaders);
386387
}
387388

388389
tidy::ClangTidyCheckFactories

‎clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,16 @@ TEST(IncludeCleaner, ComputeMissingHeaders) {
220220
TEST(IncludeCleaner, GenerateMissingHeaderDiags) {
221221
Annotations MainFile(R"cpp(
222222
#include "a.h"
223+
#include "angled_wrapper.h"
223224
#include "all.h"
224225
$insert_b[[]]#include "baz.h"
225226
#include "dir/c.h"
226227
$insert_d[[]]$insert_foo[[]]#include "fuzz.h"
227228
#include "header.h"
228-
$insert_foobar[[]]#include <e.h>
229-
$insert_f[[]]$insert_vector[[]]
229+
$insert_foobar[[]]$insert_quoted[[]]$insert_quoted2[[]]#include "quoted_wrapper.h"
230+
$insert_angled[[]]#include <e.h>
231+
$insert_f[[]]#include <quoted2_wrapper.h>
232+
$insert_vector[[]]
230233
231234
#define DEF(X) const Foo *X;
232235
#define BAZ(X) const X x
@@ -237,6 +240,9 @@ TEST(IncludeCleaner, GenerateMissingHeaderDiags) {
237240
238241
void foo() {
239242
$b[[b]]();
243+
$angled[[angled]]();
244+
$quoted[[quoted]]();
245+
$quoted2[[quoted2]]();
240246
241247
ns::$bar[[Bar]] bar;
242248
bar.d();
@@ -263,12 +269,22 @@ TEST(IncludeCleaner, GenerateMissingHeaderDiags) {
263269
TU.AdditionalFiles["a.h"] = guard("#include \"b.h\"");
264270
TU.AdditionalFiles["b.h"] = guard("void b();");
265271

272+
TU.AdditionalFiles["angled_wrapper.h"] = guard("#include <angled.h>");
273+
TU.AdditionalFiles["angled.h"] = guard("void angled();");
274+
TU.ExtraArgs.push_back("-I" + testPath("."));
275+
276+
TU.AdditionalFiles["quoted_wrapper.h"] = guard("#include \"quoted.h\"");
277+
TU.AdditionalFiles["quoted.h"] = guard("void quoted();");
278+
266279
TU.AdditionalFiles["dir/c.h"] = guard("#include \"d.h\"");
267280
TU.AdditionalFiles["dir/d.h"] =
268281
guard("namespace ns { struct Bar { void d(); }; }");
269282

270283
TU.AdditionalFiles["system/e.h"] = guard("#include <f.h>");
271284
TU.AdditionalFiles["system/f.h"] = guard("void f();");
285+
TU.AdditionalFiles["system/quoted2_wrapper.h"] =
286+
guard("#include <system/quoted2.h>");
287+
TU.AdditionalFiles["system/quoted2.h"] = guard("void quoted2();");
272288
TU.ExtraArgs.push_back("-isystem" + testPath("system"));
273289

274290
TU.AdditionalFiles["fuzz.h"] = guard("#include \"buzz.h\"");
@@ -297,7 +313,15 @@ TEST(IncludeCleaner, GenerateMissingHeaderDiags) {
297313
Findings.UnusedIncludes.clear();
298314
std::vector<clangd::Diag> Diags = issueIncludeCleanerDiagnostics(
299315
AST, TU.Code, Findings, MockFS(),
300-
{[](llvm::StringRef Header) { return Header.ends_with("buzz.h"); }});
316+
/*IgnoreHeaders=*/{[](llvm::StringRef Header) {
317+
return Header.ends_with("buzz.h");
318+
}},
319+
/*AngledHeaders=*/{[](llvm::StringRef Header) {
320+
return Header.contains("angled.h");
321+
}},
322+
/*QuotedHeaders=*/{[](llvm::StringRef Header) {
323+
return Header.contains("quoted.h") || Header.contains("quoted2.h");
324+
}});
301325
EXPECT_THAT(
302326
Diags,
303327
UnorderedElementsAre(
@@ -306,6 +330,23 @@ TEST(IncludeCleaner, GenerateMissingHeaderDiags) {
306330
withFix({Fix(MainFile.range("insert_b"), "#include \"b.h\"\n",
307331
"#include \"b.h\""),
308332
FixMessage("add all missing includes")})),
333+
AllOf(Diag(MainFile.range("angled"),
334+
"No header providing \"angled\" is directly included"),
335+
withFix({Fix(MainFile.range("insert_angled"),
336+
"#include <angled.h>\n", "#include <angled.h>"),
337+
FixMessage("add all missing includes")})),
338+
AllOf(
339+
Diag(MainFile.range("quoted"),
340+
"No header providing \"quoted\" is directly included"),
341+
withFix({Fix(MainFile.range("insert_quoted"),
342+
"#include \"quoted.h\"\n", "#include \"quoted.h\""),
343+
FixMessage("add all missing includes")})),
344+
AllOf(Diag(MainFile.range("quoted2"),
345+
"No header providing \"quoted2\" is directly included"),
346+
withFix(
347+
{Fix(MainFile.range("insert_quoted2"),
348+
"#include \"quoted2.h\"\n", "#include \"quoted2.h\""),
349+
FixMessage("add all missing includes")})),
309350
AllOf(Diag(MainFile.range("bar"),
310351
"No header providing \"ns::Bar\" is directly included"),
311352
withFix({Fix(MainFile.range("insert_d"),

‎clang/lib/CIR/CodeGen/CIRGenValue.h

Lines changed: 70 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include "clang/AST/CharUnits.h"
2020
#include "clang/AST/Type.h"
2121

22-
#include "llvm/ADT/PointerIntPair.h"
23-
2422
#include "mlir/IR/Value.h"
2523

2624
#include "clang/CIR/MissingFeatures.h"
@@ -34,28 +32,85 @@ namespace clang::CIRGen {
3432
class RValue {
3533
enum Flavor { Scalar, Complex, Aggregate };
3634

37-
// Stores first value and flavor.
38-
llvm::PointerIntPair<mlir::Value, 2, Flavor> v1;
39-
// Stores second value and volatility.
40-
llvm::PointerIntPair<llvm::PointerUnion<mlir::Value, int *>, 1, bool> v2;
41-
// Stores element type for aggregate values.
42-
mlir::Type elementType;
35+
union {
36+
// Stores first and second value.
37+
struct {
38+
mlir::Value first;
39+
mlir::Value second;
40+
} vals;
41+
42+
// Stores aggregate address.
43+
Address aggregateAddr;
44+
};
45+
46+
unsigned isVolatile : 1;
47+
unsigned flavor : 2;
4348

4449
public:
45-
bool isScalar() const { return v1.getInt() == Scalar; }
46-
bool isAggregate() const { return v1.getInt() == Aggregate; }
50+
RValue() : vals{nullptr, nullptr}, flavor(Scalar) {}
51+
52+
bool isScalar() const { return flavor == Scalar; }
53+
bool isComplex() const { return flavor == Complex; }
54+
bool isAggregate() const { return flavor == Aggregate; }
55+
56+
bool isVolatileQualified() const { return isVolatile; }
4757

48-
/// Return the mlir::Value of this scalar value.
58+
/// Return the value of this scalar value.
4959
mlir::Value getScalarVal() const {
5060
assert(isScalar() && "Not a scalar!");
51-
return v1.getPointer();
61+
return vals.first;
62+
}
63+
64+
/// Return the real/imag components of this complex value.
65+
std::pair<mlir::Value, mlir::Value> getComplexVal() const {
66+
return std::make_pair(vals.first, vals.second);
67+
}
68+
69+
/// Return the value of the address of the aggregate.
70+
Address getAggregateAddress() const {
71+
assert(isAggregate() && "Not an aggregate!");
72+
return aggregateAddr;
73+
}
74+
75+
mlir::Value getAggregatePointer(QualType pointeeType) const {
76+
return getAggregateAddress().getPointer();
77+
}
78+
79+
static RValue getIgnored() {
80+
// FIXME: should we make this a more explicit state?
81+
return get(nullptr);
5282
}
5383

5484
static RValue get(mlir::Value v) {
5585
RValue er;
56-
er.v1.setPointer(v);
57-
er.v1.setInt(Scalar);
58-
er.v2.setInt(false);
86+
er.vals.first = v;
87+
er.flavor = Scalar;
88+
er.isVolatile = false;
89+
return er;
90+
}
91+
92+
static RValue getComplex(mlir::Value v1, mlir::Value v2) {
93+
RValue er;
94+
er.vals = {v1, v2};
95+
er.flavor = Complex;
96+
er.isVolatile = false;
97+
return er;
98+
}
99+
static RValue getComplex(const std::pair<mlir::Value, mlir::Value> &c) {
100+
return getComplex(c.first, c.second);
101+
}
102+
// FIXME: Aggregate rvalues need to retain information about whether they are
103+
// volatile or not. Remove default to find all places that probably get this
104+
// wrong.
105+
106+
/// Convert an Address to an RValue. If the Address is not
107+
/// signed, create an RValue using the unsigned address. Otherwise, resign the
108+
/// address using the provided type.
109+
static RValue getAggregate(Address addr, bool isVolatile = false) {
110+
RValue er;
111+
er.aggregateAddr = addr;
112+
er.flavor = Aggregate;
113+
er.isVolatile = isVolatile;
59114
return er;
60115
}
61116
};

‎clang/lib/StaticAnalyzer/Core/CheckerHelpers.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,19 @@ std::optional<int> tryExpandAsInteger(StringRef Macro, const Preprocessor &PP) {
129129

130130
// Parse an integer at the end of the macro definition.
131131
const Token &T = FilteredTokens.back();
132-
// FIXME: EOF macro token coming from a PCH file on macOS while marked as
133-
// literal, doesn't contain any literal data
134-
if (!T.isLiteral() || !T.getLiteralData())
132+
133+
if (!T.isLiteral())
135134
return std::nullopt;
136-
StringRef ValueStr = StringRef(T.getLiteralData(), T.getLength());
135+
136+
bool InvalidSpelling = false;
137+
SmallVector<char> Buffer(T.getLength());
138+
// `Preprocessor::getSpelling` can get the spelling of the token regardless of
139+
// whether the macro is defined in a PCH or not:
140+
StringRef ValueStr = PP.getSpelling(T, Buffer, &InvalidSpelling);
141+
142+
if (InvalidSpelling)
143+
return std::nullopt;
144+
137145
llvm::APInt IntValue;
138146
constexpr unsigned AutoSenseRadix = 0;
139147
if (ValueStr.getAsInteger(AutoSenseRadix, IntValue))

‎clang/test/Analysis/pch_crash.cpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)