Skip to content

Commit 4b31d37

Browse files
committed
[cast-opt] Rename misnamed variable.
This is actually an out parameter of the apply that we are then switching upon.
1 parent 17d65dc commit 4b31d37

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/SILOptimizer/Utils/CastOptimizer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,24 +320,24 @@ CastOptimizer::optimizeBridgedObjCToSwiftCast(SILDynamicCastInst dynamicCast) {
320320
// Temporary to hold the intermediate result.
321321
AllocStackInst *Tmp = nullptr;
322322
CanType OptionalTy;
323-
SILValue InOutOptionalParam;
323+
SILValue outOptionalParam;
324324
if (isConditional) {
325325
// Create a temporary
326326
OptionalTy = OptionalType::get(Dest->getType().getASTType())
327327
->getImplementationType()
328328
->getCanonicalType();
329329
Tmp = Builder.createAllocStack(Loc,
330330
SILType::getPrimitiveObjectType(OptionalTy));
331-
InOutOptionalParam = Tmp;
331+
outOptionalParam = Tmp;
332332
} else {
333-
InOutOptionalParam = Dest;
333+
outOptionalParam = Dest;
334334
}
335335

336336
// Emit a retain.
337337
SILValue srcArg = Builder.emitCopyValueOperation(Loc, srcOp);
338338

339339
SmallVector<SILValue, 1> Args;
340-
Args.push_back(InOutOptionalParam);
340+
Args.push_back(outOptionalParam);
341341
Args.push_back(srcArg);
342342
Args.push_back(MetaTyVal);
343343

@@ -415,13 +415,13 @@ CastOptimizer::optimizeBridgedObjCToSwiftCast(SILDynamicCastInst dynamicCast) {
415415
CaseBBs.emplace_back(SomeDecl, BridgeSuccessBB);
416416
CaseBBs.emplace_back(mod.getASTContext().getOptionalNoneDecl(), FailureBB);
417417

418-
Builder.createSwitchEnumAddr(Loc, InOutOptionalParam, nullptr, CaseBBs);
418+
Builder.createSwitchEnumAddr(Loc, outOptionalParam, nullptr, CaseBBs);
419419

420420
Builder.setInsertionPoint(FailureBB->begin());
421421
Builder.createDeallocStack(Loc, Tmp);
422422

423423
Builder.setInsertionPoint(BridgeSuccessBB);
424-
auto Addr = Builder.createUncheckedTakeEnumDataAddr(Loc, InOutOptionalParam,
424+
auto Addr = Builder.createUncheckedTakeEnumDataAddr(Loc, outOptionalParam,
425425
SomeDecl);
426426

427427
Builder.createCopyAddr(Loc, Addr, Dest, IsTake, IsInitialization);

0 commit comments

Comments
 (0)