Vendor import of clang release_90 branch r369369: - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2019-08-20 21:35:28 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2019-08-20 21:35:28 +0000
commit	e489f4451b6244af10ec548a442f4d5b6870b0c1 (patch)
tree	5dc6cd37794791820f8ccd8610334583a14ea68a /lib/Sema
parent	2298981669bf3bd63335a4be179bc0f96823a8f4 (diff)

Vendor import of clang release_90 branch r369369:vendor/clang/clang-release_90-r369369

https://llvm.org/svn/llvm-project/cfe/branches/release_90@369369

Notes

svn path=/vendor/clang/dist-release_90/; revision=351305 svn path=/vendor/clang/clang-release_90-r369369/; revision=351306; tag=vendor/clang/clang-release_90-r369369

Diffstat (limited to 'lib/Sema')

-rw-r--r--

lib/Sema/Sema.cpp

-rw-r--r--

lib/Sema/SemaDecl.cpp

-rw-r--r--

lib/Sema/SemaDeclCXX.cpp

-rw-r--r--

lib/Sema/SemaExprCXX.cpp

-rw-r--r--

lib/Sema/SemaInit.cpp

-rw-r--r--

lib/Sema/SemaOpenMP.cpp

107

-rw-r--r--

lib/Sema/SemaStmtAsm.cpp

-rw-r--r--

lib/Sema/SemaTemplate.cpp

8 files changed, 153 insertions, 91 deletions

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 11fed28b52db..485d39e2c9e8 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp

