On Apple platforms, use swiftmodule directories for the stdlib #21797

jrose-apple · 2019-01-11T18:55:52Z

This changes the Swift resource directory from looking like

lib/
  swift/
    macosx/
      libswiftCore.dylib
      libswiftDarwin.dylib
      x86_64/
        Swift.swiftmodule
        Swift.swiftdoc
        Darwin.swiftmodule
        Darwin.swiftdoc

to

lib/
  swift/
    macosx/
      libswiftCore.dylib
      libswiftDarwin.dylib
      Swift.swiftmodule/
        x86_64.swiftmodule
        x86_64.swiftdoc
      Darwin.swiftmodule/
        x86_64.swiftmodule
        x86_64.swiftdoc

matching the layout we use for multi-architecture swiftmodules everywhere else (particularly frameworks).

There's no change in this commit to how Linux swiftmodules are packaged. There's been past interest in going the opposite direction for Linux, since there's not standard support for fat (multi-architecture) .so libraries. Moving the .so search path down to an architecture-specific directory on Linux would allow the same resource directory to be used for both host-compiling and cross-compiling.

rdar://problem/43545560

jrose-apple · 2019-01-11T18:56:05Z

@swift-ci Please clean test

swift-ci · 2019-01-11T19:24:12Z

Build failed
Swift Test Linux Platform
Git Sha - 43a5da48d60120d78598fcfcffd1965cc85db2bc

swift-ci · 2019-01-11T19:33:00Z

Build failed
Swift Test OS X Platform
Git Sha - 43a5da48d60120d78598fcfcffd1965cc85db2bc

jrose-apple · 2019-01-14T17:12:36Z

@swift-ci Please clean test

swift-ci · 2019-01-14T17:14:41Z

Build failed
Swift Test Linux Platform
Git Sha - 43a5da48d60120d78598fcfcffd1965cc85db2bc

swift-ci · 2019-01-14T17:14:47Z

Build failed
Swift Test OS X Platform
Git Sha - 43a5da48d60120d78598fcfcffd1965cc85db2bc

jrose-apple · 2019-01-15T03:48:59Z

apple/swift-lldb#1203
@swift-ci Please clean test

swift-ci · 2019-01-15T04:43:44Z

Build failed
Swift Test Linux Platform
Git Sha - e0437be2eb59d45c91b61e33c7960fcd9ad54f7b

swift-ci · 2019-01-15T05:18:15Z

Build failed
Swift Test OS X Platform
Git Sha - e0437be2eb59d45c91b61e33c7960fcd9ad54f7b

jrose-apple · 2019-01-15T16:31:44Z

A little bit further every time…

jrose-apple · 2019-01-15T17:22:38Z

@swift-ci Please clean test

jrose-apple · 2019-01-15T17:23:13Z

Oops.

apple/swift-lldb#1203
@swift-ci Please clean test

swift-ci · 2019-01-15T18:27:52Z

Build failed
Swift Test Linux Platform
Git Sha - 034f5eebca50aa583d2cfe0d4be5dd5c3d25f709

swift-ci · 2019-01-15T19:55:21Z

Build failed
Swift Test OS X Platform
Git Sha - 034f5eebca50aa583d2cfe0d4be5dd5c3d25f709

jrose-apple · 2019-01-17T19:52:59Z

@swift-ci Please test

swift-ci · 2019-01-17T19:55:38Z

Build failed
Swift Test Linux Platform
Git Sha - 034f5eebca50aa583d2cfe0d4be5dd5c3d25f709

swift-ci · 2019-01-17T19:57:25Z

Build failed
Swift Test OS X Platform
Git Sha - 034f5eebca50aa583d2cfe0d4be5dd5c3d25f709

jrose-apple · 2019-01-17T21:12:19Z

Grr, right, that was the test I didn't update properly.

jrose-apple · 2019-01-17T21:14:45Z

@swift-ci Please clean test

swift-ci · 2019-01-17T21:15:26Z

Build failed
Swift Test OS X Platform
Git Sha - f1b32e8d328961c26c5c1ad970def19976b65de2

swift-ci · 2019-01-17T21:16:55Z

Build failed
Swift Test Linux Platform
Git Sha - f1b32e8d328961c26c5c1ad970def19976b65de2

jrose-apple · 2019-01-17T23:03:52Z

@swift-ci Please clean test macOS

swift-ci · 2019-01-17T23:06:07Z

Build failed
Swift Test OS X Platform
Git Sha - a2d104cfe001ac932f716171b4cf6c971c6e22f2

swift-ci · 2019-02-05T04:13:57Z

