Skip to content

Commit 7fd385b

Browse files
committed
---
yaml --- r: 294783 b: refs/heads/tensorflow c: 8075b09 h: refs/heads/master i: 294781: 367f22e 294779: 66c1d83 294775: ef12728 294767: 1209005 294751: 24b3328 294719: 4decc18 294655: 3ce9fa3
1 parent 9ab13f3 commit 7fd385b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
816816
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
817817
refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
818818
"refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
819-
refs/heads/tensorflow: 57254cb6e34f04fd897541edb60129a20714bb08
819+
refs/heads/tensorflow: 8075b09b9bcf36b52379cd32baa4dfa7ec646ee1
820820
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
821821
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
822822
refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/lib/ClangImporter/ImportDecl.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,7 @@ makeUnionFieldAccessors(ClangImporter::Implementation &Impl,
10011001
{ inoutSelf },
10021002
{ Identifier() });
10031003
selfPointer->setType(C.TheRawPointerType);
1004+
selfPointer->setThrows(false);
10041005

10051006
auto initializeFn = cast<FuncDecl>(getBuiltinValueDecl(
10061007
C, C.getIdentifier("initialize")));
@@ -1018,6 +1019,7 @@ makeUnionFieldAccessors(ClangImporter::Implementation &Impl,
10181019
{ newValueRef, selfPointer },
10191020
{ Identifier(), Identifier() });
10201021
initialize->setType(TupleType::getEmpty(C));
1022+
initialize->setThrows(false);
10211023

10221024
auto body = BraceStmt::create(C, SourceLoc(), { initialize }, SourceLoc(),
10231025
/*implicit*/ true);
@@ -5562,6 +5564,7 @@ Decl *SwiftDeclConverter::importEnumCaseAlias(
55625564
auto instantiate = new (Impl.SwiftContext)
55635565
DotSyntaxCallExpr(constantRef, SourceLoc(), typeRef);
55645566
instantiate->setType(importedEnumTy);
5567+
instantiate->setThrows(false);
55655568

55665569
Decl *CD = Impl.createConstant(name, importIntoDC, importedEnumTy,
55675570
instantiate, ConstantConvertKind::None,

0 commit comments

Comments
 (0)