[Lldb-commits] [lldb] r336872 - [IRInterpreter] Fix misevaluation of interpretation expressions with `urem`.

[Davide Italiano via lldb-commits]

Author: davide
Date: Wed Jul 11 17:31:04 2018
New Revision: 336872

URL: http://llvm.org/viewvc/llvm-project?rev=336872&view=rev
Log:
[IRInterpreter] Fix misevaluation of interpretation expressions with `urem`.

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

Differential Revision:  https://reviews.llvm.org/D49155

Added:
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
Modified:
    lldb/trunk/source/Core/Scalar.cpp

Added: lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile?rev=336872&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile Wed Jul 11 17:31:04 2018
@@ -0,0 +1,3 @@
+LEVEL = ../../make
+C_SOURCES := main.c
+include $(LEVEL)/Makefile.rules

Added: lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py?rev=336872&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py Wed Jul 11 17:31:04 2018
@@ -0,0 +1,4 @@
+from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
+
+lldbinline.MakeInlineTest(__file__, globals(), None)

Added: lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c?rev=336872&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c Wed Jul 11 17:31:04 2018
@@ -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;
+}

Modified: lldb/trunk/source/Core/Scalar.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Scalar.cpp?rev=336872&r1=336871&r2=336872&view=diff
==============================================================================
--- lldb/trunk/source/Core/Scalar.cpp (original)
+++ lldb/trunk/source/Core/Scalar.cpp Wed Jul 11 17:31:04 2018
@@ -1184,38 +1184,38 @@ bool Scalar::MakeUnsigned() {
   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: