Add .note.swift_reflection_metadata #26479

alexander-shaposhnikov · 2019-08-04T02:20:55Z

Introduce .note.swift_reflection_metadata.

alexander-shaposhnikov · 2019-08-04T02:23:41Z

cc: @compnerd , @jckarter
P.S. I have factored out the minimal changes required for SwiftRT-ELF.cpp (while still keeping the build green) from #26419

dcci · 2019-08-05T20:01:31Z

@swift-ci test

swift-ci · 2019-08-05T20:03:33Z

Build failed
Swift Test OS X Platform
Git Sha - 9289453084808d0edb636a209e365dc64c2917bf

swift-ci · 2019-08-05T20:03:43Z

Build failed
Swift Test Linux Platform
Git Sha - 9289453084808d0edb636a209e365dc64c2917bf

dcci

Thanks a lot for working on this one! The general idea looks fine [I also talked with Joe offline and he seems onboard].

Looks like there's a build failure though.

13:25:20 
/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-master/swift/stdlib/public/runtime/SwiftRT-ELF.cpp:82:32: error: 'S' causes a section type conflict with 'MagicString'
13:25:20 const swift::MetadataSections *S = &sections;
13:25:20                                ^
13:25:20 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-master/swift/stdlib/public/runtime/SwiftRT-ELF.cpp:76:12: note: declared here
13:25:20 const char MagicString[] = SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING;
13:25:20            ^

alexander-shaposhnikov · 2019-08-06T01:00:10Z

Fixed the build failure

compnerd · 2019-08-06T02:08:25Z

stdlib/public/runtime/SwiftRT-ELF.cpp

+    SWIFT_SECTION_RANGE(swift5_replac2),
+    SWIFT_SECTION_RANGE(swift5_builtin),
+    SWIFT_SECTION_RANGE(swift5_capture),
+};


Does this not create a constructor? There is now a C++ constructor which runs separately than the actual constructor?

Yeah. Maybe it gets optimized away by LLVM GlobalOpt, but we should double-check. What I had meant in the previous PR was that we could generate the symbol and its definition in a global asm block, since the section ranges can be represented as constant expressions in assembly language, but not C.

compnerd · 2019-08-06T02:12:15Z

stdlib/public/runtime/SwiftRT-ELF.cpp

+__attribute__((__used__))
+__attribute__((__section__(".note.swift_reflection_metadata")))
+__attribute__((__aligned__(1)))
+const swift::MetadataSections *S = &sections;


I don't think that this works. The compiler is completely within its right to re-order the entries here. So we can end up with an invalid section here.

alexander-shaposhnikov · 2019-08-06T03:38:34Z

Addressed comments

alexander-shaposhnikov · 2019-08-06T03:52:05Z

Fixed typo

dcci · 2019-08-06T04:12:20Z

@swift-ci test

swift-ci · 2019-08-06T04:14:30Z

Build failed
Swift Test Linux Platform
Git Sha - 5c8debe7c68003348db92a831e8d315df548bed6

swift-ci · 2019-08-06T04:16:06Z

Build failed
Swift Test OS X Platform
Git Sha - 5c8debe7c68003348db92a831e8d315df548bed6

alexander-shaposhnikov · 2019-08-06T04:41:09Z

khm, sorry about the disturbance, it seems to me @swift-ci has tested some old commit instead of the latest one, maybe smb can kick off testing again

gmittert · 2019-08-06T05:44:26Z

@swift-ci please test

swift-ci · 2019-08-06T06:08:01Z

Build failed
Swift Test Linux Platform
Git Sha - 623584ef670359fc93ab2756b8feb497e5e5ec03

gmittert · 2019-08-06T08:43:15Z

@swift-ci please test

swift-ci · 2019-08-06T08:45:26Z

Build failed
Swift Test Linux Platform
Git Sha - 623584ef670359fc93ab2756b8feb497e5e5ec03

swift-ci · 2019-08-06T08:47:08Z

Build failed
Swift Test OS X Platform
Git Sha - 623584ef670359fc93ab2756b8feb497e5e5ec03

dcci · 2019-08-06T15:18:01Z

This is a peculiar failure

03:00:01 **** FAILURE EXECUTING SUBPROCESS ****
03:00:01 output: 
03:00:01 
stderr: /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-master/tmp/DependencyResolution_External_Complex.BZPCCg/app: error: manifest parse error(s):
03:00:01 <unknown>:0: warning: missing submodule 'SwiftOverlayShims'
03:00:01 <unknown>:0: error: missing required module 'SwiftOverlayShims'
03:00:01

and definitely unrelated to the PR. Trying again.

dcci · 2019-08-06T15:18:17Z

@swift-ci test linux platform

compnerd · 2019-08-07T01:28:16Z

stdlib/public/runtime/SwiftRT-ELF.cpp

