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] NFC: Repack misc StringLiteralInst bits

Browse Source
This commit is contained in:
David Zarzycki
2017-12-22 10:53:25 -05:00
parent fcfdd4c8ca
commit 5012a80e39
3 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/SIL/SILInstructions.cpp
View File

@@ -739,8 +739,9 @@ APFloat FloatLiteralInst::getValue() const {
StringLiteralInst::StringLiteralInst(SILDebugLocation Loc, StringRef Text,
Encoding encoding, SILType Ty)
: InstructionBase(Loc, Ty), Length(Text.size()),
TheEncoding(encoding) {
: InstructionBase(Loc, Ty) {
SILInstruction::Bits.StringLiteralInst.TheEncoding = unsigned(encoding);
SILInstruction::Bits.StringLiteralInst.Length = Text.size();
memcpy(getTrailingObjects<char>(), Text.data(), Text.size());
}
@@ -755,16 +756,18 @@ StringLiteralInst *StringLiteralInst::create(SILDebugLocation Loc,
}
uint64_t StringLiteralInst::getCodeUnitCount() {
if (TheEncoding == Encoding::UTF16)
auto E = unsigned(Encoding::UTF16);
if (SILInstruction::Bits.StringLiteralInst.TheEncoding == E)
return unicode::getUTF16Length(getValue());
return Length;
return SILInstruction::Bits.StringLiteralInst.Length;
}
ConstStringLiteralInst::ConstStringLiteralInst(SILDebugLocation Loc,
StringRef Text,
Encoding encoding, SILType Ty)
: InstructionBase(Loc, Ty),
Length(Text.size()), TheEncoding(encoding) {
: InstructionBase(Loc, Ty) {
SILInstruction::Bits.ConstStringLiteralInst.TheEncoding = unsigned(encoding);
SILInstruction::Bits.ConstStringLiteralInst.Length = Text.size();
memcpy(getTrailingObjects<char>(), Text.data(), Text.size());
}
@@ -780,9 +783,10 @@ ConstStringLiteralInst *ConstStringLiteralInst::create(SILDebugLocation Loc,
}
uint64_t ConstStringLiteralInst::getCodeUnitCount() {
if (TheEncoding == Encoding::UTF16)
auto E = unsigned(Encoding::UTF16);
if (SILInstruction::Bits.ConstStringLiteralInst.TheEncoding == E)
return unicode::getUTF16Length(getValue());
return Length;
return SILInstruction::Bits.ConstStringLiteralInst.Length;
}
StoreInst::StoreInst(