Build failed
Swift Test Linux Platform
Git Sha - 5dd1af156fdb3f160d825e993cdd99b811a205ea

jrose-apple · 2019-02-05T16:51:28Z

@swift-ci Please test Linux

jrose-apple · 2019-02-05T16:51:36Z

@swift-ci Please smoke test macOS

swift-ci · 2019-02-05T16:53:41Z

Build failed
Swift Test Linux Platform
Git Sha - fe64558bda507dbfa59cd83ee2e5c106f6e2887b

jrose-apple · 2019-02-15T23:10:01Z

@swift-ci Please clean test

jrose-apple · 2019-02-15T23:10:07Z

@swift-ci Please test source compatibility

swift-ci · 2019-02-16T00:06:29Z

Build failed
Swift Test Linux Platform
Git Sha - cd4df29848948ba54533b20c0355f904793d0a19

swift-ci · 2019-02-16T01:36:28Z

Build failed
Swift Test OS X Platform
Git Sha - cd4df29848948ba54533b20c0355f904793d0a19

jrose-apple · 2019-02-16T01:43:04Z

test/DebugInfo/variables.swift

@@ -41,7 +41,7 @@ print(", \(glob_b)", terminator: "")
 print(", \(glob_s)", terminator: "")
 var unused: Int32 = -1

-// CHECK-DAG: ![[RT:[0-9]+]] ={{.*}}"{{.*}}Swift.swiftmodule"
+// CHECK-DAG: !{{RT:[0-9]+}} = !DIFile({{filename: ".+[.]swiftmodule", directory: ".*Swift[.]swiftmodule"|filename: "Swift[.]swiftmodule", directory: ".*"}})


Oops. I missed some square brackets.

jrose-apple · 2019-02-16T01:46:26Z

Debug source compat suite passed
Release source compat suite still going

I need to figure out what was wrong with my fixes for the debug info tests, so building locally. Will try again next week.

This changes the Swift resource directory from looking like lib/ swift/ macosx/ libswiftCore.dylib libswiftDarwin.dylib x86_64/ Swift.swiftmodule Swift.swiftdoc Darwin.swiftmodule Darwin.swiftdoc to lib/ swift/ macosx/ libswiftCore.dylib libswiftDarwin.dylib Swift.swiftmodule/ x86_64.swiftmodule x86_64.swiftdoc Darwin.swiftmodule/ x86_64.swiftmodule x86_64.swiftdoc matching the layout we use for multi-architecture swiftmodules everywhere else (particularly frameworks). There's no change in this commit to how Linux swiftmodules are packaged. There's been past interest in going the /opposite/ direction for Linux, since there's not standard support for fat (multi-architecture) .so libraries. Moving the .so search path /down/ to an architecture-specific directory on Linux would allow the same resource directory to be used for both host-compiling and cross-compiling. rdar://problem/43545560

jrose-apple · 2019-02-16T03:55:34Z

@swift-ci Please clean test

swift-ci · 2019-02-16T03:56:11Z

Build failed
Swift Test OS X Platform
Git Sha - cd4df29848948ba54533b20c0355f904793d0a19

swift-ci · 2019-02-16T03:57:33Z

Build failed
Swift Test Linux Platform
Git Sha - cd4df29848948ba54533b20c0355f904793d0a19

paulmillr · 2019-02-19T07:31:20Z

@jrose-apple how would it play with ARMOSX branch?

jrose-apple · 2019-02-19T16:30:53Z

I'm not sure what you're referring to, but I wouldn't expect this to be a problem. The "right" condition is "does your platform support fat dylibs" but right now it's approximating this with "is your platform an Apple platform in one of these lists".

jrose-apple · 2019-02-19T16:31:01Z

@swift-ci Please clean test Linux

jrose-apple · 2019-02-19T22:47:11Z

Here we go. I'll be watching this to make sure it works (and to fix the merge conflicts for Apple-internal folks), but if it's breaking things overnight or tomorrow morning please just revert.

…lang#21797) This changes the Swift resource directory from looking like lib/ swift/ macosx/ libswiftCore.dylib libswiftDarwin.dylib x86_64/ Swift.swiftmodule Swift.swiftdoc Darwin.swiftmodule Darwin.swiftdoc to lib/ swift/ macosx/ libswiftCore.dylib libswiftDarwin.dylib Swift.swiftmodule/ x86_64.swiftmodule x86_64.swiftdoc Darwin.swiftmodule/ x86_64.swiftmodule x86_64.swiftdoc matching the layout we use for multi-architecture swiftmodules everywhere else (particularly frameworks). There's no change in this commit to how Linux swiftmodules are packaged. There's been past interest in going the /opposite/ direction for Linux, since there's not standard support for fat (multi-architecture) .so libraries. Moving the .so search path /down/ to an architecture-specific directory on Linux would allow the same resource directory to be used for both host-compiling and cross-compiling. rdar://problem/43545560

