maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixes for two bugs: 

- Objective-C constant strings were being
  NULL-terminated erroneously.

- Empty Objective-C constant strings were not
  being generated correctly.

Also added the template for a test of these
fixes.

llvm-svn: 125314
This commit is contained in:
Sean Callanan 2011-02-10 22:17:53 +00:00
parent 9524110d98
commit 229ce2d5b1
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lldb/source/Expression/IRForTarget.cpp
View File

@ -478,13 +478,18 @@ IRForTarget::RewriteObjCConstString (llvm::Module &llvm_module,
m_CFStringCreateWithBytes = ConstantExpr::getIntToPtr(CFSCWB_addr_int, CFSCWB_ptr_ty);
}
ConstantArray *string_array = dyn_cast<ConstantArray>(cstr->getInitializer());
ConstantArray *string_array;
if (cstr)
string_array = dyn_cast<ConstantArray>(cstr->getInitializer());
else
string_array = NULL;
SmallVector <Value*, 5> CFSCWB_arguments;
Constant *alloc_arg = Constant::getNullValue(i8_ptr_ty);
Constant *bytes_arg = ConstantExpr::getBitCast(cstr, i8_ptr_ty);
Constant *numBytes_arg = ConstantInt::get(intptr_ty, string_array->getType()->getNumElements(), false);
Constant *bytes_arg = cstr ? ConstantExpr::getBitCast(cstr, i8_ptr_ty) : Constant::getNullValue(i8_ptr_ty);
Constant *numBytes_arg = ConstantInt::get(intptr_ty, cstr ? string_array->getType()->getNumElements() - 1 : 0, false);
Constant *encoding_arg = ConstantInt::get(i32_ty, 0x0600, false); /* 0x0600 is kCFStringEncodingASCII */
Constant *isExternal_arg = ConstantInt::get(i8_ty, 0x0, false); /* 0x0 is false */
@ -664,9 +669,8 @@ IRForTarget::RewriteObjCConstStrings(Module &llvm_module, Function &llvm_functio
return false;
}
ConstantArray *cstr_array = dyn_cast<ConstantArray>(cstr_global->getInitializer());
/*
if (!cstr_array)
{
if (log)
@ -688,9 +692,20 @@ IRForTarget::RewriteObjCConstStrings(Module &llvm_module, Function &llvm_functio
return false;
}
*/
ConstantArray *cstr_array = dyn_cast<ConstantArray>(cstr_global->getInitializer());
if (log)
log->Printf("Found NSString constant %s, which contains \"%s\"", vi->first(), cstr_array->getAsString().c_str());
{
if (cstr_array)
log->Printf("Found NSString constant %s, which contains \"%s\"", vi->first(), cstr_array->getAsString().c_str());
else
log->Printf("Found NSString constant %s, which contains \"\"", vi->first());
}
if (!cstr_array)
cstr_global = NULL;
if (!RewriteObjCConstString(llvm_module, nsstring_global, cstr_global, FirstEntryInstruction))
{

23
lldb/test/foundation/const-strings.m Normal file
View File

@ -0,0 +1,23 @@
#import <Foundation/Foundation.h>
// Tests to run:
// Breakpoint 1
// --
// (lldb) expr (int)[str compare:@"hello"]
// (int) $0 = 0
// (lldb) expr (int)[str compare:@"world"]
// (int) $1 = -1
// (lldb) expr (int)[@"" length]
// (int) $2 = 0
int main ()
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *str = [NSString stringWithCString:"hello" encoding:NSASCIIStringEncoding];
NSLog(@"String \"%@\" has length %d", str, [str length]); // Breakpoint 1
[pool drain];
}