[cfe-commits] r82539 - in /cfe/trunk/lib: AST/StmtProfile.cpp CodeGen/CodeGenModule.cpp Sema/SemaChecking.cpp
Daniel Dunbar
daniel at zuster.org
Tue Sep 22 03:03:52 PDT 2009
Author: ddunbar
Date: Tue Sep 22 05:03:52 2009
New Revision: 82539
URL: http://llvm.org/viewvc/llvm-project?rev=82539&view=rev
Log:
Revert "Switch a few clients over to StringLiteral::getString.", this is breaking some projects, but I don't have a test case yet.
Modified:
cfe/trunk/lib/AST/StmtProfile.cpp
cfe/trunk/lib/CodeGen/CodeGenModule.cpp
cfe/trunk/lib/Sema/SemaChecking.cpp
Modified: cfe/trunk/lib/AST/StmtProfile.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=82539&r1=82538&r2=82539&view=diff
==============================================================================
--- cfe/trunk/lib/AST/StmtProfile.cpp (original)
+++ cfe/trunk/lib/AST/StmtProfile.cpp Tue Sep 22 05:03:52 2009
@@ -237,7 +237,7 @@
void StmtProfiler::VisitStringLiteral(StringLiteral *S) {
VisitExpr(S);
- ID.AddString(S->getString());
+ ID.AddString(S->getStrData(), S->getStrData() + S->getByteLength());
ID.AddBoolean(S->isWide());
}
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=82539&r1=82538&r2=82539&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Tue Sep 22 05:03:52 2009
@@ -1310,12 +1310,15 @@
bool TargetIsLSB,
bool &IsUTF16,
unsigned &StringLength) {
- // Check for simple case.
- if (!Literal->containsNonAsciiOrNull())
- return Map.GetOrCreateValue(Literal->getString());
-
unsigned NumBytes = Literal->getByteLength();
+ // Check for simple case.
+ if (!Literal->containsNonAsciiOrNull()) {
+ StringLength = NumBytes;
+ return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(),
+ StringLength));
+ }
+
// Otherwise, convert the UTF8 literals into a byte string.
llvm::SmallVector<UTF16, 128> ToBuf(NumBytes);
const UTF8 *FromPtr = (UTF8 *)Literal->getStrData();
@@ -1330,7 +1333,9 @@
// FIXME: Have Sema::CheckObjCString() validate the UTF-8 string and remove
// this duplicate code.
assert(Result == sourceIllegal && "UTF-8 to UTF-16 conversion failed");
- return Map.GetOrCreateValue(Literal->getString());
+ StringLength = NumBytes;
+ return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(),
+ StringLength));
}
// ConvertUTF8toUTF16 returns the length in ToPtr.
Modified: cfe/trunk/lib/Sema/SemaChecking.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=82539&r1=82538&r2=82539&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaChecking.cpp (original)
+++ cfe/trunk/lib/Sema/SemaChecking.cpp Tue Sep 22 05:03:52 2009
@@ -447,13 +447,17 @@
return true;
}
- llvm::StringRef Str = Literal->getString();
- size_t NullLoc = Str.find('\0');
+ const char *Data = Literal->getStrData();
+ unsigned Length = Literal->getByteLength();
- if (NullLoc != llvm::StringRef::npos)
- Diag(getLocationOfStringLiteralByte(Literal, NullLoc),
- diag::warn_cfstring_literal_contains_nul_character)
- << Arg->getSourceRange();
+ for (unsigned i = 0; i < Length; ++i) {
+ if (!Data[i]) {
+ Diag(getLocationOfStringLiteralByte(Literal, i),
+ diag::warn_cfstring_literal_contains_nul_character)
+ << Arg->getSourceRange();
+ break;
+ }
+ }
return false;
}
More information about the cfe-commits
mailing list