WIP

kekyo · May 1, 2024 · 8a60a17 · 8a60a17
1 parent 294c728
commit 8a60a17
Show file tree

Hide file tree

Showing 15 changed files with 162 additions and 157 deletions.
diff --git a/...ibild.core.Tests/LinkerTests.CombinedMultipleAssemblyCodeDuplicatedStructure.verified.txt b/...ibild.core.Tests/LinkerTests.CombinedMultipleAssemblyCodeDuplicatedStructure.verified.txt
@@ -44,9 +44,9 @@
   {
     // Code size       17 (0x11)
     .maxstack  1
-    .locals (valuetype [combinetestbed]C.type.Foo V_0)
+    .locals (valuetype C.type.Foo V_0)
     IL_0000:  ldloca     V_0
-    IL_0004:  initobj    [combinetestbed]C.type.Foo
+    IL_0004:  initobj    C.type.Foo
     IL_000a:  ldloc.0
     IL_000b:  call       int64 [combinetestbed]C.text::foo_calc(valuetype [combinetestbed]C.type.Foo)
     IL_0010:  ret

diff --git a/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedEnumrerate.verified.txt b/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedEnumrerate.verified.txt
@@ -33,20 +33,6 @@
   .field public static literal int32 pork
 } // end of class C.type.foo
 
-.class private abstract auto ansi sealed beforefieldinit '<source1>$'
-       extends [mscorlib]System.Object
-{
-  .class auto ansi sealed nested public foo
-         extends [mscorlib]System.Enum
-  {
-    .field public specialname rtspecialname int32 value__
-    .field public static literal int32 beef
-    .field public static literal int32 pork
-    .field public static literal int32 chicken
-  } // end of class foo
-
-} // end of class '<source1>$'
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -62,6 +48,20 @@
 
 } // end of class C.text
 
+.class private abstract auto ansi sealed beforefieldinit '<source1>$'
+       extends [mscorlib]System.Object
+{
+  .class auto ansi sealed nested public foo
+         extends [mscorlib]System.Enum
+  {
+    .field public specialname rtspecialname int32 value__
+    .field public static literal int32 beef
+    .field public static literal int32 pork
+    .field public static literal int32 chicken
+  } // end of class foo
+
+} // end of class '<source1>$'
+
 
 // =============================================================
 

diff --git a/...ibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedEnumrerate2.verified.txt b/...ibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedEnumrerate2.verified.txt
@@ -38,15 +38,6 @@
 
 } // end of class '<source>$'
 
-.class public auto ansi sealed C.type.foo
-       extends [mscorlib]System.Enum
-{
-  .field public specialname rtspecialname int32 value__
-  .field public static literal int32 beef
-  .field public static literal int32 pork
-  .field public static literal int32 chicken
-} // end of class C.type.foo
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -62,6 +53,15 @@
 
 } // end of class C.text
 
+.class public auto ansi sealed C.type.foo
+       extends [mscorlib]System.Enum
+{
+  .field public specialname rtspecialname int32 value__
+  .field public static literal int32 beef
+  .field public static literal int32 pork
+  .field public static literal int32 chicken
+} // end of class C.type.foo
+
 
 // =============================================================
 

diff --git a/...ibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedEnumrerate3.verified.txt b/...ibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedEnumrerate3.verified.txt
@@ -38,6 +38,19 @@
 
 } // end of class '<source>$'
 
+.class public abstract auto ansi sealed C.text
+       extends [mscorlib]System.Object
+{
+  .method public static int32  main() cil managed
+  {
+    // Code size       2 (0x2)
+    .maxstack  8
+    IL_0000:  ldc.i4.0
+    IL_0001:  ret
+  } // end of method text::main
+
+} // end of class C.text
+
 .class private abstract auto ansi sealed beforefieldinit '<source1>$'
        extends [mscorlib]System.Object
 {
@@ -52,19 +65,6 @@
 
 } // end of class '<source1>$'
 