+__attribute__((__section__(".note.swift_reflection_metadata")))
+__attribute__((__aligned__(1)))
+struct {
+  const char MagicString[sizeof(SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING)];


I think that doing sizeof(SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING)/sizeof(*SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING) is better.

addressed

compnerd · 2019-08-07T01:29:27Z

I'm fine with these changes assuming that @jckarter is also happy with it.

jckarter · 2019-08-07T01:46:27Z

Seems reasonable to me.

compnerd · 2019-08-07T16:08:53Z

@swift-ci please test

swift-ci · 2019-08-07T16:11:16Z

Build failed
Swift Test Linux Platform
Git Sha - 1bb9d4633db96cb01f78524029e42f04cee26ede

swift-ci · 2019-08-07T16:12:38Z

Build failed
Swift Test OS X Platform
Git Sha - 1bb9d4633db96cb01f78524029e42f04cee26ede

compnerd · 2019-08-07T20:17:53Z

@swift-ci please test Linux platform

swift-ci · 2019-08-07T21:57:51Z

Build failed
Swift Test Linux Platform
Git Sha - 9a322f3404c0603bdda90fc9c6995fd12033ec3d

gmittert · 2019-08-08T05:22:09Z

@swift-ci please test

swift-ci · 2019-08-08T06:40:12Z

Build failed
Swift Test Linux Platform
Git Sha - 9a322f3404c0603bdda90fc9c6995fd12033ec3d

compnerd · 2019-08-08T21:15:28Z

@swift-ci please test

swift-ci · 2019-08-08T21:15:49Z

Build failed
Swift Test Linux Platform
Git Sha - 9a322f3404c0603bdda90fc9c6995fd12033ec3d

swift-ci · 2019-08-08T21:19:29Z

Build failed
Swift Test OS X Platform
Git Sha - 9a322f3404c0603bdda90fc9c6995fd12033ec3d

compnerd · 2019-08-09T14:55:39Z

@swift-ci please test macOS platform

alexander-shaposhnikov mentioned this pull request Aug 4, 2019

Fix parsing of ELF images #26419

Merged

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch 3 times, most recently from c948998 to 5c8debe Compare August 4, 2019 03:34

dcci requested a review from jckarter August 5, 2019 20:01

dcci reviewed Aug 5, 2019

View reviewed changes

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch from 5c8debe to 01efda3 Compare August 6, 2019 00:59

compnerd previously requested changes Aug 6, 2019

View reviewed changes

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch from 01efda3 to c311bc2 Compare August 6, 2019 03:37

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch from c311bc2 to 623584e Compare August 6, 2019 03:51

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch from 623584e to 1bb9d46 Compare August 6, 2019 08:40

compnerd reviewed Aug 7, 2019

View reviewed changes

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch from 1bb9d46 to 9a322f3 Compare August 7, 2019 03:13

Add .note.swift_reflection_metadata

791ca54

alexander-shaposhnikov force-pushed the modify_swift_rt_elf branch from 9a322f3 to 791ca54 Compare August 8, 2019 08:12

compnerd merged commit f1861c3 into swiftlang:master Aug 10, 2019

Add .note.swift_reflection_metadata #26479

Add .note.swift_reflection_metadata #26479

Uh oh!

Conversation

alexander-shaposhnikov commented Aug 4, 2019

Uh oh!

alexander-shaposhnikov commented Aug 4, 2019

Uh oh!

dcci commented Aug 5, 2019

Uh oh!

swift-ci commented Aug 5, 2019

Uh oh!

swift-ci commented Aug 5, 2019

Uh oh!

dcci left a comment

Choose a reason for hiding this comment

Uh oh!

alexander-shaposhnikov commented Aug 6, 2019

Uh oh!

compnerd Aug 6, 2019

Choose a reason for hiding this comment

Uh oh!

jckarter Aug 6, 2019

Choose a reason for hiding this comment

Uh oh!

compnerd Aug 6, 2019

Choose a reason for hiding this comment

Uh oh!

alexander-shaposhnikov commented Aug 6, 2019

Uh oh!

alexander-shaposhnikov commented Aug 6, 2019

Uh oh!

dcci commented Aug 6, 2019

Uh oh!

swift-ci commented Aug 6, 2019

Uh oh!

swift-ci commented Aug 6, 2019

Uh oh!

alexander-shaposhnikov commented Aug 6, 2019

Uh oh!

gmittert commented Aug 6, 2019

Uh oh!

swift-ci commented Aug 6, 2019

Uh oh!

gmittert commented Aug 6, 2019

Uh oh!

swift-ci commented Aug 6, 2019

Uh oh!

swift-ci commented Aug 6, 2019

Uh oh!

dcci commented Aug 6, 2019

Uh oh!

dcci commented Aug 6, 2019

Uh oh!

compnerd Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

compnerd commented Aug 7, 2019

Uh oh!

jckarter commented Aug 7, 2019

Uh oh!

compnerd commented Aug 7, 2019

Uh oh!

swift-ci commented Aug 7, 2019

Uh oh!

swift-ci commented Aug 7, 2019

Uh oh!

compnerd commented Aug 7, 2019

Uh oh!

swift-ci commented Aug 7, 2019

Uh oh!

gmittert commented Aug 8, 2019

Uh oh!

swift-ci commented Aug 8, 2019

Uh oh!

compnerd commented Aug 8, 2019

Uh oh!

swift-ci commented Aug 8, 2019

Uh oh!

swift-ci commented Aug 8, 2019