From ac6b1bd5d3685d3af401c3c05ad267ecaff1768e Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 5 Mar 2012 13:28:30 +0000
Subject: [PATCH] Fix symbol file entry for using dispose call

---
 mcs/mcs/statement.cs            |   2 +-
 mcs/tests/test-debug-11-ref.xml | 304 +++++++++++++++++++++-------------------
 mcs/tests/test-debug-11.cs      |   8 ++
 mcs/tests/ver-il-net_4_5.xml    |   3 +
 4 files changed, 172 insertions(+), 145 deletions(-)

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index c0639b9631b..ff12a7d9dae 100644
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -5473,7 +5473,7 @@ namespace Mono.CSharp {
 
 				// Add conditional call when disposing possible null variable
 				if (!type.IsStruct || type.IsNullableType)
-					dispose = new If (new Binary (Binary.Operator.Inequality, lvr, new NullLiteral (loc), loc), dispose, loc);
+					dispose = new If (new Binary (Binary.Operator.Inequality, lvr, new NullLiteral (loc), loc), dispose, dispose.loc);
 
 				return dispose;
 			}
diff --git a/mcs/tests/test-debug-11-ref.xml b/mcs/tests/test-debug-11-ref.xml
index 5e6ff502185..82b81dcb812 100644
--- a/mcs/tests/test-debug-11-ref.xml
+++ b/mcs/tests/test-debug-11-ref.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <symbols>
   <files>
-    <file id="1" name="test-debug-11.cs" checksum="41f0ffb1e69e87f891df7de5e69af009" />
+    <file id="1" name="test-debug-11.cs" checksum="f60b6fc9777bf92ee0925f84a7fbfb89" />
   </files>
   <methods>
     <method token="0x6000001">
@@ -69,7 +69,6 @@
         <entry il="0x1" row="39" file_ref="1" hidden="false" />
         <entry il="0x10" row="40" file_ref="1" hidden="false" />
         <entry il="0x11" row="41" file_ref="1" hidden="false" />
-        <entry il="0x17" row="39" file_ref="1" hidden="false" />
         <entry il="0x34" row="42" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
@@ -84,105 +83,122 @@
       <sequencepoints>
         <entry il="0x0" row="45" file_ref="1" hidden="false" />
         <entry il="0x1" row="46" file_ref="1" hidden="false" />
-        <entry il="0xd" row="47" file_ref="1" hidden="false" />
-        <entry il="0xe" row="48" file_ref="1" hidden="false" />
-        <entry il="0x1e" row="49" file_ref="1" hidden="false" />
+        <entry il="0x7" row="47" file_ref="1" hidden="false" />
+        <entry il="0x8" row="48" file_ref="1" hidden="false" />
+        <entry il="0x12" row="49" file_ref="1" hidden="false" />
+        <entry il="0x25" row="50" file_ref="1" hidden="false" />
       </sequencepoints>
-      <locals />
+      <locals>
+        <entry name="ms" il_index="0" scope_ref="1" />
+      </locals>
       <scopes>
-        <entry index="0" start="0xe" end="0xe" />
+        <entry index="0" start="0x1" end="0x25" />
+        <entry index="1" start="0x8" end="0x12" />
       </scopes>
     </method>
     <method token="0x6000008">
       <sequencepoints>
-        <entry il="0x0" row="52" file_ref="1" hidden="false" />
-        <entry il="0x1" row="53" file_ref="1" hidden="false" />
-        <entry il="0xd" row="54" file_ref="1" hidden="false" />
-        <entry il="0xe" row="55" file_ref="1" hidden="false" />
-        <entry il="0x1d" row="57" file_ref="1" hidden="false" />
+        <entry il="0x0" row="53" file_ref="1" hidden="false" />
+        <entry il="0x1" row="54" file_ref="1" hidden="false" />
+        <entry il="0xd" row="55" file_ref="1" hidden="false" />
+        <entry il="0xe" row="56" file_ref="1" hidden="false" />
+        <entry il="0x1e" row="57" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
-        <entry index="0" start="0xe" end="0x13" />
+        <entry index="0" start="0xe" end="0xe" />
       </scopes>
     </method>
     <method token="0x6000009">
       <sequencepoints>
         <entry il="0x0" row="60" file_ref="1" hidden="false" />