@@ -961,6 +961,7 @@ void Sema::ActOnEndOfTranslationUnit() {

// All dllexport classes should have been processed already.

assert(DelayedDllExportClasses.empty());

+ assert(DelayedDllExportMemberFunctions.empty());

// Remove file scoped decls that turned out to be used.

UnusedFileScopedDecls.erase(

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index a6c52b7d4b2b..8f19edbc4f36 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp

@@ -1984,10 +1984,27 @@ NamedDecl *Sema::LazilyCreateBuiltin(IdentifierInfo *II, unsigned ID,

ASTContext::GetBuiltinTypeError Error;

QualType R = Context.GetBuiltinType(ID, Error);

if (Error) {

- if (ForRedeclaration)

- Diag(Loc, diag::warn_implicit_decl_requires_sysheader)

- << getHeaderName(Context.BuiltinInfo, ID, Error)

+ if (!ForRedeclaration)

+ return nullptr;

+ // If we have a builtin without an associated type we should not emit a

+ // warning when we were not able to find a type for it.

+ if (Error == ASTContext::GE_Missing_type)

+ return nullptr;

+ // If we could not find a type for setjmp it is because the jmp_buf type was

+ // not defined prior to the setjmp declaration.

+ if (Error == ASTContext::GE_Missing_setjmp) {

+ Diag(Loc, diag::warn_implicit_decl_no_jmp_buf)

<< Context.BuiltinInfo.getName(ID);

+ return nullptr;

+ }

+ // Generally, we emit a warning that the declaration requires the

+ // appropriate header.

+ Diag(Loc, diag::warn_implicit_decl_requires_sysheader)

+ << getHeaderName(Context.BuiltinInfo, ID, Error)

+ << Context.BuiltinInfo.getName(ID);

return nullptr;

}

@@ -11527,9 +11544,12 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init, bool DirectInit) {

// Check for self-references within variable initializers.

// Variables declared within a function/method body (except for references)

// are handled by a dataflow analysis.

- if (!VDecl->hasLocalStorage() || VDecl->getType()->isRecordType() ||

- VDecl->getType()->isReferenceType()) {

- CheckSelfReference(*this, RealDecl, Init, DirectInit);

+ // This is undefined behavior in C++, but valid in C.

+ if (getLangOpts().CPlusPlus) {

+ if (!VDecl->hasLocalStorage() || VDecl->getType()->isRecordType() ||

+ VDecl->getType()->isReferenceType()) {

+ CheckSelfReference(*this, RealDecl, Init, DirectInit);

+ }

}

// If the type changed, it means we had an incomplete type that was

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 9a6385f28319..15984f89e22d 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp

@@ -1030,8 +1030,10 @@ static IsTupleLike isTupleLike(Sema &S, SourceLocation Loc, QualType T,

TemplateArgumentListInfo Args(Loc, Loc);

Args.addArgument(getTrivialTypeTemplateArgument(S, Loc, T));

- // If there's no tuple_size specialization, it's not tuple-like.

- if (lookupStdTypeTraitMember(S, R, Loc, "tuple_size", Args, /*DiagID*/0))

+ // If there's no tuple_size specialization or the lookup of 'value' is empty,

+ // it's not tuple-like.

+ if (lookupStdTypeTraitMember(S, R, Loc, "tuple_size", Args, /*DiagID*/ 0) ||

+ R.empty())

return IsTupleLike::NotTupleLike;

// If we get this far, we've committed to the tuple interpretation, but

@@ -1048,11 +1050,6 @@ static IsTupleLike isTupleLike(Sema &S, SourceLocation Loc, QualType T,

}

} Diagnoser(R, Args);

- if (R.empty()) {

- Diagnoser.diagnoseNotICE(S, Loc, SourceRange());

- return IsTupleLike::Error;

- }

ExprResult E =

S.BuildDeclarationNameExpr(CXXScopeSpec(), R, /*NeedsADL*/false);

if (E.isInvalid())

@@ -6165,8 +6162,8 @@ void Sema::CheckCompletedCXXClass(CXXRecordDecl *Record) {

M->dropAttr<DLLExportAttr>();

if (M->hasAttr<DLLExportAttr>()) {

- DefineImplicitSpecialMember(*this, M, M->getLocation());

- ActOnFinishInlineFunctionDef(M);

+ // Define after any fields with in-class initializers have been parsed.

+ DelayedDllExportMemberFunctions.push_back(M);

}

};

@@ -11419,6 +11416,21 @@ void Sema::ActOnFinishCXXMemberDecls() {

void Sema::ActOnFinishCXXNonNestedClass(Decl *D) {

referenceDLLExportedClassMethods();

+ if (!DelayedDllExportMemberFunctions.empty()) {

+ SmallVector<CXXMethodDecl*, 4> WorkList;

+ std::swap(DelayedDllExportMemberFunctions, WorkList);

+ for (CXXMethodDecl *M : WorkList) {

+ DefineImplicitSpecialMember(*this, M, M->getLocation());

+ // Pass the method to the consumer to get emitted. This is not necessary

+ // for explicit instantiation definitions, as they will get emitted

+ // anyway.

+ if (M->getParent()->getTemplateSpecializationKind() !=

+ TSK_ExplicitInstantiationDefinition)

+ ActOnFinishInlineFunctionDef(M);

+ }

}

void Sema::referenceDLLExportedClassMethods() {

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 705e3b9bd7fb..c1c08969c7bd 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp

@@ -6794,14 +6794,10 @@ ExprResult Sema::ActOnStartCXXMemberReference(Scope *S, Expr *Base,

// it's legal for the type to be incomplete if this is a pseudo-destructor

// call. We'll do more incomplete-type checks later in the lookup process,

// so just skip this check for ObjC types.

- if (BaseType->isObjCObjectOrInterfaceType()) {

+ if (!BaseType->isRecordType()) {

ObjectType = ParsedType::make(BaseType);

MayBePseudoDestructor = true;

return Base;

- } else if (!BaseType->isRecordType()) {

- ObjectType = nullptr;

- MayBePseudoDestructor = true;

- return Base;

}

// The object type must be complete (or dependent), or

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index bc1069609336..60f34775c6b2 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp

@@ -1289,7 +1289,16 @@ void InitListChecker::CheckSubElementType(const InitializedEntity &Entity,

// FIXME: Better EqualLoc?

InitializationKind Kind =

InitializationKind::CreateCopy(expr->getBeginLoc(), SourceLocation());

- InitializationSequence Seq(SemaRef, Entity, Kind, expr,

+ // Vector elements can be initialized from other vectors in which case

+ // we need initialization entity with a type of a vector (and not a vector

+ // element!) initializing multiple vector elements.

+ auto TmpEntity =

+ (ElemType->isExtVectorType() && !Entity.getType()->isExtVectorType())

+ ? InitializedEntity::InitializeTemporary(ElemType)

+ : Entity;

+ InitializationSequence Seq(SemaRef, TmpEntity, Kind, expr,

/*TopLevelOfInitList*/ true);

// C++14 [dcl.init.aggr]p13:

@@ -1300,8 +1309,7 @@ void InitListChecker::CheckSubElementType(const InitializedEntity &Entity,

// assignment-expression.

if (Seq || isa<InitListExpr>(expr)) {

if (!VerifyOnly) {

- ExprResult Result =

- Seq.Perform(SemaRef, Entity, Kind, expr);

+ ExprResult Result = Seq.Perform(SemaRef, TmpEntity, Kind, expr);

if (Result.isInvalid())

hadError = true;

@@ -8108,7 +8116,7 @@ ExprResult InitializationSequence::Perform(Sema &S,

// argument passing.

assert(Step->Type->isSamplerT() &&

"Sampler initialization on non-sampler type.");

- Expr *Init = CurInit.get();

+ Expr *Init = CurInit.get()->IgnoreParens();

QualType SourceType = Init->getType();

// Case 1

if (Entity.isParameterKind()) {

diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp
index bd68011c18b2..4ac87469bf44 100644
--- a/lib/Sema/SemaOpenMP.cpp
+++ b/lib/Sema/SemaOpenMP.cpp

@@ -139,6 +139,7 @@ private:

/// clause, false otherwise.

llvm::Optional<std::pair<const Expr *, OMPOrderedClause *>> OrderedRegion;

unsigned AssociatedLoops = 1;

+ bool HasMutipleLoops = false;

const Decl *PossiblyLoopCounter = nullptr;

bool NowaitRegion = false;

bool CancelRegion = false;

@@ -678,12 +679,19 @@ public:

/// Set collapse value for the region.

void setAssociatedLoops(unsigned Val) {

getTopOfStack().AssociatedLoops = Val;

+ if (Val > 1)

+ getTopOfStack().HasMutipleLoops = true;

}

/// Return collapse value for region.

unsigned getAssociatedLoops() const {

const SharingMapTy *Top = getTopOfStackOrNull();

return Top ? Top->AssociatedLoops : 0;

}

+ /// Returns true if the construct is associated with multiple loops.

+ bool hasMutipleLoops() const {

+ const SharingMapTy *Top = getTopOfStackOrNull();

+ return Top ? Top->HasMutipleLoops : false;

+ }

/// Marks current target region as one with closely nested teams

/// region.

@@ -1874,6 +1882,13 @@ bool Sema::isOpenMPPrivateDecl(const ValueDecl *D, unsigned Level) const {

!isOpenMPSimdDirective(DSAStack->getCurrentDirective()))

return true;

}

+ if (const auto *VD = dyn_cast<VarDecl>(D)) {

+ if (DSAStack->isThreadPrivate(const_cast<VarDecl *>(VD)) &&

+ DSAStack->isForceVarCapturing() &&

+ !DSAStack->hasExplicitDSA(

+ D, [](OpenMPClauseKind K) { return K == OMPC_copyin; }, Level))

+ return true;

+ }

return DSAStack->hasExplicitDSA(

D, [](OpenMPClauseKind K) { return K == OMPC_private; }, Level) ||

(DSAStack->isClauseParsingMode() &&

@@ -5604,13 +5619,14 @@ void Sema::ActOnOpenMPLoopInitialization(SourceLocation ForLoc, Stmt *Init) {

if (!ISC.checkAndSetInit(Init, /*EmitDiags=*/false)) {

if (ValueDecl *D = ISC.getLoopDecl()) {

auto *VD = dyn_cast<VarDecl>(D);

+ DeclRefExpr *PrivateRef = nullptr;

if (!VD) {

if (VarDecl *Private = isOpenMPCapturedDecl(D)) {

VD = Private;

} else {

- DeclRefExpr *Ref = buildCapture(*this, D, ISC.getLoopDeclRefExpr(),

- /*WithInit=*/false);

- VD = cast<VarDecl>(Ref->getDecl());

+ PrivateRef = buildCapture(*this, D, ISC.getLoopDeclRefExpr(),

+ /*WithInit=*/false);

+ VD = cast<VarDecl>(PrivateRef->getDecl());

}

DSAStack->addLoopControlVariable(D, VD);

@@ -5623,6 +5639,49 @@ void Sema::ActOnOpenMPLoopInitialization(SourceLocation ForLoc, Stmt *Init) {

Var->getType().getNonLValueExprType(Context),

ForLoc, /*RefersToCapture=*/true));

}

+ OpenMPDirectiveKind DKind = DSAStack->getCurrentDirective();

+ // OpenMP [2.14.1.1, Data-sharing Attribute Rules for Variables

+ // Referenced in a Construct, C/C++]. The loop iteration variable in the

+ // associated for-loop of a simd construct with just one associated

+ // for-loop may be listed in a linear clause with a constant-linear-step

+ // that is the increment of the associated for-loop. The loop iteration

+ // variable(s) in the associated for-loop(s) of a for or parallel for

+ // construct may be listed in a private or lastprivate clause.

+ DSAStackTy::DSAVarData DVar =

+ DSAStack->getTopDSA(D, /*FromParent=*/false);

+ // If LoopVarRefExpr is nullptr it means the corresponding loop variable

+ // is declared in the loop and it is predetermined as a private.

+ Expr *LoopDeclRefExpr = ISC.getLoopDeclRefExpr();

+ OpenMPClauseKind PredeterminedCKind =

+ isOpenMPSimdDirective(DKind)

+ ? (DSAStack->hasMutipleLoops() ? OMPC_lastprivate : OMPC_linear)

+ : OMPC_private;

+ if (((isOpenMPSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&

+ DVar.CKind != PredeterminedCKind && DVar.RefExpr &&

+ (LangOpts.OpenMP <= 45 || (DVar.CKind != OMPC_lastprivate &&

+ DVar.CKind != OMPC_private))) ||

+ ((isOpenMPWorksharingDirective(DKind) || DKind == OMPD_taskloop ||

+ isOpenMPDistributeDirective(DKind)) &&

+ !isOpenMPSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&

+ DVar.CKind != OMPC_private && DVar.CKind != OMPC_lastprivate)) &&

+ (DVar.CKind != OMPC_private || DVar.RefExpr)) {

+ Diag(Init->getBeginLoc(), diag::err_omp_loop_var_dsa)

+ << getOpenMPClauseName(DVar.CKind)

+ << getOpenMPDirectiveName(DKind)

+ << getOpenMPClauseName(PredeterminedCKind);

+ if (DVar.RefExpr == nullptr)

+ DVar.CKind = PredeterminedCKind;

+ reportOriginalDsa(*this, DSAStack, D, DVar,

+ /*IsLoopIterVar=*/true);

+ } else if (LoopDeclRefExpr) {

+ // Make the loop iteration variable private (for worksharing

+ // constructs), linear (for simd directives with the only one

+ // associated loop) or lastprivate (for simd directives with several

+ // collapsed or ordered loops).

+ if (DVar.CKind == OMPC_unknown)

+ DSAStack->addDSA(D, LoopDeclRefExpr, PredeterminedCKind,

+ PrivateRef);

+ }

}

DSAStack->setAssociatedLoops(AssociatedLoops - 1);

@@ -5677,8 +5736,6 @@ static bool checkOpenMPIterationSpace(

// Check loop variable's type.

if (ValueDecl *LCDecl = ISC.getLoopDecl()) {

- Expr *LoopDeclRefExpr = ISC.getLoopDeclRefExpr();

// OpenMP [2.6, Canonical Loop Form]

// Var is one of the following:

// A variable of signed or unsigned integer type.

@@ -5704,46 +5761,6 @@ static bool checkOpenMPIterationSpace(

// sharing attributes.

VarsWithImplicitDSA.erase(LCDecl);

- // OpenMP [2.14.1.1, Data-sharing Attribute Rules for Variables Referenced

- // in a Construct, C/C++].

- // The loop iteration variable in the associated for-loop of a simd

- // construct with just one associated for-loop may be listed in a linear

- // clause with a constant-linear-step that is the increment of the

- // associated for-loop.

- // The loop iteration variable(s) in the associated for-loop(s) of a for or

- // parallel for construct may be listed in a private or lastprivate clause.

- DSAStackTy::DSAVarData DVar = DSA.getTopDSA(LCDecl, false);

- // If LoopVarRefExpr is nullptr it means the corresponding loop variable is

- // declared in the loop and it is predetermined as a private.

- OpenMPClauseKind PredeterminedCKind =

- isOpenMPSimdDirective(DKind)

- ? ((NestedLoopCount == 1) ? OMPC_linear : OMPC_lastprivate)

- : OMPC_private;

- if (((isOpenMPSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&

- DVar.CKind != PredeterminedCKind && DVar.RefExpr &&

- (SemaRef.getLangOpts().OpenMP <= 45 ||

- (DVar.CKind != OMPC_lastprivate && DVar.CKind != OMPC_private))) ||

- ((isOpenMPWorksharingDirective(DKind) || DKind == OMPD_taskloop ||

- isOpenMPDistributeDirective(DKind)) &&

- !isOpenMPSimdDirective(DKind) && DVar.CKind != OMPC_unknown &&

- DVar.CKind != OMPC_private && DVar.CKind != OMPC_lastprivate)) &&

- (DVar.CKind != OMPC_private || DVar.RefExpr)) {

- SemaRef.Diag(Init->getBeginLoc(), diag::err_omp_loop_var_dsa)

- << getOpenMPClauseName(DVar.CKind) << getOpenMPDirectiveName(DKind)

- << getOpenMPClauseName(PredeterminedCKind);

- if (DVar.RefExpr == nullptr)

- DVar.CKind = PredeterminedCKind;

- reportOriginalDsa(SemaRef, &DSA, LCDecl, DVar, /*IsLoopIterVar=*/true);

- HasErrors = true;

- } else if (LoopDeclRefExpr != nullptr) {

- // Make the loop iteration variable private (for worksharing constructs),

- // linear (for simd directives with the only one associated loop) or

- // lastprivate (for simd directives with several collapsed or ordered

- // loops).

- if (DVar.CKind == OMPC_unknown)

- DSA.addDSA(LCDecl, LoopDeclRefExpr, PredeterminedCKind);

- }

assert(isOpenMPLoopDirective(DKind) && "DSA for non-loop vars");

// Check test-expr.

diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp
index b123a739a7ab..9b051e02d127 100644
--- a/lib/Sema/SemaStmtAsm.cpp
+++ b/lib/Sema/SemaStmtAsm.cpp

@@ -383,25 +383,19 @@ StmtResult Sema::ActOnGCCAsmStmt(SourceLocation AsmLoc, bool IsSimple,

} else if (Info.requiresImmediateConstant() && !Info.allowsRegister()) {

if (!InputExpr->isValueDependent()) {

Expr::EvalResult EVResult;

- if (!InputExpr->EvaluateAsRValue(EVResult, Context, true))

- return StmtError(

- Diag(InputExpr->getBeginLoc(), diag::err_asm_immediate_expected)

- << Info.getConstraintStr() << InputExpr->getSourceRange());

- // For compatibility with GCC, we also allow pointers that would be

- // integral constant expressions if they were cast to int.

- llvm::APSInt IntResult;

- if (!EVResult.Val.toIntegralConstant(IntResult, InputExpr->getType(),

- Context))

- return StmtError(

- Diag(InputExpr->getBeginLoc(), diag::err_asm_immediate_expected)

- << Info.getConstraintStr() << InputExpr->getSourceRange());

- if (!Info.isValidAsmImmediate(IntResult))

- return StmtError(Diag(InputExpr->getBeginLoc(),

- diag::err_invalid_asm_value_for_constraint)

- << IntResult.toString(10) << Info.getConstraintStr()

- << InputExpr->getSourceRange());

+ if (InputExpr->EvaluateAsRValue(EVResult, Context, true)) {

+ // For compatibility with GCC, we also allow pointers that would be

+ // integral constant expressions if they were cast to int.

+ llvm::APSInt IntResult;

+ if (EVResult.Val.toIntegralConstant(IntResult, InputExpr->getType(),

+ Context))

+ if (!Info.isValidAsmImmediate(IntResult))

+ return StmtError(Diag(InputExpr->getBeginLoc(),

+ diag::err_invalid_asm_value_for_constraint)

+ << IntResult.toString(10)

+ << Info.getConstraintStr()

+ << InputExpr->getSourceRange());

+ }

}

} else {

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 3212281cc34d..ec4b63a2e508 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp

@@ -362,13 +362,27 @@ bool Sema::LookupTemplateName(LookupResult &Found,

// x->B::f, and we are looking into the type of the object.

assert(!SS.isSet() && "ObjectType and scope specifier cannot coexist");

LookupCtx = computeDeclContext(ObjectType);

- IsDependent = !LookupCtx;

+ IsDependent = !LookupCtx && ObjectType->isDependentType();

assert((IsDependent || !ObjectType->isIncompleteType() ||

ObjectType->castAs<TagType>()->isBeingDefined()) &&

"Caller should have completed object type");

- // Template names cannot appear inside an Objective-C class or object type.

- if (ObjectType->isObjCObjectOrInterfaceType()) {

+ // Template names cannot appear inside an Objective-C class or object type

+ // or a vector type.

+ //

+ // FIXME: This is wrong. For example:

+ //

+ // template<typename T> using Vec = T __attribute__((ext_vector_type(4)));

+ // Vec<int> vi;

+ // vi.Vec<int>::~Vec<int>();

+ //

+ // ... should be accepted but we will not treat 'Vec' as a template name

+ // here. The right thing to do would be to check if the name is a valid

+ // vector component name, and look up a template name if not. And similarly

+ // for lookups into Objective-C class and object types, where the same

+ // problem can arise.

+ if (ObjectType->isObjCObjectOrInterfaceType() ||

+ ObjectType->isVectorType()) {

Found.clear();

return false;

}