summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-09-08 07:16:20 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-09-08 07:16:20 +0000
commit639b8d05dd2432f0609774f7963b5780dd5366e1 (patch)
treede4121f4117db133f5da18d62912166d624fa12e /clang/lib/CodeGen
parent3e41a5bb3176c2163f1646f313e91c9674658e77 (diff)
downloadbcm5719-llvm-639b8d05dd2432f0609774f7963b5780dd5366e1.tar.gz
bcm5719-llvm-639b8d05dd2432f0609774f7963b5780dd5366e1.zip
When a bad UTF-8 encoding or bogus escape sequence is encountered in a
string literal, produce a diagnostic pointing at the erroneous character range, not at the start of the literal. llvm-svn: 163459
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGExpr.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 4fb81eb43ce..9e172615f4f 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1851,8 +1851,9 @@ GetAddrOfConstantWideString(StringRef Str,
static void ConvertUTF8ToWideString(unsigned CharByteWidth, StringRef Source,
SmallString<32>& Target) {
Target.resize(CharByteWidth * (Source.size() + 1));
- char* ResultPtr = &Target[0];
- bool success = ConvertUTF8toWide(CharByteWidth, Source, ResultPtr);
+ char *ResultPtr = &Target[0];
+ const UTF8 *ErrorPtr;
+ bool success = ConvertUTF8toWide(CharByteWidth, Source, ResultPtr, ErrorPtr);
(void)success;
assert(success);
Target.resize(ResultPtr - &Target[0]);
OpenPOWER on IntegriCloud