averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a warning about a zero length array, by ripping out all of the old declattributes code. :-)

Browse Source 
Swift SVN r20071
This commit is contained in:
Chris Lattner
2014-07-17 04:48:34 +00:00
parent 1bd9d81971
commit fdaa28ce16
7 changed files with 36 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/swift/AST/Attr.def
View File

@@ -14,10 +14,6 @@
//
//===----------------------------------------------------------------------===//
#ifndef ATTR
#define ATTR(X)
#endif
#ifndef DECL_ATTR
#define DECL_ATTR(SPELLING, CLASS, OPTIONS, CODE)
#endif
@@ -38,12 +34,6 @@
#define TYPE_ATTR(X)
#endif
/// Virtual attributes are not necessarily spelled the same way
/// they're written.
#ifndef VIRTUAL_ATTR
#define VIRTUAL_ATTR(X) ATTR(X)
#endif
#ifndef AVAILABILITY_PLATFORM
#define AVAILABILITY_PLATFORM(X)
#endif
@@ -205,7 +195,6 @@ AVAILABILITY_PLATFORM(iOSApplicationExtension)
AVAILABILITY_PLATFORM(OSXApplicationExtension)
#undef AVAILABILITY_PLATFORM
#undef VIRTUAL_ATTR
#undef TYPE_ATTR
#undef DECL_ATTR_ALIAS
#undef VIRTUAL_DECL_ATTR

72
include/swift/AST/Attr.h
View File