jrose-apple force-pushed the prime-directory branch from 43a5da4 to e0437be Compare January 14, 2019 16:53

jrose-apple mentioned this pull request Jan 15, 2019

Swift-side removal of SearchPathOptions::RuntimeLibraryImportPath apple/swift-lldb#1203

Closed

jrose-apple force-pushed the prime-directory branch from e0437be to 034f5ee Compare January 15, 2019 17:19

jrose-apple force-pushed the prime-directory branch from 034f5ee to f1b32e8 Compare January 17, 2019 19:52

jrose-apple force-pushed the prime-directory branch from f1b32e8 to a2d104c Compare January 17, 2019 21:13

jrose-apple force-pushed the prime-directory branch 2 times, most recently from b9d82d9 to 1b9a4df Compare January 17, 2019 23:02

jrose-apple force-pushed the prime-directory branch 2 times, most recently from 171953b to 1b94055 Compare February 5, 2019 16:49

jrose-apple force-pushed the prime-directory branch from 1b94055 to cd4df29 Compare February 15, 2019 23:09

jrose-apple commented Feb 16, 2019

View reviewed changes

jrose-apple force-pushed the prime-directory branch from cd4df29 to 358f390 Compare February 16, 2019 01:44

jrose-apple force-pushed the prime-directory branch from 358f390 to d8f12b5 Compare February 16, 2019 03:54

jrose-apple merged commit 43feb9c into swiftlang:master Feb 19, 2019

jrose-apple deleted the prime-directory branch February 19, 2019 22:47

jrose-apple mentioned this pull request Feb 26, 2019

[test] Fix loaded_module_trace.swift for arch's that sort before "M" #22907

Merged

beccadax mentioned this pull request Mar 1, 2019

[5.1] Module filename and location changes #23021

Merged

beccadax mentioned this pull request Mar 2, 2019

[old-llvm] [5.1] Module filename and location changes #23039

Merged

On Apple platforms, use swiftmodule directories for the stdlib #21797

On Apple platforms, use swiftmodule directories for the stdlib #21797

Uh oh!

Conversation

jrose-apple commented Jan 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jrose-apple commented Jan 11, 2019

Uh oh!

swift-ci commented Jan 11, 2019

Uh oh!

swift-ci commented Jan 11, 2019

Uh oh!

jrose-apple commented Jan 14, 2019

Uh oh!

swift-ci commented Jan 14, 2019

Uh oh!

swift-ci commented Jan 14, 2019

Uh oh!

jrose-apple commented Jan 15, 2019

Uh oh!

swift-ci commented Jan 15, 2019

Uh oh!

swift-ci commented Jan 15, 2019

Uh oh!

jrose-apple commented Jan 15, 2019

Uh oh!

jrose-apple commented Jan 15, 2019

Uh oh!

jrose-apple commented Jan 15, 2019

Uh oh!

swift-ci commented Jan 15, 2019

Uh oh!

swift-ci commented Jan 15, 2019

Uh oh!

jrose-apple commented Jan 17, 2019

Uh oh!

swift-ci commented Jan 17, 2019

Uh oh!

swift-ci commented Jan 17, 2019

Uh oh!

jrose-apple commented Jan 17, 2019

Uh oh!

jrose-apple commented Jan 17, 2019

Uh oh!

swift-ci commented Jan 17, 2019

Uh oh!

swift-ci commented Jan 17, 2019

Uh oh!

jrose-apple commented Jan 17, 2019

Uh oh!

swift-ci commented Jan 17, 2019

Uh oh!

swift-ci commented Feb 5, 2019

Uh oh!

jrose-apple commented Feb 5, 2019

Uh oh!

jrose-apple commented Feb 5, 2019

Uh oh!

swift-ci commented Feb 5, 2019

Uh oh!

jrose-apple commented Feb 15, 2019

Uh oh!

jrose-apple commented Feb 15, 2019

Uh oh!

swift-ci commented Feb 16, 2019

Uh oh!

swift-ci commented Feb 16, 2019

Uh oh!

jrose-apple Feb 16, 2019

Choose a reason for hiding this comment

Uh oh!

jrose-apple commented Feb 16, 2019

Uh oh!

jrose-apple commented Feb 16, 2019

Uh oh!

swift-ci commented Feb 16, 2019

Uh oh!

swift-ci commented Feb 16, 2019

Uh oh!

jrose-apple commented Jan 11, 2019 •

edited

Loading