Skip to content

Commit 10e996b

Browse files
authored
Merge pull request swiftlang#78172 from tshortli/deserializer-readloc-warnings
Serialization: Fix a warning in SILDeserializer::readLoc()
2 parents 7486e96 + 05ffc86 commit 10e996b

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

lib/Serialization/DeserializeSIL.cpp

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ SILDeserializer::readNextRecord(SmallVectorImpl<uint64_t> &scratch) {
394394
return maybeKind;
395395
}
396396

397-
std::optional<SILLocation> SILDeserializer::readLoc(unsigned kind,
398-
SmallVectorImpl<uint64_t> &scratch) {
397+
std::optional<SILLocation>
398+
SILDeserializer::readLoc(unsigned kind, SmallVectorImpl<uint64_t> &scratch) {
399399
unsigned LocationKind, Implicit = 0;
400400
SILLocation::FilenameAndLocation *FNameLoc = nullptr;
401401
// Each SourceLoc opaque pointer is serialized once. Successive appearences
@@ -409,27 +409,30 @@ std::optional<SILLocation> SILDeserializer::readLoc(unsigned kind,
409409
FNameLoc = ParsedLocs[LocID - 1];
410410
} else {
411411
ValueID Row = 0, Col = 0, FNameID = 0;
412-
SourceLocLayout::readRecord(scratch, Row, Col, FNameID, LocationKind, Implicit);
413-
412+
SourceLocLayout::readRecord(scratch, Row, Col, FNameID, LocationKind,
413+
Implicit);
414414

415415
FNameLoc = SILLocation::FilenameAndLocation::alloc(
416416
Row, Col, MF->getIdentifierText(FNameID), SILMod);
417417

418418
ParsedLocs.push_back(FNameLoc);
419419
}
420420

421-
switch(LocationKind) {
422-
case SILLocation::ReturnKind:
423-
return ReturnLocation(FNameLoc, Implicit);
424-
case SILLocation::ImplicitReturnKind:
425-
return ImplicitReturnLocation(FNameLoc, Implicit);
426-
case SILLocation::InlinedKind:
427-
case SILLocation::MandatoryInlinedKind:
428-
case SILLocation::CleanupKind:
429-
case SILLocation::ArtificialUnreachableKind:
430-
case SILLocation::RegularKind:
431-
return RegularLocation(FNameLoc, Implicit);
421+
switch (LocationKind) {
422+
case SILLocation::ReturnKind:
423+
return ReturnLocation(FNameLoc, Implicit);
424+
case SILLocation::ImplicitReturnKind:
425+
return ImplicitReturnLocation(FNameLoc, Implicit);
426+
case SILLocation::InlinedKind:
427+
case SILLocation::MandatoryInlinedKind:
428+
case SILLocation::CleanupKind:
429+
case SILLocation::ArtificialUnreachableKind:
430+
case SILLocation::RegularKind:
431+
return RegularLocation(FNameLoc, Implicit);
432432
}
433+
434+
// LocationKind was not a recognized SILLocation::LocationKind.
435+
return std::nullopt;
433436
}
434437

435438
llvm::Expected<const SILDebugScope *>

0 commit comments

Comments
 (0)