-        <entry il="0x1" row="62" file_ref="1" hidden="false" />
-        <entry il="0x23" row="64" file_ref="1" hidden="false" />
-        <entry il="0x28" row="66" file_ref="1" hidden="false" />
-        <entry il="0x29" row="67" file_ref="1" hidden="false" />
-        <entry il="0x2e" row="70" file_ref="1" hidden="false" />
-        <entry il="0x33" row="73" file_ref="1" hidden="false" />
-        <entry il="0x38" row="75" file_ref="1" hidden="false" />
-        <entry il="0x3d" row="77" file_ref="1" hidden="false" />
+        <entry il="0x1" row="61" file_ref="1" hidden="false" />
+        <entry il="0xd" row="62" file_ref="1" hidden="false" />
+        <entry il="0xe" row="63" file_ref="1" hidden="false" />
+        <entry il="0x1d" row="65" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
-        <entry index="0" start="0x2" end="0x2" />
-        <entry index="1" start="0x29" end="0x2e" />
+        <entry index="0" start="0xe" end="0x13" />
       </scopes>
     </method>
     <method token="0x600000a">
       <sequencepoints>
-        <entry il="0x0" row="80" file_ref="1" hidden="false" />
-        <entry il="0x1" row="82" file_ref="1" hidden="false" />
-        <entry il="0x29" row="84" file_ref="1" hidden="false" />
-        <entry il="0x2e" row="86" file_ref="1" hidden="false" />
-        <entry il="0x2f" row="87" file_ref="1" hidden="false" />
-        <entry il="0x34" row="90" file_ref="1" hidden="false" />
-        <entry il="0x39" row="92" file_ref="1" hidden="false" />
+        <entry il="0x0" row="68" file_ref="1" hidden="false" />
+        <entry il="0x1" row="70" file_ref="1" hidden="false" />
+        <entry il="0x23" row="72" file_ref="1" hidden="false" />
+        <entry il="0x28" row="74" file_ref="1" hidden="false" />
+        <entry il="0x29" row="75" file_ref="1" hidden="false" />
+        <entry il="0x2e" row="78" file_ref="1" hidden="false" />
+        <entry il="0x33" row="81" file_ref="1" hidden="false" />
+        <entry il="0x38" row="83" file_ref="1" hidden="false" />
+        <entry il="0x3d" row="85" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
         <entry index="0" start="0x2" end="0x2" />
-        <entry index="1" start="0x2f" end="0x34" />
+        <entry index="1" start="0x29" end="0x2e" />
       </scopes>
     </method>
     <method token="0x600000b">
       <sequencepoints>
-        <entry il="0x0" row="95" file_ref="1" hidden="false" />
-        <entry il="0x1" row="97" file_ref="1" hidden="false" />
-        <entry il="0xb0" row="99" file_ref="1" hidden="false" />
-        <entry il="0xb5" row="101" file_ref="1" hidden="false" />
-        <entry il="0xb6" row="102" file_ref="1" hidden="false" />
-        <entry il="0xbb" row="106" file_ref="1" hidden="false" />
-        <entry il="0xc0" row="108" file_ref="1" hidden="false" />
-        <entry il="0xc5" row="112" file_ref="1" hidden="false" />
-        <entry il="0xca" row="114" file_ref="1" hidden="false" />
-        <entry il="0xcf" row="116" file_ref="1" hidden="false" />
+        <entry il="0x0" row="88" file_ref="1" hidden="false" />
+        <entry il="0x1" row="90" file_ref="1" hidden="false" />
+        <entry il="0x29" row="92" file_ref="1" hidden="false" />
+        <entry il="0x2e" row="94" file_ref="1" hidden="false" />
+        <entry il="0x2f" row="95" file_ref="1" hidden="false" />
+        <entry il="0x34" row="98" file_ref="1" hidden="false" />
+        <entry il="0x39" row="100" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
         <entry index="0" start="0x2" end="0x2" />
-        <entry index="1" start="0xb6" end="0xbb" />
+        <entry index="1" start="0x2f" end="0x34" />
       </scopes>
     </method>
     <method token="0x600000c">
       <sequencepoints>