-.class public abstract auto ansi sealed C.text
-       extends [mscorlib]System.Object
-{
-  .method public static int32  main() cil managed
-  {
-    // Code size       2 (0x2)
-    .maxstack  8
-    IL_0000:  ldc.i4.0
-    IL_0001:  ret
-  } // end of method text::main
-
-} // end of class C.text
-
 
 // =============================================================
 

diff --git a/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedFunctions1.verified.txt b/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedFunctions1.verified.txt
@@ -25,19 +25,6 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
-.class private abstract auto ansi sealed beforefieldinit '<source2>$'
-       extends [mscorlib]System.Object
-{
-  .method public static int32  foo(int32 A_0) cil managed
-  {
-    // Code size       2 (0x2)
-    .maxstack  8
-    IL_0000:  ldarg.1
-    IL_0001:  ret
-  } // end of method '<source2>$'::foo
-
-} // end of class '<source2>$'
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -60,6 +47,19 @@
 
 } // end of class C.text
 
+.class private abstract auto ansi sealed beforefieldinit '<source2>$'
+       extends [mscorlib]System.Object
+{
+  .method public static int32  foo(int32 A_0) cil managed
+  {
+    // Code size       2 (0x2)
+    .maxstack  8
+    IL_0000:  ldarg.1
+    IL_0001:  ret
+  } // end of method '<source2>$'::foo
+
+} // end of class '<source2>$'
+
 
 // =============================================================
 

diff --git a/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedFunctions2.verified.txt b/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedFunctions2.verified.txt
@@ -25,19 +25,6 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
-.class private abstract auto ansi sealed beforefieldinit '<source1>$'
-       extends [mscorlib]System.Object
-{
-  .method public static int32  foo(int32 A_0) cil managed
-  {
-    // Code size       2 (0x2)
-    .maxstack  8
-    IL_0000:  ldarg.0
-    IL_0001:  ret
-  } // end of method '<source1>$'::foo
-
-} // end of class '<source1>$'
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -46,7 +33,7 @@
     // Code size       7 (0x7)
     .maxstack  8
     IL_0000:  ldc.i4.1
-    IL_0001:  call       int32 C.text::foo(int32)
+    IL_0001:  call       int32 '<source1>$'::foo(int32)
     IL_0006:  ret
   } // end of method text::main
 
@@ -60,6 +47,19 @@
 
 } // end of class C.text
 
+.class private abstract auto ansi sealed beforefieldinit '<source1>$'
+       extends [mscorlib]System.Object
+{
+  .method public static int32  foo(int32 A_0) cil managed
+  {
+    // Code size       2 (0x2)
+    .maxstack  8
+    IL_0000:  ldarg.0
+    IL_0001:  ret
+  } // end of method '<source1>$'::foo
+
+} // end of class '<source1>$'
+
 
 // =============================================================
 

diff --git a/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedFunctions3.verified.txt b/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedFunctions3.verified.txt
@@ -25,6 +25,19 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
+.class public abstract auto ansi sealed C.text
+       extends [mscorlib]System.Object
+{
+  .method public static int32  main() cil managed
+  {
+    // Code size       2 (0x2)
+    .maxstack  8
+    IL_0000:  ldc.i4.1
+    IL_0001:  ret
+  } // end of method text::main
+
+} // end of class C.text
+
 .class private abstract auto ansi sealed beforefieldinit '<source1>$'
        extends [mscorlib]System.Object
 {
@@ -51,19 +64,6 @@
 
 } // end of class '<source2>$'
 
-.class public abstract auto ansi sealed C.text
-       extends [mscorlib]System.Object
-{
-  .method public static int32  main() cil managed
-  {
-    // Code size       2 (0x2)
-    .maxstack  8
-    IL_0000:  ldc.i4.1
-    IL_0001:  ret
-  } // end of method text::main
-
-} // end of class C.text
-
 
 // =============================================================
 

