Revert "Set AppContext.BaseDirectory and the lookup path for AssemblyDirectory to the directory containing the NativeAOT module" #113211
Conversation
…Director…" This reverts commit 7cfe5e3.
|
/azp run runtime-nativeaot-outerloop |
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
PR Overview
This PR reverts the changes made in #112457 to restore the previous behavior for determining the application base directory and module path.
- Replaces the NativeAOT-specific GetRuntimeModulePath with Environment.ProcessPath in AppContext.AnyOS.cs.
- Updates the return types in DeveloperExperience.cs and RuntimeAugments.cs to be non-nullable, and removes the GetRuntimeModulePath helper from AppContext.NativeAot.cs.
- Removes the SharedLibraryDependencyLoading test, which may affect shared library dependency loading coverage.
Reviewed Changes
| File | Description |
|---|---|
| src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs | Reverts the use of GetRuntimeModulePath to Environment.ProcessPath for NativeAOT. |
| src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/DeveloperExperience/DeveloperExperience.cs | Adjusts the type of moduleFullFileName to non-nullable string, requiring additional handling of empty values. |
| src/coreclr/nativeaot/System.Private.CoreLib/src/System/AppContext.NativeAot.cs | Removes an unused NativeAOT-specific helper method. |
| src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs | Changes the return type of TryGetFullPathToApplicationModule from nullable to non-nullable, potentially introducing null-safety issues. |
| src/tests/nativeaot/SmokeTests/SharedLibraryDependencyLoading/SharedLibraryDependencyLoading.cs | Deletes the test file related to shared library dependency loading. |
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
src/tests/nativeaot/SmokeTests/SharedLibraryDependencyLoading/SharedLibraryDependencyLoading.cs:1
- The removal of this test file could reduce coverage for shared library dependency loading. Confirm that this change is intentional and that critical test coverage is maintained elsewhere.
// Licensed to the .NET Foundation under one or more agreements.
| @@ -641,7 +641,7 @@ public static RuntimeTypeHandle GetNullableType(RuntimeTypeHandle nullableType) | |||
| /// </summary> | |||
| /// <param name="ip">Address inside the module</param> | |||
| /// <param name="moduleBase">Module base address</param> | |||
| public static unsafe string? TryGetFullPathToApplicationModule(IntPtr ip, out IntPtr moduleBase) | |||
| public static unsafe string TryGetFullPathToApplicationModule(IntPtr ip, out IntPtr moduleBase) | |||
There was a problem hiding this comment.
The method signature has been changed to return a non-nullable string, but the implementation may return null when moduleBase is IntPtr.Zero. Consider returning string.Empty instead to adhere to the non-nullable contract.
Copilot is powered by AI, so mistakes are possible. Review output carefully before use.
|
Can we add the "BaseDirectory must be a rooted path" test as part of this? |
Why part of this? Revert PRs are typically just reverts. If we later revert the revert, it would revert the test too. I put it in #113232. |
|
Adding it in a different PR is fine. |
|
/ba-g timeout in unrelated leg |
Reverts #112457