Skip to content

Commit 0877f9a

Browse files
authored
Merge pull request #40685 from compnerd/normalized
Serialization: normalize the path before use
2 parents a99e152 + 849d5f0 commit 0877f9a

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,7 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
12281228
Ctx.addLoadedModule(M);
12291229
SWIFT_DEFER { M->setHasResolvedImports(); };
12301230

1231+
llvm::sys::path::native(moduleInterfacePath);
12311232
auto *file =
12321233
loadAST(*M, moduleID.Loc, moduleInterfacePath,
12331234
std::move(moduleInputBuffer), std::move(moduleDocInputBuffer),

test/CrossImport/module-trace.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// This file tests that we emit cross-imports into module interfaces.
22

3-
// FIXME: Fix the path normalization issue and get rid of this.
4-
// UNSUPPORTED: OS=windows-msvc
5-
63
// RUN: %empty-directory(%t)
74
// RUN: cp -r %S/Inputs/lib-templates/* %t/
85

test/ModuleInterface/ModuleCache/SDKDependencies.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// RUN: %empty-directory(%t)
22

3-
// XFAIL: OS=windows-msvc
4-
53
// 1) Build a prebuilt cache for our SDK
64
//
75
// RUN: mkdir %t/MCP %t/prebuilt-cache %t/my-sdk

0 commit comments

Comments
 (0)