From 3aeeae6230445e3544fde47221edf45f5230a316 Mon Sep 17 00:00:00 2001
From: Rodrigo Kumpera <kumpera@gmail.com>
Date: Mon, 2 Oct 2017 16:31:40 -0700
Subject: [PATCH] [jit] Fix using conv.u with string.

---
 mono/mini/iltests.il     | 11 +++++++++++
 mono/mini/method-to-ir.c |  1 +
 2 files changed, 12 insertions(+)

diff --git a/mono/mini/iltests.il b/mono/mini/iltests.il
index 30419d9178a..1bc5a2cf720 100644
--- a/mono/mini/iltests.il
+++ b/mono/mini/iltests.il
@@ -3091,4 +3091,15 @@ L_3:
     IL_000c:  ret
   }
 
+  .method public hidebysig static int32 test_104_conv_u_and_string() cil managed
+  {
+    .maxstack  8
+	ldstr "hello"
+	conv.u
+	call int32 [mscorlib]System.Runtime.CompilerServices.RuntimeHelpers::get_OffsetToStringData()
+	add
+	ldind.u2
+	ret
+  }
+
 }
diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index ce326f3c2d3..54e8c3580bf 100644
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -1070,6 +1070,7 @@ type_from_op (MonoCompile *cfg, MonoInst *ins, MonoInst *src1, MonoInst *src2)
 			break;
 		case STACK_PTR:
 		case STACK_MP:
+		case STACK_OBJ:
 #if SIZEOF_VOID_P == 8
 			ins->opcode = OP_LCONV_TO_U;
 #else
-- 
2.25.1