-        <entry il="0x0" row="119" file_ref="1" hidden="false" />
-        <entry il="0x1" row="121" file_ref="1" hidden="false" />
-        <entry il="0x12" row="123" file_ref="1" hidden="false" />
-        <entry il="0x2c" row="125" file_ref="1" hidden="false" />
-        <entry il="0x36" row="127" file_ref="1" hidden="false" />
-        <entry il="0x3b" row="129" file_ref="1" hidden="false" />
+        <entry il="0x0" row="103" file_ref="1" hidden="false" />
+        <entry il="0x1" row="105" file_ref="1" hidden="false" />
+        <entry il="0xb0" row="107" file_ref="1" hidden="false" />
+        <entry il="0xb5" row="109" file_ref="1" hidden="false" />
+        <entry il="0xb6" row="110" file_ref="1" hidden="false" />
+        <entry il="0xbb" row="114" file_ref="1" hidden="false" />
+        <entry il="0xc0" row="116" file_ref="1" hidden="false" />
+        <entry il="0xc5" row="120" file_ref="1" hidden="false" />
+        <entry il="0xca" row="122" file_ref="1" hidden="false" />
+        <entry il="0xcf" row="124" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
         <entry index="0" start="0x2" end="0x2" />
+        <entry index="1" start="0xb6" end="0xbb" />
       </scopes>
     </method>
     <method token="0x600000d">
       <sequencepoints>
-        <entry il="0x0" row="132" file_ref="1" hidden="false" />
-        <entry il="0x1" row="134" file_ref="1" hidden="false" />
-        <entry il="0x2" row="135" file_ref="1" hidden="false" />
-        <entry il="0x4" row="136" file_ref="1" hidden="false" />
-        <entry il="0x5" row="139" file_ref="1" hidden="false" />
-        <entry il="0x6" row="140" file_ref="1" hidden="false" />
-        <entry il="0x8" row="141" file_ref="1" hidden="false" />
-        <entry il="0x9" row="142" file_ref="1" hidden="false" />
+        <entry il="0x0" row="127" file_ref="1" hidden="false" />
+        <entry il="0x1" row="129" file_ref="1" hidden="false" />
+        <entry il="0x12" row="131" file_ref="1" hidden="false" />
+        <entry il="0x2c" row="133" file_ref="1" hidden="false" />
+        <entry il="0x36" row="135" file_ref="1" hidden="false" />
+        <entry il="0x3b" row="137" file_ref="1" hidden="false" />
+      </sequencepoints>
+      <locals />
+      <scopes>
+        <entry index="0" start="0x2" end="0x2" />
+      </scopes>
+    </method>
+    <method token="0x600000e">
+      <sequencepoints>
+        <entry il="0x0" row="140" file_ref="1" hidden="false" />
+        <entry il="0x1" row="142" file_ref="1" hidden="false" />
+        <entry il="0x2" row="143" file_ref="1" hidden="false" />
+        <entry il="0x4" row="144" file_ref="1" hidden="false" />
+        <entry il="0x5" row="147" file_ref="1" hidden="false" />
+        <entry il="0x6" row="148" file_ref="1" hidden="false" />
+        <entry il="0x8" row="149" file_ref="1" hidden="false" />
+        <entry il="0x9" row="150" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="0" scope_ref="1" />
@@ -193,17 +209,17 @@
         <entry index="1" start="0x6" end="0x8" />
       </scopes>
     </method>
-    <method token="0x600000e">
+    <method token="0x600000f">
       <sequencepoints>
-        <entry il="0x0" row="145" file_ref="1" hidden="false" />
-        <entry il="0x1" row="147" file_ref="1" hidden="false" />
-        <entry il="0x2" row="148" file_ref="1" hidden="false" />
-        <entry il="0x3" row="149" file_ref="1" hidden="false" />
-        <entry il="0x9" row="151" file_ref="1" hidden="false" />
-        <entry il="0xe" row="152" file_ref="1" hidden="false" />
-        <entry il="0xf" row="153" file_ref="1" hidden="false" />
-        <entry il="0x10" row="151" file_ref="1" hidden="false" />
-        <entry il="0x17" row="154" file_ref="1" hidden="false" />
+        <entry il="0x0" row="153" file_ref="1" hidden="false" />
+        <entry il="0x1" row="155" file_ref="1" hidden="false" />
+        <entry il="0x2" row="156" file_ref="1" hidden="false" />
+        <entry il="0x3" row="157" file_ref="1" hidden="false" />
+        <entry il="0x9" row="159" file_ref="1" hidden="false" />
+        <entry il="0xe" row="160" file_ref="1" hidden="false" />
+        <entry il="0xf" row="161" file_ref="1" hidden="false" />
+        <entry il="0x10" row="159" file_ref="1" hidden="false" />
+        <entry il="0x17" row="162" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
@@ -211,13 +227,13 @@
         <entry index="1" start="0xf" end="0xf" />
       </scopes>
     </method>
-    <method token="0x600000f">
+    <method token="0x6000010">
       <sequencepoints>
