diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp @@ -1063,7 +1063,7 @@ break; case DW_ATE_signed_char: - if (ast.getLangOpts().CharIsSigned && type_name == "char") { + if (type_name == "char") { if (QualTypeMatchesBitSize(bit_size, ast, ast.CharTy)) return GetType(ast.CharTy); } @@ -1115,7 +1115,7 @@ break; case DW_ATE_unsigned_char: - if (!ast.getLangOpts().CharIsSigned && type_name == "char") { + if (type_name == "char") { if (QualTypeMatchesBitSize(bit_size, ast, ast.CharTy)) return GetType(ast.CharTy); } diff --git a/lldb/test/API/commands/expression/char/TestExprsChar.py b/lldb/test/API/commands/expression/char/TestExprsChar.py --- a/lldb/test/API/commands/expression/char/TestExprsChar.py +++ b/lldb/test/API/commands/expression/char/TestExprsChar.py @@ -14,30 +14,13 @@ self.expect_expr("foo(c)", result_value="1") self.expect_expr("foo(sc)", result_value="2") self.expect_expr("foo(uc)", result_value="3") + self.expect_expr("g", result_type="char") def test_default_char(self): self.do_test() - @skipIf(oslist=["linux"], archs=["aarch64", "arm"], bugnumber="llvm.org/pr23069") - @expectedFailureAll( - archs=[ - "powerpc64le", - "s390x"], - bugnumber="llvm.org/pr23069") def test_signed_char(self): self.do_test(dictionary={'CFLAGS_EXTRAS': '-fsigned-char'}) - @expectedFailureAll( - archs=[ - "i[3-6]86", - "x86_64", - "arm64", - 'arm64e', - 'armv7', - 'armv7k', - 'arm64_32'], - bugnumber="llvm.org/pr23069, ") - @expectedFailureAll(triple='mips*', bugnumber="llvm.org/pr23069") - @expectedFailureAll(oslist=['windows'], archs=['aarch64'], bugnumber="llvm.org/pr23069") def test_unsigned_char(self): self.do_test(dictionary={'CFLAGS_EXTRAS': '-funsigned-char'}) diff --git a/lldb/test/API/commands/expression/char/main.cpp b/lldb/test/API/commands/expression/char/main.cpp --- a/lldb/test/API/commands/expression/char/main.cpp +++ b/lldb/test/API/commands/expression/char/main.cpp @@ -1,5 +1,7 @@ #include +char g = 0; + int foo(char c) { return 1; } int foo(signed char c) { return 2; } int foo(unsigned char c) { return 3; }