4 files changed, 258 insertions, 14 deletions
diff --git a/BCT/RegressionTests/TranslationTest/GeneralHeapInput.txt b/BCT/RegressionTests/TranslationTest/GeneralHeapInput.txt
index 00b54a84..a9ca1990 100644
--- a/BCT/RegressionTests/TranslationTest/GeneralHeapInput.txt
+++ b/BCT/RegressionTests/TranslationTest/GeneralHeapInput.txt
@@ -188,8 +188,6 @@ implementation DelegateRemoveHelper(oldi: int, m: int, o: int) returns (i: int)
 
 
 
-type Type;
-
 type Field;
 
 var $Heap: HeapType where IsGoodHeap($Heap);
@@ -212,6 +210,8 @@ function {:inline true} Write(H: HeapType, o: ref, f: Field, v: box) : HeapType
   H[o, f := v]
 }
 
+type Type;
+
 function $DynamicType(ref) : Type;
 
 var $Head: [int]int;
@@ -260,6 +260,16 @@ implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#ctor(thi
 
 
 
+procedure RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor();
+
+
+
+implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor()
+{
+}
+
+
+
 const unique RegressionTestInput.AsyncAttribute: Type;
 
 procedure RegressionTestInput.AsyncAttribute.#ctor(this: int);
@@ -278,6 +288,16 @@ implementation RegressionTestInput.AsyncAttribute.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.AsyncAttribute.#cctor();
+
+
+
+implementation RegressionTestInput.AsyncAttribute.#cctor()
+{
+}
+
+
+
 const unique RegressionTestInput.ClassWithBoolTypes: Type;
 
 var RegressionTestInput.ClassWithBoolTypes.staticB: bool;
@@ -314,7 +334,6 @@ implementation RegressionTestInput.ClassWithBoolTypes.#ctor$System.Boolean(this:
   var z: bool;
 
     z := z$in;
-    $Heap := Write($Heap, this, RegressionTestInput.ClassWithBoolTypes.staticB, Bool2Box(false));
     $Heap := Write($Heap, this, RegressionTestInput.ClassWithBoolTypes.b, Bool2Box(false));
     assert {:sourceFile "Class1.cs"} {:sourceLine 72} true;
     call System.Object.#ctor(this);
@@ -351,6 +370,17 @@ implementation RegressionTestInput.ClassWithBoolTypes.Main()
 
 
 
+procedure RegressionTestInput.ClassWithBoolTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithBoolTypes.#cctor()
+{
+    RegressionTestInput.ClassWithBoolTypes.staticB := false;
+}
+
+
+
 const unique RegressionTestInput.ClassWithArrayTypes: Type;
 
 var RegressionTestInput.ClassWithArrayTypes.s: int;
