davide created this revision.
davide added reviewers: jingham, jasonmolenda, friss.
`Scalar::MakeUnsigned` was implemented incorrectly so it didn't really change
the sign of the type (leaving signed types signed).
This showed up as a misevaluation when IR-interpreting `urem` but it's likely
to arise in other contexts.
This commit fixes the definition, and adds a test to make sure this won't
regress in future (hopefully).
Fixes rdar://problem/42038760 and LLVM PR38076
https://reviews.llvm.org/D49155
Files:
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
lldb/source/Core/Scalar.cpp
Index: lldb/source/Core/Scalar.cpp
===================================================================
--- lldb/source/Core/Scalar.cpp
+++ lldb/source/Core/Scalar.cpp
@@ -1184,38 +1184,38 @@
case e_void:
break;
case e_sint:
+ m_type = e_uint;
success = true;
break;
case e_uint:
- m_type = e_uint;
success = true;
break;
case e_slong:
+ m_type = e_ulong;
success = true;
break;
case e_ulong:
- m_type = e_ulong;
success = true;
break;
case e_slonglong:
+ m_type = e_ulonglong;
success = true;
break;
case e_ulonglong:
- m_type = e_ulonglong;
success = true;
break;
case e_sint128:
+ m_type = e_uint128;
success = true;
break;
case e_uint128:
- m_type = e_uint128;
success = true;
break;
case e_sint256:
+ m_type = e_uint256;
success = true;
break;
case e_uint256:
- m_type = e_uint256;
success = true;
break;
case e_float:
Index:
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
@@ -0,0 +1,19 @@
+// Make sure we IR-interpret the expression correctly.
+
+typedef unsigned int uint32_t;
+struct S0 {
+ signed f2;
+};
+static g_463 = 0x1561983AL;
+void func_1(void)
+{
+ struct S0 l_19;
+ l_19.f2 = 419;
+ uint32_t l_4037 = 4294967295UL;
+ l_19.f2 = g_463; //%self.expect("expr ((l_4037 % (-(g_463))) | l_19.f2)",
substrs=['(unsigned int) $0 = 358717883'])
+}
+int main()
+{
+ func_1();
+ return 0;
+}
Index:
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
===================================================================
--- /dev/null
+++
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
@@ -0,0 +1,4 @@
+from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
+
+lldbinline.MakeInlineTest(__file__, globals(), None)
Index:
lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
@@ -0,0 +1,3 @@
+LEVEL = ../../make
+C_SOURCES := main.c
+include $(LEVEL)/Makefile.rules
Index: lldb/source/Core/Scalar.cpp
===================================================================
--- lldb/source/Core/Scalar.cpp
+++ lldb/source/Core/Scalar.cpp
@@ -1184,38 +1184,38 @@
case e_void:
break;
case e_sint:
+ m_type = e_uint;
success = true;
break;
case e_uint:
- m_type = e_uint;
success = true;
break;
case e_slong:
+ m_type = e_ulong;
success = true;
break;
case e_ulong:
- m_type = e_ulong;
success = true;
break;
case e_slonglong:
+ m_type = e_ulonglong;
success = true;
break;
case e_ulonglong:
- m_type = e_ulonglong;
success = true;
break;
case e_sint128:
+ m_type = e_uint128;
success = true;
break;
case e_uint128:
- m_type = e_uint128;
success = true;
break;
case e_sint256:
+ m_type = e_uint256;
success = true;
break;
case e_uint256:
- m_type = e_uint256;
success = true;
break;
case e_float:
Index: lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
@@ -0,0 +1,19 @@
+// Make sure we IR-interpret the expression correctly.
+
+typedef unsigned int uint32_t;
+struct S0 {
+ signed f2;
+};
+static g_463 = 0x1561983AL;
+void func_1(void)
+{
+ struct S0 l_19;
+ l_19.f2 = 419;
+ uint32_t l_4037 = 4294967295UL;
+ l_19.f2 = g_463; //%self.expect("expr ((l_4037 % (-(g_463))) | l_19.f2)", substrs=['(unsigned int) $0 = 358717883'])
+}
+int main()
+{
+ func_1();
+ return 0;
+}
Index: lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
@@ -0,0 +1,4 @@
+from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
+
+lldbinline.MakeInlineTest(__file__, globals(), None)
Index: lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
@@ -0,0 +1,3 @@
+LEVEL = ../../make
+C_SOURCES := main.c
+include $(LEVEL)/Makefile.rules
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
