Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions lib/Sema/TypeCheckType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4039,13 +4039,12 @@ TypeResolver::resolveOpaqueReturnType(TypeRepr *repr, StringRef mangledName,
builder.getNodeFactory().createNode(Node::Kind::OpaqueReturnTypeOf);
opaqueNode->addChild(definingDeclNode, builder.getNodeFactory());
auto *opaqueDecl = builder.resolveOpaqueTypeDecl(opaqueNode);

auto *ownerDecl = opaqueDecl->getNamingDecl();
if (!ownerDecl) {
if (!opaqueDecl) {
diagnose(repr->getLoc(), diag::no_opaque_return_type_of);
return ErrorType::get(getASTContext());
}

auto *ownerDecl = opaqueDecl->getNamingDecl();
auto genericSig = ownerDecl->getInnermostDeclContext()
->getGenericSignatureOfContext();

Expand Down
22 changes: 0 additions & 22 deletions test/ModuleInterface/invalid-opaque-result-types.swift

This file was deleted.

29 changes: 29 additions & 0 deletions test/ModuleInterface/invalid-opaque-result-types.swiftinterface
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Test that we emit a diagnostic (and don't crash) when we cannot resolve
// an opaque result type reference.
//
// RUN: %target-typecheck-verify-swift -module-name OpaqueTypes
//

public struct G<T> {
public func f() -> some Any
}

// Type doesn't demangle
public typealias Bad1 = @_opaqueReturnTypeOf("nonsense", 0) __
// expected-error@-1 {{unable to resolve type for _opaqueReturnTypeOf attribute}}

// Type demangles but doesn't name an opaque return type
public typealias Bad2 = @_opaqueReturnTypeOf("$sSi", 0) __
// expected-error@-1 {{unable to resolve type for _opaqueReturnTypeOf attribute}}

// Bad index
public typealias Bad3 = @_opaqueReturnTypeOf("$s11OpaqueTypes1GV1fQryF", 5) __<Int>
// expected-error@-1 {{unable to resolve type for _opaqueReturnTypeOf attribute}}

// Bad generic argument
public typealias Bad4 = @_opaqueReturnTypeOf("$s11OpaqueTypes1GV1fQryF", 0) __<InvalidType>
// expected-error@-1 {{cannot find type 'InvalidType' in scope}}

// Missing generic argument
public typealias Bad5 = @_opaqueReturnTypeOf("$s11OpaqueTypes1GV1fQryF", 0) __
// expected-error@-1 {{unable to resolve type for _opaqueReturnTypeOf attribute}}