@@ -473,7 +503,6 @@ procedure RegressionTestInput.ClassWithArrayTypes.#ctor(this: int);
 
 implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 {
-    $Heap := Write($Heap, this, RegressionTestInput.ClassWithArrayTypes.s, Int2Box(0));
     $Heap := Write($Heap, this, RegressionTestInput.ClassWithArrayTypes.a, Int2Box(0));
     call System.Object.#ctor(this);
     return;
@@ -481,6 +510,17 @@ implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.ClassWithArrayTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithArrayTypes.#cctor()
+{
+    RegressionTestInput.ClassWithArrayTypes.s := 0;
+}
+
+
+
 const unique RegressionTestInput.Class0: Type;
 
 var RegressionTestInput.Class0.StaticInt: int;
@@ -709,9 +749,19 @@ procedure RegressionTestInput.Class0.#ctor(this: int);
 
 implementation RegressionTestInput.Class0.#ctor(this: int)
 {
-    $Heap := Write($Heap, this, RegressionTestInput.Class0.StaticInt, Int2Box(0));
     call System.Object.#ctor(this);
     return;
 }
 
 
+
+procedure RegressionTestInput.Class0.#cctor();
+
+
+
+implementation RegressionTestInput.Class0.#cctor()
+{
+    RegressionTestInput.Class0.StaticInt := 0;
+}
+
+
diff --git a/BCT/RegressionTests/TranslationTest/SplitFieldsHeapInput.txt b/BCT/RegressionTests/TranslationTest/SplitFieldsHeapInput.txt
index f634d13a..176360d8 100644
--- a/BCT/RegressionTests/TranslationTest/SplitFieldsHeapInput.txt
+++ b/BCT/RegressionTests/TranslationTest/SplitFieldsHeapInput.txt
@@ -29,6 +29,8 @@ implementation Alloc() returns (x: int)
 
 
 
+type ref = int;
+
 procedure DelegateAdd(a: int, b: int) returns (c: int);
 
 
@@ -186,6 +188,10 @@ implementation DelegateRemoveHelper(oldi: int, m: int, o: int) returns (i: int)
 
 
 
+type Type;
+
+function $DynamicType(ref) : Type;
+
 var $Head: [int]int;
 
 var $Next: [int][int]int;
@@ -194,6 +200,8 @@ var $Method: [int][int]int;
 
 var $Receiver: [int][int]int;
 
+const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap: Type;
+
 var RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.x: [int]int;
 
 var RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.y: [int]int;
@@ -230,6 +238,18 @@ implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#ctor(thi
 
 
 
+procedure RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor();
+
+
+
+implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor()
+{
+}
+
+
+
+const unique RegressionTestInput.AsyncAttribute: Type;
+
 procedure RegressionTestInput.AsyncAttribute.#ctor(this: int);
 
 
@@ -246,6 +266,18 @@ implementation RegressionTestInput.AsyncAttribute.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.AsyncAttribute.#cctor();
+
+
+
+implementation RegressionTestInput.AsyncAttribute.#cctor()
+{
+}
+
+
+
+const unique RegressionTestInput.ClassWithBoolTypes: Type;
+
 var RegressionTestInput.ClassWithBoolTypes.staticB: bool;
 
 var RegressionTestInput.ClassWithBoolTypes.b: [int]bool;
@@ -280,7 +312,6 @@ implementation RegressionTestInput.ClassWithBoolTypes.#ctor$System.Boolean(this:
   var z: bool;
 
     z := z$in;
-    RegressionTestInput.ClassWithBoolTypes.staticB[this] := false;
     RegressionTestInput.ClassWithBoolTypes.b[this] := false;
     assert {:sourceFile "Class1.cs"} {:sourceLine 72} true;
     call System.Object.#ctor(this);
@@ -317,6 +348,19 @@ implementation RegressionTestInput.ClassWithBoolTypes.Main()
 
 
 
+procedure RegressionTestInput.ClassWithBoolTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithBoolTypes.#cctor()
+{
+    RegressionTestInput.ClassWithBoolTypes.staticB := false;
+}
+
+
+
+const unique RegressionTestInput.ClassWithArrayTypes: Type;
+
 var RegressionTestInput.ClassWithArrayTypes.s: int;
 
 var RegressionTestInput.ClassWithArrayTypes.a: [int]int;
@@ -437,7 +481,6 @@ procedure RegressionTestInput.ClassWithArrayTypes.#ctor(this: int);
 
 implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 {
-    RegressionTestInput.ClassWithArrayTypes.s[this] := 0;
     RegressionTestInput.ClassWithArrayTypes.a[this] := 0;
     call System.Object.#ctor(this);
     return;
@@ -445,6 +488,19 @@ implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.ClassWithArrayTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithArrayTypes.#cctor()
+{
+    RegressionTestInput.ClassWithArrayTypes.s := 0;
+}
+
+
+
+const unique RegressionTestInput.Class0: Type;
+
 var RegressionTestInput.Class0.StaticInt: int;
 
 procedure RegressionTestInput.Class0.StaticMethod$System.Int32(x$in: int) returns ($result: int);
@@ -671,9 +727,19 @@ procedure RegressionTestInput.Class0.#ctor(this: int);
 
 implementation RegressionTestInput.Class0.#ctor(this: int)
 {
-    RegressionTestInput.Class0.StaticInt[this] := 0;
     call System.Object.#ctor(this);
     return;
 }
 
 
+
+procedure RegressionTestInput.Class0.#cctor();
+
+
+
+implementation RegressionTestInput.Class0.#cctor()
+{
+    RegressionTestInput.Class0.StaticInt := 0;
+}
+
+
diff --git a/BCT/RegressionTests/TranslationTest/TwoDBoxHeapInput.txt b/BCT/RegressionTests/TranslationTest/TwoDBoxHeapInput.txt
index 35328269..cde891c4 100644
--- a/BCT/RegressionTests/TranslationTest/TwoDBoxHeapInput.txt
+++ b/BCT/RegressionTests/TranslationTest/TwoDBoxHeapInput.txt
@@ -196,6 +196,10 @@ function Int2Box(int) : box;
 
 function Bool2Box(bool) : box;
 
+type Type;
+
+function $DynamicType(ref) : Type;
+
 var $Head: [int]int;
 
 var $Next: [int][int]int;
@@ -204,6 +208,8 @@ var $Method: [int][int]int;
 
 var $Receiver: [int][int]int;
 
+const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap: Type;
+
 const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.x: int;
 
 const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.y: int;
@@ -240,6 +246,18 @@ implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#ctor(thi
 
 
 
+procedure RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor();
+
+
+
+implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor()
+{
+}
+
+
+
+const unique RegressionTestInput.AsyncAttribute: Type;
+
 procedure RegressionTestInput.AsyncAttribute.#ctor(this: int);
 
 
@@ -256,6 +274,18 @@ implementation RegressionTestInput.AsyncAttribute.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.AsyncAttribute.#cctor();
+
+
+
+implementation RegressionTestInput.AsyncAttribute.#cctor()
+{
+}
+
+
+
+const unique RegressionTestInput.ClassWithBoolTypes: Type;
+
 var RegressionTestInput.ClassWithBoolTypes.staticB: bool;
 
 const unique RegressionTestInput.ClassWithBoolTypes.b: bool;
@@ -290,7 +320,6 @@ implementation RegressionTestInput.ClassWithBoolTypes.#ctor$System.Boolean(this:
   var z: bool;
 
     z := z$in;
-    $Heap[this, RegressionTestInput.ClassWithBoolTypes.staticB] := Bool2Box(false);
     $Heap[this, RegressionTestInput.ClassWithBoolTypes.b] := Bool2Box(false);
     assert {:sourceFile "Class1.cs"} {:sourceLine 72} true;
     call System.Object.#ctor(this);
@@ -327,6 +356,19 @@ implementation RegressionTestInput.ClassWithBoolTypes.Main()
 
 
 
+procedure RegressionTestInput.ClassWithBoolTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithBoolTypes.#cctor()
+{
+    RegressionTestInput.ClassWithBoolTypes.staticB := false;
+}
+
+
+
+const unique RegressionTestInput.ClassWithArrayTypes: Type;
+
 var RegressionTestInput.ClassWithArrayTypes.s: int;
 
 const unique RegressionTestInput.ClassWithArrayTypes.a: int;
@@ -447,7 +489,6 @@ procedure RegressionTestInput.ClassWithArrayTypes.#ctor(this: int);
 
 implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 {
-    $Heap[this, RegressionTestInput.ClassWithArrayTypes.s] := Int2Box(0);
     $Heap[this, RegressionTestInput.ClassWithArrayTypes.a] := Int2Box(0);
     call System.Object.#ctor(this);
     return;
@@ -455,6 +496,19 @@ implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.ClassWithArrayTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithArrayTypes.#cctor()
+{
+    RegressionTestInput.ClassWithArrayTypes.s := 0;
+}
+
+
+
+const unique RegressionTestInput.Class0: Type;
+
 var RegressionTestInput.Class0.StaticInt: int;
 
 procedure RegressionTestInput.Class0.StaticMethod$System.Int32(x$in: int) returns ($result: int);
@@ -681,9 +735,19 @@ procedure RegressionTestInput.Class0.#ctor(this: int);
 
 implementation RegressionTestInput.Class0.#ctor(this: int)
 {
-    $Heap[this, RegressionTestInput.Class0.StaticInt] := Int2Box(0);
     call System.Object.#ctor(this);
     return;
 }
 
 
+
+procedure RegressionTestInput.Class0.#cctor();
+
+
+
+implementation RegressionTestInput.Class0.#cctor()
+{
+    RegressionTestInput.Class0.StaticInt := 0;
+}
+
+
diff --git a/BCT/RegressionTests/TranslationTest/TwoDIntHeapInput.txt b/BCT/RegressionTests/TranslationTest/TwoDIntHeapInput.txt
index e48e4bd1..9f63170c 100644
--- a/BCT/RegressionTests/TranslationTest/TwoDIntHeapInput.txt
+++ b/BCT/RegressionTests/TranslationTest/TwoDIntHeapInput.txt
@@ -186,6 +186,10 @@ implementation DelegateRemoveHelper(oldi: int, m: int, o: int) returns (i: int)
 
 var $Heap: HeapType where IsGoodHeap($Heap);
 
+type Type;
+
+function $DynamicType(ref) : Type;
+
 var $Head: [int]int;
 
 var $Next: [int][int]int;
@@ -194,6 +198,8 @@ var $Method: [int][int]int;
 
 var $Receiver: [int][int]int;
 
+const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap: Type;
+
 const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.x: int;
 
 const unique RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.y: int;
@@ -230,6 +236,18 @@ implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#ctor(thi
 
 
 
+procedure RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor();
+
+
+
+implementation RegressionTestInput.WriteToTheHeapAValueReadFromTheHeap.#cctor()
+{
+}
+
+
+
+const unique RegressionTestInput.AsyncAttribute: Type;
+
 procedure RegressionTestInput.AsyncAttribute.#ctor(this: int);
 
 
@@ -246,6 +264,18 @@ implementation RegressionTestInput.AsyncAttribute.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.AsyncAttribute.#cctor();
+
+
+
+implementation RegressionTestInput.AsyncAttribute.#cctor()
+{
+}
+
+
+
+const unique RegressionTestInput.ClassWithBoolTypes: Type;
+
 var RegressionTestInput.ClassWithBoolTypes.staticB: bool;
 
 const unique RegressionTestInput.ClassWithBoolTypes.b: bool;
@@ -280,7 +310,6 @@ implementation RegressionTestInput.ClassWithBoolTypes.#ctor$System.Boolean(this:
   var z: bool;
 
     z := z$in;
-    $Heap[this, RegressionTestInput.ClassWithBoolTypes.staticB] := false;
     $Heap[this, RegressionTestInput.ClassWithBoolTypes.b] := false;
     assert {:sourceFile "Class1.cs"} {:sourceLine 72} true;
     call System.Object.#ctor(this);
@@ -317,6 +346,19 @@ implementation RegressionTestInput.ClassWithBoolTypes.Main()
 
 
 
+procedure RegressionTestInput.ClassWithBoolTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithBoolTypes.#cctor()
+{
+    RegressionTestInput.ClassWithBoolTypes.staticB := false;
+}
+
+
+
+const unique RegressionTestInput.ClassWithArrayTypes: Type;
+
 var RegressionTestInput.ClassWithArrayTypes.s: int;
 
 const unique RegressionTestInput.ClassWithArrayTypes.a: int;
@@ -437,7 +479,6 @@ procedure RegressionTestInput.ClassWithArrayTypes.#ctor(this: int);
 
 implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 {
-    $Heap[this, RegressionTestInput.ClassWithArrayTypes.s] := 0;
     $Heap[this, RegressionTestInput.ClassWithArrayTypes.a] := 0;
     call System.Object.#ctor(this);
     return;
@@ -445,6 +486,19 @@ implementation RegressionTestInput.ClassWithArrayTypes.#ctor(this: int)
 
 
 
+procedure RegressionTestInput.ClassWithArrayTypes.#cctor();
+
+
+
+implementation RegressionTestInput.ClassWithArrayTypes.#cctor()
+{
+    RegressionTestInput.ClassWithArrayTypes.s := 0;
+}
+
+
+
+const unique RegressionTestInput.Class0: Type;
+
 var RegressionTestInput.Class0.StaticInt: int;
 
 procedure RegressionTestInput.Class0.StaticMethod$System.Int32(x$in: int) returns ($result: int);
@@ -671,9 +725,19 @@ procedure RegressionTestInput.Class0.#ctor(this: int);
 
 implementation RegressionTestInput.Class0.#ctor(this: int)
 {
-    $Heap[this, RegressionTestInput.Class0.StaticInt] := 0;
     call System.Object.#ctor(this);
     return;
 }
 
 
+
+procedure RegressionTestInput.Class0.#cctor();
+
+
+
+implementation RegressionTestInput.Class0.#cctor()
+{
+    RegressionTestInput.Class0.StaticInt := 0;
+}
+
+