Skip to content

Commit feca9e8

Browse files
author
Sasha Krassovsky
committed
---
yaml --- r: 327668 b: refs/heads/tensorflow c: 037f168 h: refs/heads/master
1 parent 5663249 commit feca9e8

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
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: c5bfa450eebbf863e30eba17db7d305b7092fe05
819+
refs/heads/tensorflow: 037f16812614a44a2933c3ec53412f246205ad07
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/Parse/ParseIfConfig.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ static StringRef getPlatformConditionName(PlatformConditionKind Kind) {
5151
case PlatformConditionKind::LABEL: return IDENTIFIER;
5252
#include "swift/AST/PlatformConditionKinds.def"
5353
}
54+
llvm_unreachable("Unhandled PlatformConditionKind in switch");
5455
}
5556

5657
/// Extract source text of the expression.

branches/tensorflow/lib/Parse/ParseRequests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ BraceStmt *ParseAbstractFunctionBodyRequest::evaluate(
8686
return body;
8787
}
8888
}
89-
89+
llvm_unreachable("Unhandled BodyKind in switch");
9090
}
9191

9292

branches/tensorflow/lib/Parse/Scope.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ void ScopeInfo::addToScope(ValueDecl *D, Parser &TheParser,
145145
std::make_pair(CurScope->getDepth(), D));
146146
}
147147

148+
149+
// Disable the "for use only in debugger" warning.
150+
#if SWIFT_COMPILER_IS_MSVC
151+
#pragma warning(push)
152+
#pragma warning(disable : 4996)
153+
#endif
154+
148155
void ScopeInfo::dump() const {
149156
#ifndef NDEBUG
150157
// Dump out the current list of scopes.
@@ -167,3 +174,7 @@ void ScopeInfo::dump() const {
167174
llvm::dbgs() << "\n";
168175
#endif
169176
}
177+
178+
#if SWIFT_COMPILER_IS_MSVC
179+
#pragma warning(pop)
180+
#endif

0 commit comments

Comments
 (0)