Skip to content

Commit 8c8c99b

Browse files
benlangmuirbenlangmuir
committed
---
yaml --- r: 210440 b: refs/heads/swift-5.0-branch c: 8c78533 h: refs/heads/master
1 parent 1fbfdd9 commit 8c8c99b

File tree

59 files changed

+218
-796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+218
-796
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b7c074342459a645779f106c42bf4
644644
refs/heads/master-llvm-swift5-transition: 8ace18c8953afb3d7d94cf04cacc0b51a7e5f1e3
645645
"refs/heads/revert-12883-disable_modelio_test_ios": a77ae373b809a0d8cb460cf3d1585d618510d242
646646
refs/heads/revert-13597-master: cccee1df039d072215f9bddc2cbc1e32a8d5d5ee
647-
refs/heads/swift-5.0-branch: dbcab4b0029f494063fffe3271043764a35b4f14
647+
refs/heads/swift-5.0-branch: 8c78533e57f6c67d0fbc921f55d291bfaef10480
648648
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b32214f7e04339dfada623b6b76dbebfb41e4541
649649
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-24-a: 1eb0be506c0744c7eff0550a10240286046e181d
650650
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-25-a: f35a91502bad0065c83d8760407c23be7b899f48

‎branches/swift-5.0-branch/cmake/modules/AddSwift.cmake

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,10 @@ function(_add_variant_c_compile_link_flags)
123123
list(APPEND result "-target" "${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_TRIPLE}${DEPLOYMENT_VERSION}")
124124
endif()
125125

126-
set(_sysroot "${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_PATH}")
127126
if(IS_DARWIN)
128-
list(APPEND result "-isysroot" "${_sysroot}")
129-
elseif(NOT SWIFT_COMPILER_IS_MSVC_LIKE AND NOT "${_sysroot}" STREQUAL "/")
130-
list(APPEND result "--sysroot=${_sysroot}")
127+
list(APPEND result "-isysroot" "${SWIFT_SDK_${CFLAGS_SDK}_PATH}")
128+
elseif(NOT SWIFT_COMPILER_IS_MSVC_LIKE AND NOT "${SWIFT_SDK_${CFLAGS_SDK}_PATH}" STREQUAL "/")
129+
list(APPEND result "--sysroot=${SWIFT_SDK_${CFLAGS_SDK}_PATH}")
131130
endif()
132131

133132
if("${CFLAGS_SDK}" STREQUAL "ANDROID")
@@ -295,9 +294,9 @@ function(_add_variant_swift_compile_flags
295294
sdk arch build_type enable_assertions result_var_name)
296295
set(result ${${result_var_name}})
297296

298-
# On Windows, we don't set SWIFT_SDK_WINDOWS_PATH_ARCH_{ARCH}_PATH, so don't include it.
297+
# On Windows, we don't set SWIFT_SDK_WINDOWS_PATH, so don't include it.
299298
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
300-
list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}")
299+
list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_PATH}")
301300
endif()
302301

