Skip to content

SIL: Fix TypeExpansionContext() constructor to get the right DeclContext from a SILFunction #33428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2020
Merged

SIL: Fix TypeExpansionContext() constructor to get the right DeclContext from a SILFunction #33428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions lib/SIL/IR/SILFunctionType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4477,19 +4477,9 @@ StringRef SILFunctionType::ABICompatibilityCheckResult::getMessage() const {
llvm_unreachable("Covered switch isn't completely covered?!");
}

static DeclContext *getDeclContextForExpansion(const SILFunction &f) {
auto *dc = f.getDeclContext();
if (!dc)
dc = f.getModule().getSwiftModule();
auto *currentModule = f.getModule().getSwiftModule();
if (!dc || !dc->isChildContextOf(currentModule))
dc = currentModule;
return dc;
}

TypeExpansionContext::TypeExpansionContext(const SILFunction &f)
: expansion(f.getResilienceExpansion()),
inContext(getDeclContextForExpansion(f)),
inContext(f.getModule().getAssociatedContext()),
isContextWholeModule(f.getModule().isWholeModule()) {}

CanSILFunctionType SILFunction::getLoweredFunctionTypeInContext(
Expand Down
34 changes: 34 additions & 0 deletions test/SILGen/opaque_result_type_private.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// RUN: %target-swift-emit-silgen -primary-file %s -disable-availability-checking | %FileCheck %s
// RUN: %target-swift-emit-sil -primary-file %s -O -disable-availability-checking

// CHECK-LABEL: sil [ossa] @main : $@convention(c) (Int32, UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int8>>>) -> Int32 {

// CHECK: [[BOX:%.*]] = alloc_stack $PrivateClass
// CHECK: [[FN:%.*]] = function_ref @$s26opaque_result_type_private19returnPrivateOpaqueQryF : $@convention(thin) () -> @out PrivateClass
// CHECK: apply [[FN]]([[BOX]]) : $@convention(thin) () -> @out PrivateClass
// CHECK: [[RESULT:%.*]] = load [take] [[BOX]] : $*PrivateClass
// CHECK: destroy_value [[RESULT]] : $PrivateClass
// CHECK: dealloc_stack [[BOX]] : $*PrivateClass
_ = returnPrivateOpaque()

// CHECK: [[BOX:%.*]] = alloc_stack $LocalClass
// CHECK: [[FN:%.*]] = function_ref @$s26opaque_result_type_private17returnLocalOpaqueQryF : $@convention(thin) () -> @out LocalClass
// CHECK: apply [[FN]]([[BOX]]) : $@convention(thin) () -> @out LocalClass
// CHECK: [[RESULT:%.*]] = load [take] [[BOX]] : $*LocalClass
// CHECK: destroy_value [[RESULT]] : $LocalClass
// CHECK: dealloc_stack [[BOX]] : $*LocalClass
_ = returnLocalOpaque()

fileprivate class PrivateClass {}

// CHECK-LABEL: sil hidden [ossa] @$s26opaque_result_type_private19returnPrivateOpaqueQryF : $@convention(thin) () -> @out @_opaqueReturnTypeOf("$s26opaque_result_type_private19returnPrivateOpaqueQryF", 0) 🦸
func returnPrivateOpaque() -> some Any {
return PrivateClass()
}

// CHECK-LABEL: sil hidden [ossa] @$s26opaque_result_type_private17returnLocalOpaqueQryF : $@convention(thin) () -> @out @_opaqueReturnTypeOf("$s26opaque_result_type_private17returnLocalOpaqueQryF", 0) 🦸
func returnLocalOpaque() -> some Any {
class LocalClass {}

return LocalClass()
}