Skip to content

Commit 6a8b989

Browse files
abhinavgabaabhinavgaba
committed
Merge from 'main' to 'sycl-web' (#6)
 CONFLICT (content): Merge conflict in clang/lib/Sema/Sema.cpp
2 parents de32a08 + 5922f23 commit 6a8b989

36 files changed

+221
-281
lines changed

‎clang/include/clang/AST/ASTContext.h

+3-17
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ class ASTContext : public RefCountedBase<ASTContext> {
459459
friend class ASTWriter;
460460
template <class> friend class serialization::AbstractTypeReader;
461461
friend class CXXRecordDecl;
462-
friend class IncrementalParser;
463462

464463
/// A mapping to contain the template or declaration that
465464
/// a variable declaration describes or was instantiated from,
@@ -568,7 +567,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
568567
ImportDecl *FirstLocalImport = nullptr;
569568
ImportDecl *LastLocalImport = nullptr;
570569

571-
TranslationUnitDecl *TUDecl = nullptr;
570+
TranslationUnitDecl *TUDecl;
572571
mutable ExternCContextDecl *ExternCContext = nullptr;
573572
mutable BuiltinTemplateDecl *MakeIntegerSeqDecl = nullptr;
574573
mutable BuiltinTemplateDecl *TypePackElementDecl = nullptr;
@@ -625,7 +624,6 @@ class ASTContext : public RefCountedBase<ASTContext> {
625624
IdentifierTable &Idents;
626625
SelectorTable &Selectors;
627626
Builtin::Context &BuiltinInfo;
628-
const TranslationUnitKind TUKind;
629627
mutable DeclarationNameTable DeclarationNames;
630628
IntrusiveRefCntPtr<ExternalASTSource> ExternalSource;
631629
ASTMutationListener *Listener = nullptr;
@@ -1024,18 +1022,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
10241022
/// Get the initializations to perform when importing a module, if any.
10251023
ArrayRef<Decl*> getModuleInitializers(Module *M);
10261024

1027-
TranslationUnitDecl *getTranslationUnitDecl() const {
1028-
return TUDecl->getMostRecentDecl();
1029-
}
1030-
void addTranslationUnitDecl() {
1031-
assert(!TUDecl || TUKind == TU_Incremental);
1032-
TranslationUnitDecl *NewTUDecl = TranslationUnitDecl::Create(*this);
1033-
if (TraversalScope.empty() || TraversalScope.back() == TUDecl)
1034-
TraversalScope = {NewTUDecl};
1035-
if (TUDecl)
1036-
NewTUDecl->setPreviousDecl(TUDecl);
1037-
TUDecl = NewTUDecl;
1038-
}
1025+
TranslationUnitDecl *getTranslationUnitDecl() const { return TUDecl; }
10391026

10401027
ExternCContextDecl *getExternCContextDecl() const;
10411028
BuiltinTemplateDecl *getMakeIntegerSeqDecl() const;
@@ -1117,8 +1104,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
11171104
llvm::DenseSet<const VarDecl *> CUDADeviceVarODRUsedByHost;
11181105

11191106
ASTContext(LangOptions &LOpts, SourceManager &SM, IdentifierTable &idents,
1120-
SelectorTable &sels, Builtin::Context &builtins,
1121-
TranslationUnitKind TUKind);
1107+
SelectorTable &sels, Builtin::Context &builtins);
11221108
ASTContext(const ASTContext &) = delete;
11231109
ASTContext &operator=(const ASTContext &) = delete;
11241110
~ASTContext();

‎clang/include/clang/AST/Decl.h

+1-27
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,7 @@ class UnresolvedSetImpl;
7979
class VarTemplateDecl;
8080

8181
/// The top declaration context.
82-
class TranslationUnitDecl : public Decl,
83-
public DeclContext,
84-
public Redeclarable<TranslationUnitDecl> {
85-
using redeclarable_base = Redeclarable<TranslationUnitDecl>;
86-
87-
TranslationUnitDecl *getNextRedeclarationImpl() override {
88-
return getNextRedeclaration();
89-
}
90-
91-
TranslationUnitDecl *getPreviousDeclImpl() override {
92-
return getPreviousDecl();
93-
}
94-
95-
TranslationUnitDecl *getMostRecentDeclImpl() override {
96-
return getMostRecentDecl();
97-
}
98-
82+
class TranslationUnitDecl : public Decl, public DeclContext {
9983
ASTContext &Ctx;
10084

10185
/// The (most recently entered) anonymous namespace for this
@@ -107,16 +91,6 @@ class TranslationUnitDecl : public Decl,
10791
virtual void anchor();
10892

10993
public:
110-
using redecl_range = redeclarable_base::redecl_range;
111-
using redecl_iterator = redeclarable_base::redecl_iterator;
112-
113-
using redeclarable_base::getMostRecentDecl;
114-
using redeclarable_base::getPreviousDecl;
115-
using redeclarable_base::isFirstDecl;
116-
using redeclarable_base::redecls;
117-
using redeclarable_base::redecls_begin;
118-
using redeclarable_base::redecls_end;
119-
12094
ASTContext &getASTContext() const { return Ctx; }
12195

12296
NamespaceDecl *getAnonymousNamespace() const { return AnonymousNamespace; }

‎clang/include/clang/AST/Redeclarable.h

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ class Redeclarable {
193193
public:
194194
friend class ASTDeclReader;
195195
friend class ASTDeclWriter;
196-
friend class IncrementalParser;
197196

198197
Redeclarable(const ASTContext &Ctx)
199198
: RedeclLink(LatestDeclLink(Ctx)),

‎clang/include/clang/Basic/LangOptions.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -715,11 +715,7 @@ enum TranslationUnitKind {
715715
TU_Prefix,
716716

717717
/// The translation unit is a module.
718-
TU_Module,
719-
720-
/// The translation unit is a is a complete translation unit that we might
721-
/// incrementally extend later.
722-
TU_Incremental
718+
TU_Module
723719
};
724720

725721
} // namespace clang

‎clang/include/clang/Interpreter/Interpreter.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef LLVM_CLANG_INTERPRETER_INTERPRETER_H
1515
#define LLVM_CLANG_INTERPRETER_INTERPRETER_H
1616

17-
#include "clang/Interpreter/PartialTranslationUnit.h"
17+
#include "clang/Interpreter/Transaction.h"
1818

1919
#include "llvm/Support/Error.h"
2020

@@ -55,14 +55,14 @@ class Interpreter {
5555
static llvm::Expected<std::unique_ptr<Interpreter>>
5656
create(std::unique_ptr<CompilerInstance> CI);
5757
const CompilerInstance *getCompilerInstance() const;
58-
llvm::Expected<PartialTranslationUnit &> Parse(llvm::StringRef Code);
59-
llvm::Error Execute(PartialTranslationUnit &T);
58+
llvm::Expected<Transaction &> Parse(llvm::StringRef Code);
59+
llvm::Error Execute(Transaction &T);
6060
llvm::Error ParseAndExecute(llvm::StringRef Code) {
61-
auto PTU = Parse(Code);
62-
if (!PTU)
63-
return PTU.takeError();
64-
if (PTU->TheModule)
65-
return Execute(*PTU);
61+
auto ErrOrTransaction = Parse(Code);
62+
if (auto Err = ErrOrTransaction.takeError())
63+
return Err;
64+
if (ErrOrTransaction->TheModule)
65+
return Execute(*ErrOrTransaction);
6666
return llvm::Error::success();
6767
}
6868
};

‎clang/include/clang/Interpreter/PartialTranslationUnit.h ‎clang/include/clang/Interpreter/Transaction.h

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,29 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313

14-
#ifndef LLVM_CLANG_INTERPRETER_PARTIALTRANSLATIONUNIT_H
15-
#define LLVM_CLANG_INTERPRETER_PARTIALTRANSLATIONUNIT_H
14+
#ifndef LLVM_CLANG_INTERPRETER_TRANSACTION_H
15+
#define LLVM_CLANG_INTERPRETER_TRANSACTION_H
1616

1717
#include <memory>
18+
#include <vector>
1819

1920
namespace llvm {
2021
class Module;
2122
}
2223

2324
namespace clang {
2425

25-
class TranslationUnitDecl;
26+
class DeclGroupRef;
2627

2728
/// The class keeps track of various objects created as part of processing
2829
/// incremental inputs.
29-
struct PartialTranslationUnit {
30-
TranslationUnitDecl *TUPart = nullptr;
30+
struct Transaction {
31+
/// The decls created for the input.
32+
std::vector<clang::DeclGroupRef> Decls;
3133

3234
/// The llvm IR produced for the input.
3335
std::unique_ptr<llvm::Module> TheModule;
3436
};
3537
} // namespace clang
3638

37-
#endif // LLVM_CLANG_INTERPRETER_PARTIALTRANSLATIONUNIT_H
39+
#endif // LLVM_CLANG_INTERPRETER_TRANSACTION_H

‎clang/include/clang/Lex/Preprocessor.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,9 @@ class Preprocessor {
264264
/// avoid tearing the Lexer and etc. down).
265265
bool IncrementalProcessing = false;
266266

267-
public:
268267
/// The kind of translation unit we are processing.
269-
const TranslationUnitKind TUKind;
268+
TranslationUnitKind TUKind;
270269

271-
private:
272270
/// The code-completion handler.
273271
CodeCompletionHandler *CodeComplete = nullptr;
274272

‎clang/include/clang/Sema/Sema.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1545,7 +1545,7 @@ class Sema final {
15451545
/// initializers for tentative definitions in C) once parsing has
15461546
/// completed. Modules and precompiled headers perform different kinds of
15471547
/// checks.
1548-
const TranslationUnitKind TUKind;
1548+
TranslationUnitKind TUKind;
15491549

15501550
llvm::BumpPtrAllocator BumpAlloc;
15511551

‎clang/lib/AST/ASTContext.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ static bool isAddrSpaceMapManglingEnabled(const TargetInfo &TI,
966966

967967
ASTContext::ASTContext(LangOptions &LOpts, SourceManager &SM,
968968
IdentifierTable &idents, SelectorTable &sels,
969-
Builtin::Context &builtins, TranslationUnitKind TUKind)
969+
Builtin::Context &builtins)
970970
: ConstantArrayTypes(this_()), FunctionProtoTypes(this_()),
971971
TemplateSpecializationTypes(this_()),
972972
DependentTemplateSpecializationTypes(this_()), AutoTypes(this_()),
@@ -978,10 +978,11 @@ ASTContext::ASTContext(LangOptions &LOpts, SourceManager &SM,
978978
LangOpts.XRayAttrListFiles, SM)),
979979
ProfList(new ProfileList(LangOpts.ProfileListFiles, SM)),
980980
PrintingPolicy(LOpts), Idents(idents), Selectors(sels),
981-
BuiltinInfo(builtins), TUKind(TUKind), DeclarationNames(*this),
982-
Comments(SM), CommentCommandTraits(BumpAlloc, LOpts.CommentOpts),
981+
BuiltinInfo(builtins), DeclarationNames(*this), Comments(SM),
982+
CommentCommandTraits(BumpAlloc, LOpts.CommentOpts),
983983
CompCategories(this_()), LastSDM(nullptr, 0) {
984-
addTranslationUnitDecl();
984+
TUDecl = TranslationUnitDecl::Create(*this);
985+
TraversalScope = {TUDecl};
985986
}
986987

987988
ASTContext::~ASTContext() {
@@ -1195,10 +1196,9 @@ ExternCContextDecl *ASTContext::getExternCContextDecl() const {
11951196
BuiltinTemplateDecl *
11961197
ASTContext::buildBuiltinTemplateDecl(BuiltinTemplateKind BTK,
11971198
const IdentifierInfo *II) const {
1198-
auto *BuiltinTemplate =
1199-
BuiltinTemplateDecl::Create(*this, getTranslationUnitDecl(), II, BTK);
1199+
auto *BuiltinTemplate = BuiltinTemplateDecl::Create(*this, TUDecl, II, BTK);
12001200
BuiltinTemplate->setImplicit();
1201-
getTranslationUnitDecl()->addDecl(BuiltinTemplate);
1201+
TUDecl->addDecl(BuiltinTemplate);
12021202

12031203
return BuiltinTemplate;
12041204
}
@@ -1490,7 +1490,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
14901490
// MSVC predeclares struct _GUID, and we need it to create MSGuidDecls.
14911491
if (LangOpts.MicrosoftExt || LangOpts.Borland) {
14921492
MSGuidTagDecl = buildImplicitRecord("_GUID");
1493-
getTranslationUnitDecl()->addDecl(MSGuidTagDecl);
1493+
TUDecl->addDecl(MSGuidTagDecl);
14941494
}
14951495
}
14961496

@@ -6634,7 +6634,7 @@ QualType ASTContext::getCFConstantStringType() const {
66346634
QualType ASTContext::getObjCSuperType() const {
66356635
if (ObjCSuperType.isNull()) {
66366636
RecordDecl *ObjCSuperTypeDecl = buildImplicitRecord("objc_super");
6637-
getTranslationUnitDecl()->addDecl(ObjCSuperTypeDecl);
6637+
TUDecl->addDecl(ObjCSuperTypeDecl);
66386638
ObjCSuperType = getTagDeclType(ObjCSuperTypeDecl);
66396639
}
66406640
return ObjCSuperType;

‎clang/lib/AST/Decl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ bool Decl::isOutOfLine() const {
102102

103103
TranslationUnitDecl::TranslationUnitDecl(ASTContext &ctx)
104104
: Decl(TranslationUnit, nullptr, SourceLocation()),
105-
DeclContext(TranslationUnit), redeclarable_base(ctx), Ctx(ctx) {}
105+
DeclContext(TranslationUnit), Ctx(ctx) {}
106106

107107
//===----------------------------------------------------------------------===//
108108
// NamedDecl Implementation

‎clang/lib/AST/DeclBase.cpp

+13-18
Original file line numberDiff line numberDiff line change
@@ -1219,6 +1219,7 @@ bool DeclContext::Encloses(const DeclContext *DC) const {
12191219

12201220
DeclContext *DeclContext::getPrimaryContext() {
12211221
switch (getDeclKind()) {
1222+
case Decl::TranslationUnit:
12221223
case Decl::ExternCContext:
12231224
case Decl::LinkageSpec:
12241225
case Decl::Export:
@@ -1230,8 +1231,6 @@ DeclContext *DeclContext::getPrimaryContext() {
12301231
// There is only one DeclContext for these entities.
12311232
return this;
12321233

1233-
case Decl::TranslationUnit:
1234-
return static_cast<TranslationUnitDecl *>(this)->getFirstDecl();
12351234
case Decl::Namespace:
12361235
// The original namespace is our primary context.
12371236
return static_cast<NamespaceDecl *>(this)->getOriginalNamespace();
@@ -1286,25 +1285,21 @@ DeclContext *DeclContext::getPrimaryContext() {
12861285
}
12871286
}
12881287

1289-
template <typename T>
1290-
void collectAllContextsImpl(T *Self, SmallVectorImpl<DeclContext *> &Contexts) {
1291-
for (T *D = Self->getMostRecentDecl(); D; D = D->getPreviousDecl())
1292-
Contexts.push_back(D);
1293-
1294-
std::reverse(Contexts.begin(), Contexts.end());
1295-
}
1296-
1297-
void DeclContext::collectAllContexts(SmallVectorImpl<DeclContext *> &Contexts) {
1288+
void
1289+
DeclContext::collectAllContexts(SmallVectorImpl<DeclContext *> &Contexts){
12981290
Contexts.clear();
12991291

1300-
Decl::Kind Kind = getDeclKind();
1301-
1302-
if (Kind == Decl::TranslationUnit)
1303-
collectAllContextsImpl(static_cast<TranslationUnitDecl *>(this), Contexts);
1304-
else if (Kind == Decl::Namespace)
1305-
collectAllContextsImpl(static_cast<NamespaceDecl *>(this), Contexts);
1306-
else
1292+
if (getDeclKind() != Decl::Namespace) {
13071293
Contexts.push_back(this);
1294+
return;
1295+
}
1296+
1297+
auto *Self = static_cast<NamespaceDecl *>(this);
1298+
for (NamespaceDecl *N = Self->getMostRecentDecl(); N;
1299+
N = N->getPreviousDecl())
1300+
Contexts.push_back(N);
1301+
1302+
std::reverse(Contexts.begin(), Contexts.end());
13081303
}
13091304

13101305
std::pair<Decl *, Decl *>

‎clang/lib/Frontend/ASTUnit.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,7 @@ std::unique_ptr<ASTUnit> ASTUnit::LoadFromASTFile(
807807
if (ToLoad >= LoadASTOnly)
808808
AST->Ctx = new ASTContext(*AST->LangOpts, AST->getSourceManager(),
809809
PP.getIdentifierTable(), PP.getSelectorTable(),
810-
PP.getBuiltinInfo(),
811-
AST->getTranslationUnitKind());
810+
PP.getBuiltinInfo());
812811

813812
DisableValidationForModuleKind disableValid =
814813
DisableValidationForModuleKind::None;

‎clang/lib/Frontend/CompilerInstance.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ void CompilerInstance::createASTContext() {
554554
Preprocessor &PP = getPreprocessor();
555555
auto *Context = new ASTContext(getLangOpts(), PP.getSourceManager(),
556556
PP.getIdentifierTable(), PP.getSelectorTable(),
557-
PP.getBuiltinInfo(), PP.TUKind);
557+
PP.getBuiltinInfo());
558558
Context->InitBuiltinTypes(getTarget(), getAuxTarget());
559559
setASTContext(Context);
560560
}

0 commit comments

Comments
 (0)