@@ -148,16 +148,6 @@ enum class Resilience : unsigned char {
enum class AbstractCC : unsigned char;
// Define enumerators for each attribute, e.g. AK_weak.
enum AttrKind {
#define ATTR(X) AK_##X,
#include "swift/AST/Attr.def"
AK_Count
};
// FIXME: DeclAttrKind and AttrKind should eventually be merged, but
// there is currently a representational difference as one set of
// attributes is migrated from one implementation to another.
enum DeclAttrKind : unsigned {
#define DECL_ATTR(_, NAME, ...) DAK_##NAME,
#include "swift/AST/Attr.def"
@@ -842,13 +832,6 @@ public:
/// \brief Attributes that may be applied to declarations.
class DeclAttributes {
/// Source locations for every possible attribute that can be parsed in
/// source.
SourceLoc AttrLocs[AK_Count];
bool HasAttr[AK_Count] = { };
unsigned NumAttrsSet : 8;
/// Linked list of declaration attributes.
DeclAttribute *DeclAttrs;
@@ -863,62 +846,13 @@ public:
/// they are not allowed in that context.
SourceLoc AtLoc;
DeclAttributes() : NumAttrsSet(0), DeclAttrs(nullptr) {}
DeclAttributes() : DeclAttrs(nullptr) {}
bool shouldSaveInAST() const {
return AtLoc.isValid() || NumAttrsSet != 0 || DeclAttrs;
}
bool containsTraditionalAttributes() const {
return NumAttrsSet != 0;
}
bool hasNonVirtualAttributes() const {
return NumAttrsSet != 0;
}
void clearAttribute(AttrKind A) {
if (!has(A))
return;
AttrLocs[A] = SourceLoc();
HasAttr[A] = false;
NumAttrsSet--;
}
bool has(AttrKind A) const {
return HasAttr[A];
}
bool has(DeclAttrKind DK) const {
for (auto Attr : *this)
if (Attr->getKind() == DK)
return true;
return false;
}
SourceLoc getLoc(AttrKind A) const {
return AttrLocs[A];
}
void setAttr(AttrKind A, SourceLoc L) {
bool HadAttribute = has(A);
AttrLocs[A] = L;
HasAttr[A] = true;
if (HadAttribute)
return;
NumAttrsSet++;
bool isEmpty() const {
return DeclAttrs == nullptr;
}
void getAttrRanges(SmallVectorImpl<SourceRange> &Ranges) const {
for (auto Loc : AttrLocs) {
if (Loc.isValid())
Ranges.push_back(Loc);
}
for (auto Attr : *this) {
auto R = Attr->getRangeWithAt();
if (R.isValid())

7
include/swift/AST/DiagnosticsParse.def
View File

@@ -912,13 +912,6 @@ ERROR(type_attribute_applied_to_decl,attribute_parsing,none,
ERROR(decl_attribute_applied_to_type,attribute_parsing,none,
"attribute can only be applied to declarations, not types", ())
ERROR(import_attributes,attribute_parsing,none,
"invalid attributes specified for import", ())
ERROR(typealias_attributes,attribute_parsing,none,
"invalid attributes specified for typealias", ())
ERROR(operator_attributes,attribute_parsing,none,
"invalid attributes specified for operator", ())
ERROR(attr_expected_lparen,attribute_parsing,none,
"expected '(' in '%0' %select{attribute|modifier}1", (StringRef, bool))

2
lib/AST/Attr.cpp
View File

@@ -71,7 +71,7 @@ void DeclAttributes::print(llvm::raw_ostream &OS) const {
void DeclAttributes::print(ASTPrinter &Printer,
const PrintOptions &Options) const {
if (NumAttrsSet == 0 && !DeclAttrs)
if (!DeclAttrs)
return;
SmallVector<const DeclAttribute *, 8> orderedAttributes(begin(), end());

1
lib/IDE/SyntaxModel.cpp
View File

@@ -64,7 +64,6 @@ SyntaxModelContext::SyntaxModelContext(SourceFile &SrcFile)
if (AttrLoc.isValid()) {
// This token is following @, see if it's a known attribute name.
bool IsAttr = llvm::StringSwitch<bool>(Tok.getText())
#define ATTR(X) .Case(#X, true)
#define TYPE_ATTR(X) .Case(#X, true)
#define DECL_ATTR(X, ...) .Case(#X, true)
#define DECL_ATTR_ALIAS(X, ...) .Case(#X, true)

114
lib/Parse/ParseDecl.cpp
View File

@@ -806,7 +806,6 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
/// but rejected since they have context-sensitive keywords.
///
bool Parser::parseDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc) {
// If this not an identifier, the attribute is malformed.
if (Tok.isNot(tok::identifier) &&
Tok.isNot(tok::kw_in)) {
@@ -814,48 +813,28 @@ bool Parser::parseDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc) {
return true;
}
// XXX
// FIXME: This is bogus to only honor the first '@', but this
// will be fixed once the attribute refactoring completes for
// all existing declaration attributes.
if (Attributes.AtLoc.isInvalid())
Attributes.AtLoc = AtLoc;
// Determine which attribute it is, and diagnose it if unknown.
AttrKind attr = llvm::StringSwitch<AttrKind>(Tok.getText())
#define ATTR(X) .Case(#X, AK_##X)
#define VIRTUAL_ATTR(X)
#include "swift/AST/Attr.def"
.Default(AK_Count);
// If the attribute follows the new representation, switch
// over to the alternate parsing path.
DeclAttrKind DK = getDeclAttrFromString(Tok.getText());
if (DK != DAK_Count)
return parseNewDeclAttribute(Attributes, AtLoc, DK);
if (attr == AK_Count) {
// If the attribute follows the new representation, switch
// over to the alternate parsing path.
DeclAttrKind DK = getDeclAttrFromString(Tok.getText());
if (DK != DAK_Count)
return parseNewDeclAttribute(Attributes, AtLoc, DK);
if (getTypeAttrFromString(Tok.getText()) != TAK_Count)
diagnose(Tok, diag::type_attribute_applied_to_decl);
else
diagnose(Tok, diag::unknown_attribute, Tok.getText());
// Recover by eating @foo when foo is not known.
consumeToken();
if (getTypeAttrFromString(Tok.getText()) != TAK_Count)
diagnose(Tok, diag::type_attribute_applied_to_decl);
else
diagnose(Tok, diag::unknown_attribute, Tok.getText());
// Recover by eating @foo when foo is not known.
consumeToken();
return true;
}
// Ok, it is a valid attribute, eat it, and then process it.
SourceLoc Loc = consumeToken();
// Diagnose duplicated attributes.
if (Attributes.has(attr)) {
diagnose(Loc, diag::duplicate_attribute, /*isModifier=*/false);
return false;
}
Attributes.setAttr(attr, Loc);
return false;
return true;
}
bool Parser::canParseTypeAttribute() {
@@ -887,10 +866,8 @@ bool Parser::parseTypeAttribute(TypeAttributes &Attributes, bool justChecking) {
StringRef Text = Tok.getText();
bool isDeclAttribute = llvm::StringSwitch<bool>(Text)
#define ATTR(X) .Case(#X, true)
#define VIRTUAL_ATTR(X)
#define DECL_ATTR(X, ...) ATTR(X)
#define DECL_ALIAS(X, ...) ATTR(X)
#define DECL_ATTR(X, ...) .Case(#X, true)
#define DECL_ALIAS(X, ...) .Case(#X, true)
#define VIRTUAL_DECL_ATTR(X, ...)
#include "swift/AST/Attr.def"
.Default(false);
@@ -1569,9 +1546,6 @@ ParserResult<ImportDecl> Parser::parseDeclImport(ParseDeclOptions Flags,
DeclAttributes &Attributes) {
SourceLoc ImportLoc = consumeToken(tok::kw_import);
if (Attributes.hasNonVirtualAttributes())
diagnose(Attributes.AtLoc, diag::import_attributes);
DebuggerContextChange DCC (*this);
if (!DCC.movedToTopLevel() && !(Flags & PD_AllowTopLevel)) {
@@ -1627,8 +1601,7 @@ ParserResult<ImportDecl> Parser::parseDeclImport(ParseDeclOptions Flags,
auto *ID = ImportDecl::create(Context, CurDeclContext, ImportLoc, Kind,
KindLoc, ImportPath);
if (Attributes.shouldSaveInAST())
ID->getMutableAttrs() = Attributes;
ID->getMutableAttrs() = Attributes;
return DCC.fixupParserResult(ID);
}
@@ -1823,8 +1796,7 @@ Parser::parseDeclExtension(ParseDeclOptions Flags, DeclAttributes &Attributes) {
= new (Context) ExtensionDecl(ExtensionLoc, Ty.get(),
Context.AllocateCopy(Inherited),
CurDeclContext);
if (Attributes.shouldSaveInAST())
ED->getMutableAttrs() = Attributes;
ED->getMutableAttrs() = Attributes;
SmallVector<Decl*, 8> MemberDecls;
SourceLoc LBLoc, RBLoc;
@@ -2015,11 +1987,6 @@ ParserResult<TypeDecl> Parser::parseDeclTypeAlias(bool WantDefinition,
SourceLoc IdLoc;
ParserStatus Status;
if (Attributes.hasNonVirtualAttributes() ||
Attributes.hasAttribute<OptionalAttr>())
diagnose(Attributes.AtLoc, diag::typealias_attributes);
Status |=
parseIdentifierDeclName(*this, Id, IdLoc, tok::colon, tok::equal,
diag::expected_identifier_in_decl, "typealias");
@@ -2052,8 +2019,7 @@ ParserResult<TypeDecl> Parser::parseDeclTypeAlias(bool WantDefinition,
CurDeclContext,
TypeAliasLoc, Id, IdLoc,
UnderlyingTy.getPtrOrNull());
if (Attributes.shouldSaveInAST())
assocType->getMutableAttrs() = Attributes;
assocType->getMutableAttrs() = Attributes;
if (!Inherited.empty())
assocType->setInherited(Context.AllocateCopy(Inherited));
addToScope(assocType);
@@ -2065,8 +2031,7 @@ ParserResult<TypeDecl> Parser::parseDeclTypeAlias(bool WantDefinition,
new (Context) TypeAliasDecl(TypeAliasLoc, Id, IdLoc,
UnderlyingTy.getPtrOrNull(),
CurDeclContext);
if (Attributes.shouldSaveInAST())
TAD->getMutableAttrs() = Attributes;
TAD->getMutableAttrs() = Attributes;
addToScope(TAD);
return DCC.fixupParserResult(Status, TAD);
}
@@ -2329,8 +2294,7 @@ bool Parser::parseGetSetImpl(ParseDeclOptions Flags, Pattern *Indices,
// Set up a function declaration.
TheDecl = createAccessorFunc(Loc, ValueNamePattern, ElementTy, Indices,
StaticLoc, Flags, Kind, this);
if (Attributes.shouldSaveInAST())
TheDecl->getMutableAttrs() = Attributes;
TheDecl->getMutableAttrs() = Attributes;
Decls.push_back(TheDecl);
}
@@ -2446,9 +2410,7 @@ bool Parser::parseGetSetImpl(ParseDeclOptions Flags, Pattern *Indices,
// Set up a function declaration.
TheDecl = createAccessorFunc(Loc, ValueNamePattern, ElementTy, Indices,
StaticLoc, Flags, Kind, this);
if (Attributes.shouldSaveInAST())
TheDecl->getMutableAttrs() = Attributes;
TheDecl->getMutableAttrs() = Attributes;
// Parse the body, if any.
if (ExternalAsmName) {
@@ -2847,8 +2809,7 @@ ParserStatus Parser::parseDeclVar(ParseDeclOptions Flags,
pattern.get()->forEachVariable([&](VarDecl *VD) {
VD->setStatic(StaticLoc.isValid());
VD->setParentPattern(PBD);
if (Attributes.shouldSaveInAST())
VD->getMutableAttrs() = Attributes;
VD->getMutableAttrs() = Attributes;
Decls.push_back(VD);
});
@@ -3060,8 +3021,7 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
// Add the attributes here so if we need them while parsing the body
// they are available.
if (Attributes.shouldSaveInAST())
FD->getMutableAttrs() = Attributes;
FD->getMutableAttrs() = Attributes;
// Pass the function signature to code completion.
if (SignatureStatus.hasCodeCompletion())
@@ -3185,9 +3145,7 @@ ParserResult<EnumDecl> Parser::parseDeclEnum(ParseDeclOptions Flags,
EnumDecl *UD = new (Context) EnumDecl(EnumLoc, EnumName, EnumNameLoc,
{ }, GenericParams, CurDeclContext);
setLocalDiscriminator(UD);
if (Attributes.shouldSaveInAST())
UD->getMutableAttrs() = Attributes;
UD->getMutableAttrs() = Attributes;
// Parse optional inheritance clause within the context of the enum.
if (Tok.is(tok::colon)) {
@@ -3441,9 +3399,7 @@ ParserResult<StructDecl> Parser::parseDeclStruct(ParseDeclOptions Flags,
GenericParams,
CurDeclContext);
setLocalDiscriminator(SD);
if (Attributes.shouldSaveInAST())
SD->getMutableAttrs() = Attributes;
SD->getMutableAttrs() = Attributes;
// Parse optional inheritance clause within the context of the struct.
if (Tok.is(tok::colon)) {
@@ -3521,8 +3477,7 @@ ParserResult<ClassDecl> Parser::parseDeclClass(SourceLoc ClassLoc,
setLocalDiscriminator(CD);
// Attach attributes.
if (Attributes.shouldSaveInAST())
CD->getMutableAttrs() = Attributes;
CD->getMutableAttrs() = Attributes;
// Parse optional inheritance clause within the context of the class.
if (Tok.is(tok::colon)) {
@@ -3645,8 +3600,7 @@ parseDeclProtocol(ParseDeclOptions Flags, DeclAttributes &Attributes) {
Attributes.removeAttribute(classProto);
}
if (Attributes.shouldSaveInAST())
Proto->getMutableAttrs() = Attributes;
Proto->getMutableAttrs() = Attributes;
ContextChange CC(*this, Proto);
Scope ProtocolBodyScope(this, ScopeKind::ProtocolBody);
@@ -3737,8 +3691,7 @@ ParserStatus Parser::parseDeclSubscript(ParseDeclOptions Flags,
SubscriptLoc, Indices.get(),
ArrowLoc, ElementTy.get(),
CurDeclContext);
if (Attributes.shouldSaveInAST())
Subscript->getMutableAttrs() = Attributes;
Subscript->getMutableAttrs() = Attributes;
Decls.push_back(Subscript);
@@ -3883,8 +3836,7 @@ Parser::parseDeclInit(ParseDeclOptions Flags, DeclAttributes &Attributes,
}
}
if (Attributes.shouldSaveInAST())
CD->getMutableAttrs() = Attributes;
CD->getMutableAttrs() = Attributes;
return makeParserResult(CD);
}
@@ -3942,8 +3894,7 @@ parseDeclDeinit(ParseDeclOptions Flags, DeclAttributes &Attributes) {
}
}
if (Attributes.shouldSaveInAST())
DD->getMutableAttrs() = Attributes;
DD->getMutableAttrs() = Attributes;
// Reject 'destructor' functions outside of classes
if (!(Flags & PD_AllowDestructor)) {
@@ -3961,9 +3912,6 @@ Parser::parseDeclOperator(ParseDeclOptions Flags, DeclAttributes &Attributes) {
SourceLoc OperatorLoc = consumeToken(tok::kw_operator);
bool AllowTopLevel = Flags.contains(PD_AllowTopLevel);
if (Attributes.hasNonVirtualAttributes())
diagnose(Attributes.AtLoc, diag::operator_attributes);
// Check to see if this is declared with the old syntax to help with migration
// FIXME: Remove this.
if (Tok.is(tok::identifier)) {

2
lib/SILGen/SILGenExpr.cpp
View File

@@ -2841,7 +2841,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
SILType::getPrimitiveAddressType(argvDecl->getType()->getCanonicalType()));
argv = B.createLoad(mainClass, argv);
if (mainClass->getAttrs().has(DAK_UIApplicationMain)) {
if (mainClass->getAttrs().hasAttribute<UIApplicationMainAttr>()) {
// Emit a UIKit main.
// return UIApplicationMain(C_ARGC, C_ARGV, nil, ClassName);