303302
is_darwin_based_sdk("${sdk}" IS_DARWIN)
@@ -315,7 +314,7 @@ function(_add_variant_swift_compile_flags
315314

316315
if(IS_DARWIN)
317316
list(APPEND result
318-
"-F" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/../../../Developer/Library/Frameworks")
317+
"-F" "${SWIFT_SDK_${sdk}_PATH}/../../../Developer/Library/Frameworks")
319318
endif()
320319

321320
is_build_type_optimized("${build_type}" optimized)
@@ -1620,7 +1619,7 @@ function(add_swift_library name)
16201619
# Add PrivateFrameworks, rdar://28466433
16211620
set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})
16221621
if(SWIFTLIB_IS_SDK_OVERLAY)
1623-
list(APPEND swiftlib_swift_compile_flags_all "-Fsystem" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/System/Library/PrivateFrameworks/")
1622+
list(APPEND swiftlib_swift_compile_flags_all "-Fsystem" "${SWIFT_SDK_${sdk}_PATH}/System/Library/PrivateFrameworks/")
16241623
endif()
16251624

16261625
if("${sdk}" STREQUAL "IOS_SIMULATOR")

‎branches/swift-5.0-branch/cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function(_report_sdk prefix)
2222
message(STATUS " ${arch} LIB: ${${arch}_LIB}")
2323
endforeach()
2424
else()
25+
message(STATUS " Path: ${SWIFT_SDK_${prefix}_PATH}")
2526
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
2627
message(STATUS " ${arch} Path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_PATH}")
2728
endforeach()
@@ -144,6 +145,7 @@ macro(configure_sdk_unix
144145

145146
# Todo: this only supports building an SDK for one target arch only.
146147
set(SWIFT_SDK_${prefix}_NAME "${name}")
148+
set(SWIFT_SDK_${prefix}_PATH "${sdkpath}")
147149
set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "${sdkpath}")
148150
set(SWIFT_SDK_${prefix}_VERSION "don't use")
149151
set(SWIFT_SDK_${prefix}_BUILD_NUMBER "don't use")
@@ -171,6 +173,10 @@ macro(configure_sdk_windows prefix sdk_name environment architectures)
171173
# variables.
172174

173175
set(SWIFT_SDK_${prefix}_NAME "${sdk_name}")
176+
# NOTE: set the path to / to avoid a spurious `--sysroot` from being passed
177+
# to the driver -- rely on the `INCLUDE` AND `LIB` environment variables
178+
# instead.
179+
set(SWIFT_SDK_${prefix}_PATH "/")
174180
set(SWIFT_SDK_${prefix}_VERSION "NOTFOUND")
175181
set(SWIFT_SDK_${prefix}_BUILD_NUMBER "NOTFOUND")
176182
set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "")
@@ -188,9 +194,6 @@ macro(configure_sdk_windows prefix sdk_name environment architectures)
188194
set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
189195
"${arch}-unknown-windows-${environment}")
190196
endif()
191-
# NOTE: set the path to / to avoid a spurious `--sysroot` from being passed
192-
# to the driver -- rely on the `INCLUDE` AND `LIB` environment variables
193-
# instead.
194197
set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")
195198
endforeach()
196199

‎branches/swift-5.0-branch/include/swift/AST/DiagnosticsSema.def

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3166,9 +3166,6 @@ ERROR(tuple_ellipsis,none,
31663166
WARNING(implicitly_unwrapped_optional_in_illegal_position_interpreted_as_optional,none,
31673167
"using '!' is not allowed here; treating this as '?' instead", ())
31683168

3169-
WARNING(implicitly_unwrapped_optional_deprecated_in_this_position,none,
3170-
"using '!' here is deprecated and will be removed in a future release", ())
3171-
31723169
ERROR(implicitly_unwrapped_optional_in_illegal_position,none,
31733170
"using '!' is not allowed here; perhaps '?' was intended?", ())
31743171

‎branches/swift-5.0-branch/include/swift/AST/SILOptions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ class SILOptions {
4545
enum LinkingMode {
4646
/// Skip SIL linking.
4747
LinkNone,
48-
49-
/// Link only the given function without recursively visiting its uses.
50-
LinkThisFunctionOnly,
5148

5249
/// Perform normal SIL linking.
5350
LinkNormal,

‎branches/swift-5.0-branch/include/swift/SIL/SILBuilder.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -794,11 +794,9 @@ class SILBuilder {
794794
}
795795

796796
ConvertEscapeToNoEscapeInst *
797-
createConvertEscapeToNoEscape(SILLocation Loc, SILValue Op, SILType Ty,
798-
bool lifetimeGuaranteed) {
797+
createConvertEscapeToNoEscape(SILLocation Loc, SILValue Op, SILType Ty) {
799798
return insert(ConvertEscapeToNoEscapeInst::create(
800-
getSILDebugLocation(Loc), Op, Ty, getFunction(), OpenedArchetypes,
801-
lifetimeGuaranteed));
799+
getSILDebugLocation(Loc), Op, Ty, getFunction(), OpenedArchetypes));
802800
}
803801

804802
ThinFunctionToPointerInst *

‎branches/swift-5.0-branch/include/swift/SIL/SILCloner.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,10 +984,10 @@ template <typename ImplClass>
984984
void SILCloner<ImplClass>::visitConvertEscapeToNoEscapeInst(
985985
ConvertEscapeToNoEscapeInst *Inst) {
986986
getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
987-
doPostProcess(
988-
Inst, getBuilder().createConvertEscapeToNoEscape(
989-
getOpLocation(Inst->getLoc()), getOpValue(Inst->getOperand()),
990-
getOpType(Inst->getType()), Inst->isLifetimeGuaranteed()));
987+
doPostProcess(Inst, getBuilder().createConvertEscapeToNoEscape(
988+
getOpLocation(Inst->getLoc()),
989+
getOpValue(Inst->getOperand()),
990+
getOpType(Inst->getType())));
991991
}
992992

993993
template<typename ImplClass>

‎branches/swift-5.0-branch/include/swift/SIL/SILInstruction.h

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3951,26 +3951,18 @@ class ConvertEscapeToNoEscapeInst final
39513951
ConvertEscapeToNoEscapeInst, ConversionInst> {
39523952
friend SILBuilder;
39533953

3954-
bool lifetimeGuaranteed;
3955-
39563954
ConvertEscapeToNoEscapeInst(SILDebugLocation DebugLoc, SILValue Operand,
3957-
ArrayRef<SILValue> TypeDependentOperands,
3958-
SILType Ty, bool isLifetimeGuaranteed)
3955+
ArrayRef<SILValue> TypeDependentOperands,
3956+
SILType Ty)
39593957
: UnaryInstructionWithTypeDependentOperandsBase(
3960-
DebugLoc, Operand, TypeDependentOperands, Ty),
3961-
lifetimeGuaranteed(isLifetimeGuaranteed) {
3958+
DebugLoc, Operand, TypeDependentOperands, Ty) {
39623959
assert(!Operand->getType().castTo<SILFunctionType>()->isNoEscape());
39633960
assert(Ty.castTo<SILFunctionType>()->isNoEscape());
39643961
}
39653962

39663963
static ConvertEscapeToNoEscapeInst *
39673964
create(SILDebugLocation DebugLoc, SILValue Operand, SILType Ty,
3968-
SILFunction &F, SILOpenedArchetypesState &OpenedArchetypes,
3969-
bool lifetimeGuaranteed);
3970-
public:
3971-
bool isLifetimeGuaranteed() const {
3972-
return lifetimeGuaranteed;
3973-
}
3965+
SILFunction &F, SILOpenedArchetypesState &OpenedArchetypes);
39743966
};
39753967

