Merge pull request #18 from hez2010/patch-6

Copy checked jit to NativeAOT compiler
compiler-explorer · Aug 23, 2024 · 72d3ff1 · 72d3ff1
2 parents f550a3d + f5809fb
commit 72d3ff1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/build/DisassemblyLoader/MonoJitInspector.cs b/build/DisassemblyLoader/MonoJitInspector.cs
@@ -70,7 +70,7 @@ public static unsafe void WriteDisassembly(MethodBase method, byte* code, int si
                 ulong tail = (ulong)(code + size);
                 var methodName = FormatMethodName(method);
 
-                WriteComment(writer, $"Assembly listing for method {methodName}:");
+                WriteComment(writer, $"Assembly listing for method {methodName}");
 
                 while (decoder.IP < tail)
                 {

diff --git a/build/DisassemblyLoader/Program.cs b/build/DisassemblyLoader/Program.cs
@@ -134,7 +134,7 @@ static void PrepareMethod(MethodBase methodBase)
                 }
                 catch (Exception ex)
                 {
-                    Console.WriteLine($"; Failed to generate code for '{methodBase}':");
+                    Console.WriteLine($"; Failed to generate code for method {methodBase}");
                     foreach (var line in ex.ToString().AsSpan().EnumerateLines())
                     {
                         Console.WriteLine($"; {line}");

diff --git a/build/build.sh b/build/build.sh
@@ -68,6 +68,9 @@ echo "${VERSION_WITHOUT_V}+${commit}" > "${CORE_ROOT}"/version.txt
 # Copy Checked JITs to CORE_ROOT
 cp artifacts/bin/coreclr/"${OS}".x64.Checked/libclrjit*.so "${CORE_ROOT}"
 cp artifacts/bin/coreclr/"${OS}".x64.Checked/libclrjit*.so "${CORE_ROOT}"/crossgen2
+if [ -d "${CORE_ROOT}"/ilc-published ]; then
+    cp artifacts/bin/coreclr/"${OS}".x64.Checked/libclrjit*.so "${CORE_ROOT}"/ilc-published
+fi
 
 # Copy mono to CORE_ROOT_MONO
 mkdir -p "${CORE_ROOT_MONO}"