intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-25 19:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch a few clients over to StringLiteral::getString.

Browse Source 
- Switching all of them out-of-my-current-scope-of-interest, sorry.

llvm-svn: 82515
This commit is contained in:
Daniel Dunbar
2009-09-22 03:27:52 +00:00
parent 362178883c
commit 5de27daf93
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/AST/StmtProfile.cpp
View File

@@ -237,7 +237,7 @@ void StmtProfiler::VisitImaginaryLiteral(ImaginaryLiteral *S) {
void StmtProfiler::VisitStringLiteral(StringLiteral *S) {
VisitExpr(S);
ID.AddString(S->getStrData(), S->getStrData() + S->getByteLength());
ID.AddString(S->getString());
ID.AddBoolean(S->isWide());
}

15
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -1310,14 +1310,11 @@ GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map,
bool TargetIsLSB,
bool &IsUTF16,
unsigned &StringLength) {
unsigned NumBytes = Literal->getByteLength();
// Check for simple case.
if (!Literal->containsNonAsciiOrNull()) {
StringLength = NumBytes;
return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(),
StringLength));
}
if (!Literal->containsNonAsciiOrNull())
return Map.GetOrCreateValue(Literal->getString());
unsigned NumBytes = Literal->getByteLength();
// Otherwise, convert the UTF8 literals into a byte string.
llvm::SmallVector<UTF16, 128> ToBuf(NumBytes);
@@ -1333,9 +1330,7 @@ GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map,
// FIXME: Have Sema::CheckObjCString() validate the UTF-8 string and remove
// this duplicate code.
assert(Result == sourceIllegal && "UTF-8 to UTF-16 conversion failed");
StringLength = NumBytes;
return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(),
StringLength));
return Map.GetOrCreateValue(Literal->getString());
}
// ConvertUTF8toUTF16 returns the length in ToPtr.

16
clang/lib/Sema/SemaChecking.cpp
View File

@@ -447,17 +447,13 @@ bool Sema::CheckObjCString(Expr *Arg) {
return true;
}
const char *Data = Literal->getStrData();
unsigned Length = Literal->getByteLength();
llvm::StringRef Str = Literal->getString();
size_t NullLoc = Str.find('\0');
for (unsigned i = 0; i < Length; ++i) {
if (!Data[i]) {
Diag(getLocationOfStringLiteralByte(Literal, i),
diag::warn_cfstring_literal_contains_nul_character)
<< Arg->getSourceRange();
break;
}
}
if (NullLoc != llvm::StringRef::npos)
Diag(getLocationOfStringLiteralByte(Literal, NullLoc),
diag::warn_cfstring_literal_contains_nul_character)
<< Arg->getSourceRange();
return false;
}