-        <entry il="0x0" row="157" file_ref="1" hidden="false" />
-        <entry il="0x1" row="159" file_ref="1" hidden="false" />
-        <entry il="0x2" row="160" file_ref="1" hidden="false" />
-        <entry il="0x4" row="161" file_ref="1" hidden="false" />
-        <entry il="0x5" row="162" file_ref="1" hidden="false" />
+        <entry il="0x0" row="165" file_ref="1" hidden="false" />
+        <entry il="0x1" row="167" file_ref="1" hidden="false" />
+        <entry il="0x2" row="168" file_ref="1" hidden="false" />
+        <entry il="0x4" row="169" file_ref="1" hidden="false" />
+        <entry il="0x5" row="170" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="i" il_index="0" scope_ref="1" />
@@ -226,28 +242,28 @@
         <entry index="0" start="0x2" end="0x4" />
       </scopes>
     </method>
-    <method token="0x6000010">
+    <method token="0x6000011">
       <sequencepoints>
-        <entry il="0x0" row="166" file_ref="1" hidden="false" />
-        <entry il="0x1" row="167" file_ref="1" hidden="false" />
-        <entry il="0x2" row="168" file_ref="1" hidden="false" />
-        <entry il="0x3" row="169" file_ref="1" hidden="false" />
-        <entry il="0xd" row="170" file_ref="1" hidden="false" />
+        <entry il="0x0" row="174" file_ref="1" hidden="false" />
+        <entry il="0x1" row="175" file_ref="1" hidden="false" />
+        <entry il="0x2" row="176" file_ref="1" hidden="false" />
+        <entry il="0x3" row="177" file_ref="1" hidden="false" />
+        <entry il="0xd" row="178" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
         <entry index="0" start="0x3" end="0xd" />
       </scopes>
     </method>
-    <method token="0x6000011">
+    <method token="0x6000012">
       <sequencepoints>
-        <entry il="0x0" row="174" file_ref="1" hidden="false" />
-        <entry il="0x1" row="175" file_ref="1" hidden="false" />
-        <entry il="0x11" row="176" file_ref="1" hidden="false" />
-        <entry il="0x12" row="177" file_ref="1" hidden="false" />
-        <entry il="0x18" row="179" file_ref="1" hidden="false" />
-        <entry il="0x19" row="180" file_ref="1" hidden="false" />
-        <entry il="0x1a" row="181" file_ref="1" hidden="false" />
+        <entry il="0x0" row="182" file_ref="1" hidden="false" />
+        <entry il="0x1" row="183" file_ref="1" hidden="false" />
+        <entry il="0x11" row="184" file_ref="1" hidden="false" />
+        <entry il="0x12" row="185" file_ref="1" hidden="false" />
+        <entry il="0x18" row="187" file_ref="1" hidden="false" />
+        <entry il="0x19" row="188" file_ref="1" hidden="false" />
+        <entry il="0x1a" row="189" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
@@ -255,18 +271,18 @@
         <entry index="1" start="0x19" end="0x19" />
       </scopes>
     </method>
-    <method token="0x6000012">
+    <method token="0x6000013">
       <sequencepoints>
-        <entry il="0x0" row="184" file_ref="1" hidden="false" />
-        <entry il="0x1" row="185" file_ref="1" hidden="false" />
-        <entry il="0x11" row="186" file_ref="1" hidden="false" />
-        <entry il="0x12" row="187" file_ref="1" hidden="false" />
-        <entry il="0x18" row="188" file_ref="1" hidden="false" />
-        <entry il="0x28" row="189" file_ref="1" hidden="false" />
-        <entry il="0x29" row="190" file_ref="1" hidden="false" />
-        <entry il="0x2f" row="192" file_ref="1" hidden="false" />
-        <entry il="0x30" row="193" file_ref="1" hidden="false" />
-        <entry il="0x31" row="194" file_ref="1" hidden="false" />
+        <entry il="0x0" row="192" file_ref="1" hidden="false" />
+        <entry il="0x1" row="193" file_ref="1" hidden="false" />
+        <entry il="0x11" row="194" file_ref="1" hidden="false" />
+        <entry il="0x12" row="195" file_ref="1" hidden="false" />
+        <entry il="0x18" row="196" file_ref="1" hidden="false" />
+        <entry il="0x28" row="197" file_ref="1" hidden="false" />
+        <entry il="0x29" row="198" file_ref="1" hidden="false" />
+        <entry il="0x2f" row="200" file_ref="1" hidden="false" />
+        <entry il="0x30" row="201" file_ref="1" hidden="false" />
+        <entry il="0x31" row="202" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
@@ -275,15 +291,15 @@
         <entry index="2" start="0x30" end="0x30" />
       </scopes>
     </method>