39763968
/// ThinFunctionToPointerInst - Convert a thin function pointer to a

‎branches/swift-5.0-branch/include/swift/SIL/SILModule.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -715,11 +715,6 @@ class SILModule {
715715
bool isDefaultAtomic() const {
716716
return ! getOptions().AssumeSingleThreaded;
717717
}
718-
719-
/// Returns true if SIL entities associated with declarations in the given
720-
/// declaration context ought to be serialized as part of this module.
721-
bool shouldSerializeEntitiesAssociatedWithDeclContext(const DeclContext *DC)
722-
const;
723718
};
724719

725720
inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const SILModule &M){

‎branches/swift-5.0-branch/include/swift/Serialization/ModuleFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const uint16_t VERSION_MAJOR = 0;
5656
/// it just ensures a conflict if two people change the module format.
5757
/// Don't worry about adhering to the 80-column limit for this line.
5858

59-
const uint16_t VERSION_MINOR = 407; // Last change: convert_escape_to_noescape
59+
const uint16_t VERSION_MINOR = 406; // Last change: EnumElementDecl resilience expansion
6060

6161
using DeclIDField = BCFixed<31>;
6262

‎branches/swift-5.0-branch/lib/AST/DeclContext.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,9 @@ static Type computeExtensionType(const ExtensionDecl *ED, DeclTypeKind kind) {
146146
return type->getAnyNominal()->getDeclaredType();
147147
case DeclTypeKind::DeclaredTypeInContext:
148148
return type;
149-
case DeclTypeKind::DeclaredInterfaceType: {
149+
case DeclTypeKind::DeclaredInterfaceType:
150150
// FIXME: Need a sugar-preserving getExtendedInterfaceType for extensions
151-
if (auto nominal = type->getAnyNominal())
152-
return nominal->getDeclaredInterfaceType();
153-
154-
auto typealias = cast<TypeAliasDecl>(type->getAnyGeneric());
155-
return typealias->getUnderlyingTypeLoc().getType();
156-
}
151+
return type->getAnyNominal()->getDeclaredInterfaceType();
157152
}
158153

159154
llvm_unreachable("Unhandled DeclTypeKind in switch.");

‎branches/swift-5.0-branch/lib/Basic/Statistic.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,8 @@ getChildrenMaxResidentSetSize() {
4545
struct rusage RU;
4646
::getrusage(RUSAGE_CHILDREN, &RU);
4747
int64_t M = static_cast<int64_t>(RU.ru_maxrss);
48-
if (M < 0) {
48+
if (M < 0)
4949
M = std::numeric_limits<int64_t>::max();
50-
} else {
51-
#ifndef __APPLE__
52-
// Apple systems report bytes; everything else appears to report KB.
53-
M <<= 10;
54-
#endif
55-
}
5650
return M;
5751
#else
5852
return 0;

‎branches/swift-5.0-branch/lib/IDE/SourceEntityWalker.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ bool SemaAnnotator::walkToDeclPost(Decl *D) {
197197
ExtDecls.pop_back();
198198
}
199199

200-
if (!isa<ValueDecl>(D) && !isa<ExtensionDecl>(D) && !isa<ImportDecl>(D) &&
201-
!isa<IfConfigDecl>(D))
200+
if (!isa<ValueDecl>(D) && !isa<ExtensionDecl>(D) && !isa<ImportDecl>(D))
202201
return true;
203202

204203
bool Continue = SEWalker.walkToDeclPost(D);

‎branches/swift-5.0-branch/lib/IRGen/GenDecl.cpp

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,8 +1054,7 @@ void IRGenerator::emitGlobalTopLevel() {
10541054
unsigned nextOrderNumber = 0;
10551055
for (auto &silFn : PrimaryIGM->getSILModule().getFunctions()) {
10561056
// Don't bother adding external declarations to the function order.
1057-
if (!silFn.isDefinition())
1058-
continue;
1057+
if (!silFn.isDefinition()) continue;
10591058
FunctionOrder.insert(std::make_pair(&silFn, nextOrderNumber++));
10601059
}
10611060

@@ -1205,15 +1204,6 @@ void IRGenerator::emitLazyDefinitions() {
12051204
}
12061205

12071206
void IRGenerator::addLazyFunction(SILFunction *f) {
1208-
// If the function is a shared declaration, it may have a body to
1209-
// deserialize.
1210-
if (!f->isDefinition() && hasSharedVisibility(f->getLinkage())) {
1211-
SIL.linkFunction(f, SILOptions::LinkingMode::LinkThisFunctionOnly);
1212-
if (!f->isDefinition())
1213-
return;
1214-
FunctionOrder.insert({f, FunctionOrder.size()});
1215-
}
1216-
12171207
// Add it to the queue if it hasn't already been put there.
12181208
if (!LazilyEmittedFunctions.insert(f).second)
12191209
return;
@@ -2251,8 +2241,8 @@ llvm::Function *IRGenModule::getAddrOfSILFunction(SILFunction *f,
22512241
clangAddr = getAddrOfClangGlobalDecl(globalDecl, forDefinition);
22522242
}
22532243

2254-
bool isDefinition = f->isDefinition() || hasSharedVisibility(f->getLinkage());
2255-
bool hasOrderNumber = f->isDefinition();
2244+
bool isDefinition = f->isDefinition();
2245+
bool hasOrderNumber = isDefinition;
22562246
unsigned orderNumber = ~0U;
22572247
llvm::Function *insertBefore = nullptr;
22582248

@@ -2283,9 +2273,8 @@ llvm::Function *IRGenModule::getAddrOfSILFunction(SILFunction *f,
22832273
}
22842274

22852275
// Otherwise, if we have a lazy definition for it, be sure to queue that up.
2286-
} else if (isDefinition
2287-
&& !forDefinition && !f->isPossiblyUsedExternally()
2288-
&& !hasCodeCoverageInstrumentation(*f, getSILModule())) {
2276+
} else if (isDefinition && !forDefinition && !f->isPossiblyUsedExternally() &&
2277+
!hasCodeCoverageInstrumentation(*f, getSILModule())) {
22892278
IRGen.addLazyFunction(f);
22902279
}
22912280

@@ -4127,7 +4116,7 @@ llvm::StructType *IRGenModule::getGenericWitnessTableCacheTy() {
41274116
llvm::Function *
41284117
IRGenModule::getAddrOfWitnessTableAccessFunction(
41294118
const NormalProtocolConformance *conf,
4130-
ForDefinition_t forDefinition) {
4119+
ForDefinition_t forDefinition) {
41314120
IRGen.addLazyWitnessTable(conf);
41324121

41334122
LinkEntity entity = LinkEntity::forProtocolWitnessTableAccessFunction(conf);

‎branches/swift-5.0-branch/lib/IRGen/IRGenModule.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "swift/IRGen/Linking.h"
2525
#include "swift/Runtime/RuntimeFnWrappersGen.h"
2626
#include "swift/Runtime/Config.h"
27-
#include "swift/SIL/FormalLinkage.h"
2827
#include "clang/AST/ASTContext.h"
2928
#include "clang/Basic/CharInfo.h"
3029
#include "clang/Basic/TargetInfo.h"
@@ -659,9 +658,6 @@ llvm::Module *IRGenModule::releaseModule() {
659658
}
660659

661660
bool IRGenerator::canEmitWitnessTableLazily(SILWitnessTable *wt) {
662-
if (LazilyEmittedWitnessTables.count(wt))
663-
return true;
664-
665661
if (Opts.UseJIT)
666662
return false;
667663

@@ -689,21 +685,6 @@ void IRGenerator::addLazyWitnessTable(const ProtocolConformance *Conf) {
689685
LazilyEmittedWitnessTables.insert(wt).second) {
690686
LazyWitnessTables.push_back(wt);
691687
}
692-
// Shared-linkage protocol conformances may not have been deserialized yet
693-
// if they were used by inlined code. See if we can deserialize it now.
694-
} else {
695-
auto linkage =
696-
getLinkageForProtocolConformance(Conf->getRootNormalConformance(),
697-
ForDefinition);
698-
if (hasSharedVisibility(linkage)) {
699-
SIL.createWitnessTableDeclaration(const_cast<ProtocolConformance*>(Conf),
700-
linkage);
701-
SILWitnessTable *wt = SIL.lookUpWitnessTable(Conf);
702-
if (wt && wt->isDefinition()
703-
&& LazilyEmittedWitnessTables.insert(wt).second) {
704-
LazyWitnessTables.push_back(wt);
705-
}
706-
}
707688
}
708689
}
709690

‎branches/swift-5.0-branch/lib/IRGen/LoadableByAddress.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,8 +2495,7 @@ void LoadableByAddress::recreateConvInstrs() {
24952495
case SILInstructionKind::ConvertEscapeToNoEscapeInst: {
24962496
auto instr = cast<ConvertEscapeToNoEscapeInst>(convInstr);
24972497
newInstr = convBuilder.createConvertEscapeToNoEscape(
2498-
instr->getLoc(), instr->getOperand(), newType,
2499-
instr->isLifetimeGuaranteed());
2498+
instr->getLoc(), instr->getOperand(), newType);
25002499
break;
25012500
}
25022501
case SILInstructionKind::MarkDependenceInst: {

‎branches/swift-5.0-branch/lib/ParseSIL/ParseSIL.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2979,10 +2979,6 @@ bool SILParser::parseSILInstruction(SILBuilder &B) {
29792979
SILType Ty;
29802980
Identifier ToToken;
29812981
SourceLoc ToLoc;
2982-
bool guaranteed = true;
2983-
if (Opcode == SILInstructionKind::ConvertEscapeToNoEscapeInst)
2984-
if(parseSILOptional(guaranteed, *this, "not_guaranteed"))
2985-
return true;
29862982
if (parseTypedValueRef(Val, B) ||
29872983
parseSILIdentifier(ToToken, ToLoc,
29882984
diag::expected_tok_in_sil_instr, "to") ||
@@ -3016,7 +3012,7 @@ bool SILParser::parseSILInstruction(SILBuilder &B) {
30163012
ResultVal = B.createConvertFunction(InstLoc, Val, Ty);
30173013
break;
30183014
case SILInstructionKind::ConvertEscapeToNoEscapeInst:
3019-
ResultVal = B.createConvertEscapeToNoEscape(InstLoc, Val, Ty, guaranteed);
3015+
ResultVal = B.createConvertEscapeToNoEscape(InstLoc, Val, Ty);
30203016
break;
30213017
case SILInstructionKind::AddressToPointerInst:
30223018
ResultVal = B.createAddressToPointer(InstLoc, Val, Ty);

‎branches/swift-5.0-branch/lib/SIL/Linker.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ bool SILLinkerVisitor::processFunction(SILFunction *F) {
4747

4848
++NumFuncLinked;
4949

50-
if (Mode == LinkingMode::LinkThisFunctionOnly)
51-
return true;
52-
5350
// Try to transitively deserialize everything referenced by this
5451
// function.
5552
Worklist.push_back(F);
@@ -71,9 +68,6 @@ bool SILLinkerVisitor::processFunction(StringRef Name) {
7168
return false;
7269

7370
++NumFuncLinked;
74-
75-
if (Mode == LinkingMode::LinkThisFunctionOnly)
76-
return true;
7771

7872
// Try to transitively deserialize everything referenced by NewFn.
7973
Worklist.push_back(NewFn);

0 commit comments

Comments
 (0)