Skip to content

Commit

Permalink
Data formatters: fix detection of C strings
Browse files Browse the repository at this point in the history
Summary:
Detection of C strings does not work well for pointers. If the value object holding a (char*) pointer does not have an address (e.g., if it is a temp), the value is not considered a C string and its formatting is left to DumpDataExtractor rather than the special handling in  ValueObject::DumpPrintableRepresentation. This leads to inconsistent outputs, e.g., in escaping non-ASCII characters. See the test for an example; the second test expectation is not met (without this patch). With this patch, the C string detection only insists that the pointer value is valid. The patch makes the code consistent with how the pointer is obtained in ValueObject::ReadPointedString.

Reviewers: teemperor

Reviewed By: teemperor

Subscribers: lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D76650
  • Loading branch information
Jaroslav Sevcik authored and Teemperor committed Mar 24, 2020
1 parent 865638f commit 177dd63
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObject.cpp
Expand Up @@ -764,7 +764,7 @@ bool ValueObject::IsCStringContainer(bool check_pointer) {
return true;
addr_t cstr_address = LLDB_INVALID_ADDRESS;
AddressType cstr_address_type = eAddressTypeInvalid;
cstr_address = GetAddressOf(true, &cstr_address_type);
cstr_address = GetPointerValue(&cstr_address_type);
return (cstr_address != LLDB_INVALID_ADDRESS);
}

Expand Down
@@ -0,0 +1,3 @@
CXX_SOURCES := main.cpp

include Makefile.rules
@@ -0,0 +1,18 @@
# coding=utf8

import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil


class CstringUnicodeTestCase(TestBase):

mydir = TestBase.compute_mydir(__file__)
NO_DEBUG_INFO_TESTCASE = True

def test_cstring_unicode(self):
self.build()
lldbutil.run_to_source_breakpoint(self, "// break here",
lldb.SBFileSpec("main.cpp", False))
self.expect_expr("s", result_summary='"🔥"')
self.expect_expr("(const char*)s", result_summary='"🔥"')
@@ -0,0 +1,4 @@
int main() {
const char *s = u8"🔥";
return 0; // break here
}

0 comments on commit 177dd63

Please sign in to comment.