diff --git a/...chibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedStructure.verified.txt b/...chibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedStructure.verified.txt
@@ -32,19 +32,6 @@
   .field public int32 v1
 } // end of class C.type.foo
 
-.class private abstract auto ansi sealed beforefieldinit '<source1>$'
-       extends [mscorlib]System.Object
-{
-  .class sequential ansi sealed nested public foo
-         extends [mscorlib]System.ValueType
-  {
-    .field public int32 v0
-    .field public int32 v1
-    .field public int32 v2
-  } // end of class foo
-
-} // end of class '<source1>$'
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -60,6 +47,19 @@
 
 } // end of class C.text
 
+.class private abstract auto ansi sealed beforefieldinit '<source1>$'
+       extends [mscorlib]System.Object
+{
+  .class sequential ansi sealed nested public foo
+         extends [mscorlib]System.ValueType
+  {
+    .field public int32 v0
+    .field public int32 v1
+    .field public int32 v2
+  } // end of class foo
+
+} // end of class '<source1>$'
+
 
 // =============================================================
 

diff --git a/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedStructure2.verified.txt b/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedStructure2.verified.txt
@@ -37,14 +37,6 @@
 
 } // end of class '<source>$'
 
-.class public sequential ansi sealed C.type.foo
-       extends [mscorlib]System.ValueType
-{
-  .field public int32 v0
-  .field public int32 v1
-  .field public int32 v2
-} // end of class C.type.foo
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -60,6 +52,14 @@
 
 } // end of class C.text
 
+.class public sequential ansi sealed C.type.foo
+       extends [mscorlib]System.ValueType
+{
+  .field public int32 v0
+  .field public int32 v1
+  .field public int32 v2
+} // end of class C.type.foo
+
 
 // =============================================================
 

diff --git a/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedStructure3.verified.txt b/...hibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeDuplicatedStructure3.verified.txt
@@ -37,19 +37,6 @@
 
 } // end of class '<source>$'
 
-.class private abstract auto ansi sealed beforefieldinit '<source1>$'
-       extends [mscorlib]System.Object
-{
-  .class sequential ansi sealed nested public foo
-         extends [mscorlib]System.ValueType
-  {
-    .field public int32 v0
-    .field public int32 v1
-    .field public int32 v2
-  } // end of class foo
-
-} // end of class '<source1>$'
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -63,6 +50,19 @@
 
 } // end of class C.text
 
+.class private abstract auto ansi sealed beforefieldinit '<source1>$'
+       extends [mscorlib]System.Object
+{
+  .class sequential ansi sealed nested public foo
+         extends [mscorlib]System.ValueType
+  {
+    .field public int32 v0
+    .field public int32 v1
+    .field public int32 v2
+  } // end of class foo
+
+} // end of class '<source1>$'
+
 
 // =============================================================
 

diff --git a/chibild/chibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeForEnumrerate.verified.txt b/chibild/chibild.core.Tests/LinkerTests.CombinedMultipleSourceCodeForEnumrerate.verified.txt
@@ -33,14 +33,6 @@
   .field public static literal int32 pork
 } // end of class C.type.foo
 
-.class public auto ansi sealed C.type.bar
-       extends [mscorlib]System.Enum
-{
-  .field public specialname rtspecialname int32 value__
-  .field public static literal int32 beef
-  .field public static literal int32 pork
-} // end of class C.type.bar
-
 .class public abstract auto ansi sealed C.text
        extends [mscorlib]System.Object
 {
@@ -56,6 +48,14 @@
 
 } // end of class C.text
 
+.class public auto ansi sealed C.type.bar
+       extends [mscorlib]System.Enum
+{
+  .field public specialname rtspecialname int32 value__
+  .field public static literal int32 beef
+  .field public static literal int32 pork
+} // end of class C.type.bar
+
 
 // =============================================================