forked from OSchip/llvm-project
[clang] NFC: remove superfluous braces
In commit 9bb33f572f, a pair of superfluous braces are introduced to the function Sema::BuildDeclarationNameExpr.
This patch tries to remove the superfluous braces. Also use clang-format to further beautify the above function.
Reviewed By: rjmccall
Differential Revision: https://reviews.llvm.org/D108609
This commit is contained in:
Zhouyi Zhou
Wang, Pengfei
parent
bed587631f
commit
1f8602e16e
|
|
@ -3250,8 +3250,7 @@ ExprResult Sema::BuildDeclarationNameExpr(
|
|||
|
||||
// Make sure that we're referring to a value.
|
||||
if (!isa<ValueDecl, UnresolvedUsingIfExistsDecl>(D)) {
|
||||
Diag(Loc, diag::err_ref_non_value)
|
||||
<< D << SS.getRange();
|
||||
Diag(Loc, diag::err_ref_non_value) << D << SS.getRange();
|
||||
Diag(D->getLocation(), diag::note_declared_at);
|
||||
return ExprError();
|
||||
}
|
||||
|
|
@ -3277,210 +3276,204 @@ ExprResult Sema::BuildDeclarationNameExpr(
|
|||
return BuildAnonymousStructUnionMemberReference(SS, NameInfo.getLoc(),
|
||||
indirectField);
|
||||
|
||||
{
|
||||
QualType type = VD->getType();
|
||||
if (type.isNull())
|
||||
return ExprError();
|
||||
ExprValueKind valueKind = VK_PRValue;
|
||||
QualType type = VD->getType();
|
||||
if (type.isNull())
|
||||
return ExprError();
|
||||
ExprValueKind valueKind = VK_PRValue;
|
||||
|
||||
// In 'T ...V;', the type of the declaration 'V' is 'T...', but the type of
|
||||
// a reference to 'V' is simply (unexpanded) 'T'. The type, like the value,
|
||||
// is expanded by some outer '...' in the context of the use.
|
||||
type = type.getNonPackExpansionType();
|
||||
// In 'T ...V;', the type of the declaration 'V' is 'T...', but the type of
|
||||
// a reference to 'V' is simply (unexpanded) 'T'. The type, like the value,
|
||||
// is expanded by some outer '...' in the context of the use.
|
||||
type = type.getNonPackExpansionType();
|
||||
|
||||
switch (D->getKind()) {
|
||||
switch (D->getKind()) {
|
||||
// Ignore all the non-ValueDecl kinds.
|
||||
#define ABSTRACT_DECL(kind)
|
||||
#define VALUE(type, base)
|
||||
#define DECL(type, base) \
|
||||
case Decl::type:
|
||||
#define DECL(type, base) case Decl::type:
|
||||
#include "clang/AST/DeclNodes.inc"
|
||||
llvm_unreachable("invalid value decl kind");
|
||||
llvm_unreachable("invalid value decl kind");
|
||||
|
||||
// These shouldn't make it here.
|
||||
case Decl::ObjCAtDefsField:
|
||||
llvm_unreachable("forming non-member reference to ivar?");
|
||||
// These shouldn't make it here.
|
||||
case Decl::ObjCAtDefsField:
|
||||
llvm_unreachable("forming non-member reference to ivar?");
|
||||
|
||||
// Enum constants are always r-values and never references.
|
||||
// Unresolved using declarations are dependent.
|
||||
case Decl::EnumConstant:
|
||||
case Decl::UnresolvedUsingValue:
|
||||
case Decl::OMPDeclareReduction:
|
||||
case Decl::OMPDeclareMapper:
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
// Enum constants are always r-values and never references.
|
||||
// Unresolved using declarations are dependent.
|
||||
case Decl::EnumConstant:
|
||||
case Decl::UnresolvedUsingValue:
|
||||
case Decl::OMPDeclareReduction:
|
||||
case Decl::OMPDeclareMapper:
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
|
||||
// Fields and indirect fields that got here must be for
|
||||
// pointer-to-member expressions; we just call them l-values for
|
||||
// internal consistency, because this subexpression doesn't really
|
||||
// exist in the high-level semantics.
|
||||
case Decl::Field:
|
||||
case Decl::IndirectField:
|
||||
case Decl::ObjCIvar:
|
||||
assert(getLangOpts().CPlusPlus &&
|
||||
"building reference to field in C?");
|
||||
// Fields and indirect fields that got here must be for
|
||||
// pointer-to-member expressions; we just call them l-values for
|
||||
// internal consistency, because this subexpression doesn't really
|
||||
// exist in the high-level semantics.
|
||||
case Decl::Field:
|
||||
case Decl::IndirectField:
|
||||
case Decl::ObjCIvar:
|
||||
assert(getLangOpts().CPlusPlus && "building reference to field in C?");
|
||||
|
||||
// These can't have reference type in well-formed programs, but
|
||||
// for internal consistency we do this anyway.
|
||||
type = type.getNonReferenceType();
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
// These can't have reference type in well-formed programs, but
|
||||
// for internal consistency we do this anyway.
|
||||
type = type.getNonReferenceType();
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
|
||||
// Non-type template parameters are either l-values or r-values
|
||||
// depending on the type.
|
||||
case Decl::NonTypeTemplateParm: {
|
||||
if (const ReferenceType *reftype = type->getAs<ReferenceType>()) {
|
||||
type = reftype->getPointeeType();
|
||||
valueKind = VK_LValue; // even if the parameter is an r-value reference
|
||||
break;
|
||||
}
|
||||
|
||||
// [expr.prim.id.unqual]p2:
|
||||
// If the entity is a template parameter object for a template
|
||||
// parameter of type T, the type of the expression is const T.
|
||||
// [...] The expression is an lvalue if the entity is a [...] template
|
||||
// parameter object.
|
||||
if (type->isRecordType()) {
|
||||
type = type.getUnqualifiedType().withConst();
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
}
|
||||
|
||||
// For non-references, we need to strip qualifiers just in case
|
||||
// the template parameter was declared as 'const int' or whatever.
|
||||
valueKind = VK_PRValue;
|
||||
type = type.getUnqualifiedType();
|
||||
// Non-type template parameters are either l-values or r-values
|
||||
// depending on the type.
|
||||
case Decl::NonTypeTemplateParm: {
|
||||
if (const ReferenceType *reftype = type->getAs<ReferenceType>()) {
|
||||
type = reftype->getPointeeType();
|
||||
valueKind = VK_LValue; // even if the parameter is an r-value reference
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::Var:
|
||||
case Decl::VarTemplateSpecialization:
|
||||
case Decl::VarTemplatePartialSpecialization:
|
||||
case Decl::Decomposition:
|
||||
case Decl::OMPCapturedExpr:
|
||||
// In C, "extern void blah;" is valid and is an r-value.
|
||||
if (!getLangOpts().CPlusPlus &&
|
||||
!type.hasQualifiers() &&
|
||||
type->isVoidType()) {
|
||||
// [expr.prim.id.unqual]p2:
|
||||
// If the entity is a template parameter object for a template
|
||||
// parameter of type T, the type of the expression is const T.
|
||||
// [...] The expression is an lvalue if the entity is a [...] template
|
||||
// parameter object.
|
||||
if (type->isRecordType()) {
|
||||
type = type.getUnqualifiedType().withConst();
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
}
|
||||
|
||||
// For non-references, we need to strip qualifiers just in case
|
||||
// the template parameter was declared as 'const int' or whatever.
|
||||
valueKind = VK_PRValue;
|
||||
type = type.getUnqualifiedType();
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::Var:
|
||||
case Decl::VarTemplateSpecialization:
|
||||
case Decl::VarTemplatePartialSpecialization:
|
||||
case Decl::Decomposition:
|
||||
case Decl::OMPCapturedExpr:
|
||||
// In C, "extern void blah;" is valid and is an r-value.
|
||||
if (!getLangOpts().CPlusPlus && !type.hasQualifiers() &&
|
||||
type->isVoidType()) {
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
LLVM_FALLTHROUGH;
|
||||
|
||||
case Decl::ImplicitParam:
|
||||
case Decl::ParmVar: {
|
||||
// These are always l-values.
|
||||
valueKind = VK_LValue;
|
||||
type = type.getNonReferenceType();
|
||||
|
||||
// FIXME: Does the addition of const really only apply in
|
||||
// potentially-evaluated contexts? Since the variable isn't actually
|
||||
// captured in an unevaluated context, it seems that the answer is no.
|
||||
if (!isUnevaluatedContext()) {
|
||||
QualType CapturedType = getCapturedDeclRefType(cast<VarDecl>(VD), Loc);
|
||||
if (!CapturedType.isNull())
|
||||
type = CapturedType;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::Binding: {
|
||||
// These are always lvalues.
|
||||
valueKind = VK_LValue;
|
||||
type = type.getNonReferenceType();
|
||||
// FIXME: Support lambda-capture of BindingDecls, once CWG actually
|
||||
// decides how that's supposed to work.
|
||||
auto *BD = cast<BindingDecl>(VD);
|
||||
if (BD->getDeclContext() != CurContext) {
|
||||
auto *DD = dyn_cast_or_null<VarDecl>(BD->getDecomposedDecl());
|
||||
if (DD && DD->hasLocalStorage())
|
||||
diagnoseUncapturableValueReference(*this, Loc, BD, CurContext);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::Function: {
|
||||
if (unsigned BID = cast<FunctionDecl>(VD)->getBuiltinID()) {
|
||||
if (!Context.BuiltinInfo.isPredefinedLibFunction(BID)) {
|
||||
type = Context.BuiltinFnTy;
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
LLVM_FALLTHROUGH;
|
||||
}
|
||||
|
||||
case Decl::ImplicitParam:
|
||||
case Decl::ParmVar: {
|
||||
// These are always l-values.
|
||||
valueKind = VK_LValue;
|
||||
type = type.getNonReferenceType();
|
||||
|
||||
// FIXME: Does the addition of const really only apply in
|
||||
// potentially-evaluated contexts? Since the variable isn't actually
|
||||
// captured in an unevaluated context, it seems that the answer is no.
|
||||
if (!isUnevaluatedContext()) {
|
||||
QualType CapturedType = getCapturedDeclRefType(cast<VarDecl>(VD), Loc);
|
||||
if (!CapturedType.isNull())
|
||||
type = CapturedType;
|
||||
}
|
||||
const FunctionType *fty = type->castAs<FunctionType>();
|
||||
|
||||
// If we're referring to a function with an __unknown_anytype
|
||||
// result type, make the entire expression __unknown_anytype.
|
||||
if (fty->getReturnType() == Context.UnknownAnyTy) {
|
||||
type = Context.UnknownAnyTy;
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::Binding: {
|
||||
// These are always lvalues.
|
||||
// Functions are l-values in C++.
|
||||
if (getLangOpts().CPlusPlus) {
|
||||
valueKind = VK_LValue;
|
||||
type = type.getNonReferenceType();
|
||||
// FIXME: Support lambda-capture of BindingDecls, once CWG actually
|
||||
// decides how that's supposed to work.
|
||||
auto *BD = cast<BindingDecl>(VD);
|
||||
if (BD->getDeclContext() != CurContext) {
|
||||
auto *DD = dyn_cast_or_null<VarDecl>(BD->getDecomposedDecl());
|
||||
if (DD && DD->hasLocalStorage())
|
||||
diagnoseUncapturableValueReference(*this, Loc, BD, CurContext);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::Function: {
|
||||
if (unsigned BID = cast<FunctionDecl>(VD)->getBuiltinID()) {
|
||||
if (!Context.BuiltinInfo.isPredefinedLibFunction(BID)) {
|
||||
type = Context.BuiltinFnTy;
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// C99 DR 316 says that, if a function type comes from a
|
||||
// function definition (without a prototype), that type is only
|
||||
// used for checking compatibility. Therefore, when referencing
|
||||
// the function, we pretend that we don't have the full function
|
||||
// type.
|
||||
if (!cast<FunctionDecl>(VD)->hasPrototype() && isa<FunctionProtoType>(fty))
|
||||
type = Context.getFunctionNoProtoType(fty->getReturnType(),
|
||||
fty->getExtInfo());
|
||||
|
||||
const FunctionType *fty = type->castAs<FunctionType>();
|
||||
// Functions are r-values in C.
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
|
||||
// If we're referring to a function with an __unknown_anytype
|
||||
// result type, make the entire expression __unknown_anytype.
|
||||
if (fty->getReturnType() == Context.UnknownAnyTy) {
|
||||
case Decl::CXXDeductionGuide:
|
||||
llvm_unreachable("building reference to deduction guide");
|
||||
|
||||
case Decl::MSProperty:
|
||||
case Decl::MSGuid:
|
||||
case Decl::TemplateParamObject:
|
||||
// FIXME: Should MSGuidDecl and template parameter objects be subject to
|
||||
// capture in OpenMP, or duplicated between host and device?
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
|
||||
case Decl::CXXMethod:
|
||||
// If we're referring to a method with an __unknown_anytype
|
||||
// result type, make the entire expression __unknown_anytype.
|
||||
// This should only be possible with a type written directly.
|
||||
if (const FunctionProtoType *proto =
|
||||
dyn_cast<FunctionProtoType>(VD->getType()))
|
||||
if (proto->getReturnType() == Context.UnknownAnyTy) {
|
||||
type = Context.UnknownAnyTy;
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
|
||||
// Functions are l-values in C++.
|
||||
if (getLangOpts().CPlusPlus) {
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
}
|
||||
|
||||
// C99 DR 316 says that, if a function type comes from a
|
||||
// function definition (without a prototype), that type is only
|
||||
// used for checking compatibility. Therefore, when referencing
|
||||
// the function, we pretend that we don't have the full function
|
||||
// type.
|
||||
if (!cast<FunctionDecl>(VD)->hasPrototype() &&
|
||||
isa<FunctionProtoType>(fty))
|
||||
type = Context.getFunctionNoProtoType(fty->getReturnType(),
|
||||
fty->getExtInfo());
|
||||
|
||||
// Functions are r-values in C.
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
|
||||
case Decl::CXXDeductionGuide:
|
||||
llvm_unreachable("building reference to deduction guide");
|
||||
|
||||
case Decl::MSProperty:
|
||||
case Decl::MSGuid:
|
||||
case Decl::TemplateParamObject:
|
||||
// FIXME: Should MSGuidDecl and template parameter objects be subject to
|
||||
// capture in OpenMP, or duplicated between host and device?
|
||||
// C++ methods are l-values if static, r-values if non-static.
|
||||
if (cast<CXXMethodDecl>(VD)->isStatic()) {
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
|
||||
case Decl::CXXMethod:
|
||||
// If we're referring to a method with an __unknown_anytype
|
||||
// result type, make the entire expression __unknown_anytype.
|
||||
// This should only be possible with a type written directly.
|
||||
if (const FunctionProtoType *proto
|
||||
= dyn_cast<FunctionProtoType>(VD->getType()))
|
||||
if (proto->getReturnType() == Context.UnknownAnyTy) {
|
||||
type = Context.UnknownAnyTy;
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
|
||||
// C++ methods are l-values if static, r-values if non-static.
|
||||
if (cast<CXXMethodDecl>(VD)->isStatic()) {
|
||||
valueKind = VK_LValue;
|
||||
break;
|
||||
}
|
||||
LLVM_FALLTHROUGH;
|
||||
|
||||
case Decl::CXXConversion:
|
||||
case Decl::CXXDestructor:
|
||||
case Decl::CXXConstructor:
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
LLVM_FALLTHROUGH;
|
||||
|
||||
return BuildDeclRefExpr(VD, type, valueKind, NameInfo, &SS, FoundD,
|
||||
/*FIXME: TemplateKWLoc*/ SourceLocation(),
|
||||
TemplateArgs);
|
||||
case Decl::CXXConversion:
|
||||
case Decl::CXXDestructor:
|
||||
case Decl::CXXConstructor:
|
||||
valueKind = VK_PRValue;
|
||||
break;
|
||||
}
|
||||
|
||||
return BuildDeclRefExpr(VD, type, valueKind, NameInfo, &SS, FoundD,
|
||||
/*FIXME: TemplateKWLoc*/ SourceLocation(),
|
||||
TemplateArgs);
|
||||
}
|
||||
|
||||
static void ConvertUTF8ToWideString(unsigned CharByteWidth, StringRef Source,
|
||||
|
|
|
|||
Loading…
Reference in New Issue