[NativeAOT-LLVM] Do not specify the compilation directory for LLVM modules #3146 from SingleAccretion/DI-CompDir

[NativeAOT-LLVM] Do not specify the compilation directory for LLVM modules

Author: pavelsavara

src/coreclr/jit/llvmdebuginfo.cpp

@@ -268,21 +268,18 @@ class TypeDebugInfoModule
     DICompileUnit* InitializeCompileUnit()
     {
         StringRef path = m_context->Module.getName();
-        StringRef dir;
         StringRef name;
         size_t dirEnd = path.find_last_of("\\/");
         if (dirEnd != StringRef::npos)
         {
-            dir = path.take_front(dirEnd);
             name = path.substr(dirEnd + 1);
         }
         else
         {
-            dir = "";
             name = path;
         }
 
-        DIFile* debugFile = m_diBuilder.createFile(name, dir);
+        DIFile* debugFile = m_diBuilder.createFile(name, "");
         return m_diBuilder.createCompileUnit(DW_LANG_C_plus_plus, debugFile, "ILC", false, "", 1, "",
             DICompileUnit::FullDebug, 0, false);
     }

src/tests/nativeaot/SmokeTests/HelloWasm/WasmDebugging.cs

@@ -9,7 +9,7 @@
 using System;
 using System.Diagnostics;
 
-unsafe class Program
+unsafe partial class Program
 {
     public static int Main()
     {
@@ -32,6 +32,8 @@ public static int Main()
         simpleStruct.TestStructInstanceMethod();
         simpleClass.TestClassInstanceMethod();
         TestVariables(5, simpleStruct, simpleClass);
+        TestSourceFileResolved();
+        TestMappedSourceFileResolved();
 
         // TODO-LLVM-DI: debugging and EH.
         return 100;
@@ -133,6 +135,11 @@ private static void TestVariables(int p1, SimpleStruct p2, SimpleClass p3)
         classLocal = p3;
         Debugger.Break(); // "p3" and "classLocal" should be equal to "{ 5, 2.0 }".
     }
+
+    private static void TestSourceFileResolved()
+    {
+        Debugger.Break(); // This source code should be resolved and visible.
+    }
 }
 
 struct SimpleStruct

src/tests/nativeaot/SmokeTests/HelloWasm/WasmDebugging.csproj

@@ -1,10 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <InvariantGlobalization>true</InvariantGlobalization>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
+
+    <PathMap>$(MSBuildThisFileDirectory)WasmDebuggingMappedPath=MAPPED_PATH</PathMap>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsWasi)' == 'true'">
@@ -31,5 +33,6 @@ CLRTestExecutionArguments=("$WASM_DEBUGGING_LLDB" $(_LldbArgs) -- "$WASM_DEBUGGI
 
   <ItemGroup>
     <Compile Include="WasmDebugging.cs" />
+    <Compile Include="WasmDebuggingMappedPath/WasmDebuggingMappedFile.cs" />
   </ItemGroup>
 </Project>

src/tests/nativeaot/SmokeTests/HelloWasm/WasmDebugging.py

@@ -39,6 +39,8 @@ def run_wasm_debugging_tests(debugger):
     test_struct_instance_method(target, process, thread)
     test_class_instance_method(target, process, thread)
     test_variables(target, process, thread);
+    test_source_file_resolved(target, process, thread)
+    test_mapped_source_file_resolved(target, process, thread)
 
     if all_tests_passed:
         print('==== All WASM debugging tests passed ====')
@@ -185,6 +187,25 @@ def test_values_display(target, process, thread, pyname, expected_states, use_ge
                 return
     pass_test()
 
+def test_source_file_resolved(target, process, thread):
+    start_test('test_source_file_resolved')
+    process.Continue()
+    source_file = thread.GetSelectedFrame().line_entry.file;
+    print(f'File under test: "{source_file}"')
+    end_test(source_file.exists, f'"{source_file}" not found')
+
+def test_mapped_source_file_resolved(target, process, thread):
+    start_test('test_mapped_source_file_resolved')
+    path = os.path.abspath(os.path.dirname(__file__))
+    path = os.path.join(path, "WasmDebuggingMappedPath")
+    print(f'Mapping MAPPED_PATH to "{path}"')
+    target.GetDebugger().HandleCommand(f'settings set target.source-map MAPPED_PATH "{path}"')
+    process.Continue()
+
+    source_file = thread.GetSelectedFrame().line_entry.file;
+    print(f'File under test: "{source_file}"')
+    end_test(source_file.exists, f'"{source_file}" not found')
+
 all_tests_passed = True
 current_test_name = None
 

src/tests/nativeaot/SmokeTests/HelloWasm/WasmDebuggingMappedPath/WasmDebuggingMappedFile.cs

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+
+partial class Program
+{
+    private static void TestMappedSourceFileResolved()
+    {
+        Debugger.Break(); // This source code should be resolved and visible.
+    }
+}