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

SIL: Rename the 'isObjC' SILDeclRef specifier to 'isForeign'.

Browse Source 
Doug pointed out that 'isObjC' incorrectly excludes C functions, for which we'll also need to be able to independently reference Swift and foreign entries.

Swift SVN r8669
This commit is contained in:
Joe Groff
2013-09-25 21:59:03 +00:00
parent c057ca4a81
commit cbfe3710f6
17 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/SIL/SIL.cpp
View File

@@ -40,8 +40,8 @@ static unsigned getFuncNaturalUncurryLevel(AnyFunctionRef AFR) {
SILDeclRef::SILDeclRef(ValueDecl *vd, SILDeclRef::Kind kind,
unsigned atUncurryLevel,
bool isObjC)
: loc(vd), kind(kind), isObjC(isObjC), defaultArgIndex(0)
bool isForeign)
: loc(vd), kind(kind), isForeign(isForeign), defaultArgIndex(0)
{
unsigned naturalUncurryLevel;
@@ -119,7 +119,7 @@ SILDeclRef::SILDeclRef(ValueDecl *vd, SILDeclRef::Kind kind,
SILDeclRef::SILDeclRef(SILDeclRef::Loc baseLoc,
unsigned atUncurryLevel,
bool asObjC)
bool asForeign)
: defaultArgIndex(0)
{
unsigned naturalUncurryLevel;
@@ -159,7 +159,7 @@ SILDeclRef::SILDeclRef(SILDeclRef::Loc baseLoc,
naturalUncurryLevel = 1;
// FIXME: Should we require the caller to think about this?
asObjC = false;
asForeign = false;
}
// Map EnumElementDecls to the EnumElement SILDeclRef of the element.
else if (EnumElementDecl *ed = dyn_cast<EnumElementDecl>(vd)) {
@@ -198,7 +198,7 @@ SILDeclRef::SILDeclRef(SILDeclRef::Loc baseLoc,
: atUncurryLevel;
isCurried = uncurryLevel != naturalUncurryLevel;
isObjC = asObjC;
isForeign = asForeign;
}
SILDeclRef SILDeclRef::getDefaultArgGenerator(Loc loc,