summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2016-12-01 19:14:55 +0000
committerSean Callanan <scallanan@apple.com>2016-12-01 19:14:55 +0000
commit0134152cb4613b61f6af262ab4d8c92a5a70dd0d (patch)
treebfada0e2943466f0f7b2c639a1f10a3ca9f8479c
parent5997c9480bca272333139cb79a17f2436c055412 (diff)
downloadbcm5719-llvm-0134152cb4613b61f6af262ab4d8c92a5a70dd0d.tar.gz
bcm5719-llvm-0134152cb4613b61f6af262ab4d8c92a5a70dd0d.zip
Handle empty strings when looking for a CFString's encoding.
Should fix the bots. llvm-svn: 288403
-rw-r--r--lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
index 53c57e9e319..4f41c8ebcbc 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
@@ -500,7 +500,7 @@ bool IRForTarget::RewriteObjCConstString(llvm::GlobalVariable *ns_str,
Constant *numBytes_arg = ConstantInt::get(
m_intptr_ty, cstr ? (string_array->getNumElements() - 1) * string_array->getElementByteSize() : 0, false);
int encoding_flags = 0;
- switch (string_array->getElementByteSize()) {
+ switch (cstr ? string_array->getElementByteSize() : 1) {
case 1:
encoding_flags = 0x08000100; /* 0x08000100 is kCFStringEncodingUTF8 */
break;
OpenPOWER on IntegriCloud