-    <method token="0x6000013">
+    <method token="0x6000014">
       <sequencepoints>
-        <entry il="0x0" row="197" file_ref="1" hidden="false" />
-        <entry il="0x1" row="198" file_ref="1" hidden="false" />
-        <entry il="0x8" row="199" file_ref="1" hidden="false" />
-        <entry il="0x9" row="200" file_ref="1" hidden="false" />
-        <entry il="0xf" row="202" file_ref="1" hidden="false" />
-        <entry il="0x10" row="203" file_ref="1" hidden="false" />
-        <entry il="0x11" row="204" file_ref="1" hidden="false" />
+        <entry il="0x0" row="205" file_ref="1" hidden="false" />
+        <entry il="0x1" row="206" file_ref="1" hidden="false" />
+        <entry il="0x8" row="207" file_ref="1" hidden="false" />
+        <entry il="0x9" row="208" file_ref="1" hidden="false" />
+        <entry il="0xf" row="210" file_ref="1" hidden="false" />
+        <entry il="0x10" row="211" file_ref="1" hidden="false" />
+        <entry il="0x11" row="212" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals />
       <scopes>
@@ -291,17 +307,17 @@
         <entry index="1" start="0x10" end="0x10" />
       </scopes>
     </method>
-    <method token="0x6000014">
+    <method token="0x6000015">
       <sequencepoints>
-        <entry il="0x0" row="207" file_ref="1" hidden="false" />
-        <entry il="0x1" row="208" file_ref="1" hidden="false" />
-        <entry il="0x8" row="211" file_ref="1" hidden="false" />
-        <entry il="0x9" row="212" file_ref="1" hidden="false" />
-        <entry il="0xa" row="210" file_ref="1" hidden="false" />
-        <entry il="0xe" row="209" file_ref="1" hidden="false" />
-        <entry il="0x15" row="214" file_ref="1" hidden="false" />
-        <entry il="0x1a" row="217" file_ref="1" hidden="false" />
-        <entry il="0x1b" row="218" file_ref="1" hidden="false" />
+        <entry il="0x0" row="215" file_ref="1" hidden="false" />
+        <entry il="0x1" row="216" file_ref="1" hidden="false" />
+        <entry il="0x8" row="219" file_ref="1" hidden="false" />
+        <entry il="0x9" row="220" file_ref="1" hidden="false" />
+        <entry il="0xa" row="218" file_ref="1" hidden="false" />
+        <entry il="0xe" row="217" file_ref="1" hidden="false" />
+        <entry il="0x15" row="222" file_ref="1" hidden="false" />
+        <entry il="0x1a" row="225" file_ref="1" hidden="false" />
+        <entry il="0x1b" row="226" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="i" il_index="0" scope_ref="1" />
@@ -313,12 +329,12 @@
         <entry index="3" start="0x1b" end="0x1b" />
       </scopes>
     </method>
-    <method token="0x6000015">
+    <method token="0x6000016">
       <sequencepoints>
-        <entry il="0x0" row="222" file_ref="1" hidden="false" />
-        <entry il="0x1" row="223" file_ref="1" hidden="false" />
-        <entry il="0x8" row="224" file_ref="1" hidden="false" />
-        <entry il="0x9" row="225" file_ref="1" hidden="false" />
+        <entry il="0x0" row="230" file_ref="1" hidden="false" />
+        <entry il="0x1" row="231" file_ref="1" hidden="false" />
+        <entry il="0x8" row="232" file_ref="1" hidden="false" />
+        <entry il="0x9" row="233" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="i" il_index="0" scope_ref="1" />
@@ -328,14 +344,14 @@
         <entry index="1" start="0x9" end="0x9" />
       </scopes>
     </method>
-    <method token="0x6000016">
+    <method token="0x6000017">
       <sequencepoints>
