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

Fix a problem where the StringPrinter could be mistaking an empty string for a read error, and reporting spurious 'unable to read data' messages. rdar://19007243 

llvm-svn: 222190
This commit is contained in:
Enrico Granata 2014-11-17 23:14:11 +00:00
parent 6cd8e0c9b0
commit 099263b487
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/source/DataFormatters/StringPrinter.cpp
View File

@ -566,7 +566,7 @@ ReadUTFBufferAndDumpToStream (const ReadStringAndDumpToStreamOptions& options,
else
data_read = process_sp->ReadMemoryFromInferior(options.GetLocation(), (char*)buffer_sp->GetBytes(), bufferSPSize, error);
if (error.Fail() || data_read == 0)
if (error.Fail())
{
options.GetStream()->Printf("unable to read data");
return true;

2
lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
View File

@ -73,6 +73,8 @@ class CxxWCharTTestCase(TestBase):
self.expect("frame variable mazeltov",
substrs = ['(const wchar_t *) mazeltov = ','L"מזל טוב"'])
self.expect("frame variable ws_NULL",substrs = ['(wchar_t *) ws_NULL = 0x0'])
self.expect("frame variable ws_empty",substrs = [' L""'])
if __name__ == '__main__':
import atexit

2
lldb/test/lang/cpp/wchar_t/main.cpp
View File

@ -24,5 +24,7 @@ int main (int argc, char const *argv[])
Foo<int> foo_x('a');
Foo<wchar_t> foo_y(L'a');
const wchar_t *mazeltov = L"מזל טוב";
wchar_t *ws_NULL = nullptr;
wchar_t *ws_empty = L"";
return 0; // Set break point at this line.
}