IRGen: Don't hoist metadata for weakly linked types #21223
Conversation
rdar://46438608
|
@swift-ci Please test |
lib/IRGen/AllocStackHoisting.cpp
Outdated
| @@ -57,6 +57,11 @@ static bool isHoistable(AllocStackInst *Inst, irgen::IRGenModule &Mod) { | |||
| if (TI.isFixedSize()) | |||
| return false; | |||
|
|
|||
| // Don't hoist weakly imported (weakly linked) types. | |||
| auto *nominalDecl = SILTy.getASTType()->getNominalOrBoundGenericNominal(); | |||
There was a problem hiding this comment.
What if you have a structural type, eg a function or tuple, containing a weak nominal? I think you need to do a findIf() to walk the type recursively instead
There was a problem hiding this comment.
(Functions are fixed size, so a tuple or optional is a better example)
There was a problem hiding this comment.
Done. Thanks.
| @@ -0,0 +1,20 @@ | |||
| // RUN: %empty-directory(%t) | |||
There was a problem hiding this comment.
We already have test/IRGen/weak_import_native.swift, can you add your test case there instead?
| @@ -9,25 +9,19 @@ var BackwardDeployStructTest = TestSuite("BackwardDeployStruct") | |||
|
|
|||
| BackwardDeployStructTest.test("ResilientStruct") { | |||
| if getVersion() == 1 { | |||
| // FIXME: IRGen inserts the metadata load outside the version check | |||
There was a problem hiding this comment.
There was a second spot where I had this workaround in this directory, can you grep for it (sorry on my phone right now)
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
rdar://46438608