-        <entry il="0x0" row="229" file_ref="1" hidden="false" />
-        <entry il="0x1" row="230" file_ref="1" hidden="false" />
-        <entry il="0xe" row="232" file_ref="1" hidden="false" />
-        <entry il="0xf" row="233" file_ref="1" hidden="false" />
-        <entry il="0x10" row="230" file_ref="1" hidden="false" />
-        <entry il="0x1d" row="234" file_ref="1" hidden="false" />
+        <entry il="0x0" row="237" file_ref="1" hidden="false" />
+        <entry il="0x1" row="238" file_ref="1" hidden="false" />
+        <entry il="0xe" row="240" file_ref="1" hidden="false" />
+        <entry il="0xf" row="241" file_ref="1" hidden="false" />
+        <entry il="0x10" row="238" file_ref="1" hidden="false" />
+        <entry il="0x1d" row="242" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="2" scope_ref="1" />
@@ -345,15 +361,15 @@
         <entry index="1" start="0xf" end="0xf" />
       </scopes>
     </method>
-    <method token="0x6000017">
+    <method token="0x6000018">
       <sequencepoints>
-        <entry il="0x0" row="237" file_ref="1" hidden="false" />
-        <entry il="0x1" row="238" file_ref="1" hidden="false" />
-        <entry il="0xd" row="239" file_ref="1" hidden="false" />
-        <entry il="0x15" row="242" file_ref="1" hidden="false" />
-        <entry il="0x16" row="243" file_ref="1" hidden="false" />
-        <entry il="0x17" row="241" file_ref="1" hidden="false" />
-        <entry il="0x36" row="244" file_ref="1" hidden="false" />
+        <entry il="0x0" row="245" file_ref="1" hidden="false" />
+        <entry il="0x1" row="246" file_ref="1" hidden="false" />
+        <entry il="0xd" row="247" file_ref="1" hidden="false" />
+        <entry il="0x15" row="250" file_ref="1" hidden="false" />
+        <entry il="0x16" row="251" file_ref="1" hidden="false" />
+        <entry il="0x17" row="249" file_ref="1" hidden="false" />
+        <entry il="0x36" row="252" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="1" scope_ref="1" />
@@ -363,15 +379,15 @@
         <entry index="1" start="0x16" end="0x16" />
       </scopes>
     </method>
-    <method token="0x6000018">
+    <method token="0x6000019">
       <sequencepoints>
-        <entry il="0x0" row="247" file_ref="1" hidden="false" />
-        <entry il="0x1" row="248" file_ref="1" hidden="false" />
-        <entry il="0xe" row="249" file_ref="1" hidden="false" />
-        <entry il="0x15" row="252" file_ref="1" hidden="false" />
-        <entry il="0x16" row="253" file_ref="1" hidden="false" />
-        <entry il="0x17" row="251" file_ref="1" hidden="false" />
-        <entry il="0x3b" row="254" file_ref="1" hidden="false" />
+        <entry il="0x0" row="255" file_ref="1" hidden="false" />
+        <entry il="0x1" row="256" file_ref="1" hidden="false" />
+        <entry il="0xe" row="257" file_ref="1" hidden="false" />
+        <entry il="0x15" row="260" file_ref="1" hidden="false" />
+        <entry il="0x16" row="261" file_ref="1" hidden="false" />
+        <entry il="0x17" row="259" file_ref="1" hidden="false" />
+        <entry il="0x3b" row="262" file_ref="1" hidden="false" />
       </sequencepoints>
       <locals>
         <entry name="a" il_index="1" scope_ref="1" />
@@ -381,7 +397,7 @@
         <entry index="1" start="0x16" end="0x16" />
       </scopes>
     </method>
-    <method token="0x6000019">
+    <method token="0x600001a">
       <sequencepoints />
       <locals />
       <scopes />
diff --git a/mcs/tests/test-debug-11.cs b/mcs/tests/test-debug-11.cs
index aade9d59d3b..187bc044d79 100644
--- a/mcs/tests/test-debug-11.cs
+++ b/mcs/tests/test-debug-11.cs
@@ -40,6 +40,14 @@ class C
 		{
 		}
 	}
+
+	void Using_4 ()
+	{
+		using (var ms = new System.IO.MemoryStream ())
+		{
+			Console.WriteLine ("a");
+		}
+	}
 	
 	void Lock ()
 	{
diff --git a/mcs/tests/ver-il-net_4_5.xml b/mcs/tests/ver-il-net_4_5.xml
index 4d154adb29b..09c60883b84 100644
--- a/mcs/tests/ver-il-net_4_5.xml
+++ b/mcs/tests/ver-il-net_4_5.xml
@@ -55969,6 +55969,9 @@
       <method name="Void ForEach_3(S)" attrs="129">
         <size>60</size>
       </method>
+      <method name="Void Using_4()" attrs="129">
+        <size>38</size>
+      </method>
     </type>
   </test>
   <test name="test-debug-12.cs">
-- 
2.11.4.GIT