Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PrintAsObjC] Fix printing of 'Error' values as 'NSError *'.
Fixes SE-2159 / rdar://problem/27439384.
- Loading branch information
1 parent
9a32575
commit a00fa74
Showing
3 changed files
with
75 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// This file is meant to be used with the mock SDK, not the real one. | ||
#import <Foundation.h> | ||
|
||
@protocol ABCErrorProtocol <NSObject> | ||
|
||
- (void)didFail:(NSError * _Nonnull)error; | ||
- (void)didFailOptional:(NSError * _Nullable)error; | ||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Please keep this file in alphabetical order! | ||
|
||
// REQUIRES: objc_interop | ||
|
||
// RUN: rm -rf %t && mkdir %t | ||
|
||
// FIXME: BEGIN -enable-source-import hackaround | ||
// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift | ||
// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift | ||
// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/Foundation.swift | ||
// FIXME: END -enable-source-import hackaround | ||
|
||
// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/error-delegate.h -emit-module -o %t %s | ||
// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -import-objc-header %S/Inputs/error-delegate.h -parse-as-library %t/error-delegate.swiftmodule -parse -emit-objc-header-path %t/error-delegate.h | ||
|
||
// RUN: FileCheck %s < %t/error-delegate.h | ||
// RUN: %check-in-clang %t/error-delegate.h | ||
|
||
import Foundation | ||
|
||
@objc protocol MySwiftProtocol { } | ||
|
||
// CHECK-LABEL: @interface Test : NSObject <ABCErrorProtocol> | ||
// CHECK-NEXT: - (void)didFail:(NSError * _Nonnull)error; | ||
// CHECK-NEXT: - (void)didFailOptional:(NSError * _Nullable)error; | ||
// CHECK-NEXT-FIXME: - (void)composition:(NSError<MySwiftProtocol> * _Nonnull)error; | ||
// CHECK-NEXT-FIXME: - (void)compositionOptional:(NSError<MySwiftProtocol> * _Nullable)error; | ||
// CHECK-NEXT: - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; | ||
// CHECK-NEXT: @end | ||
class Test : NSObject, ABCErrorProtocol { | ||
func didFail(_ error: Swift.Error) {} | ||
func didFailOptional(_ error: Swift.Error?) {} | ||
|
||
// FIXME: SILGenc crashes on this. | ||
// func composition(_ error: MySwiftProtocol & Error) { } | ||
// func compositionOptional(_ error: (MySwiftProtocol & Error)?) { } | ||
} |