Skip to content

Commit 6f66bb6

Browse files
committed
---
yaml --- r: 347480 b: refs/heads/master c: 2448c6a h: refs/heads/master
1 parent 9540b73 commit 6f66bb6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 497904d3c0b25a6a9d4b90b2efa74d3c20886239
2+
refs/heads/master: 2448c6a97e8c25b434b3a273404ae4e4c6f7d7a7
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/ClangImporter/ImportType.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ namespace {
515515
type->getElementType(), ImportTypeKind::Abstract,
516516
false /* No NSUIntegerAsInt */, Bridgeability::None,
517517
OptionalTypeKind::OTK_None);
518+
if (!element) { return Type(); }
518519
unsigned count = type->getNumElements();
519520
// Import vector-of-one as the element type.
520521
if (count == 1) { return element; }

0 commit comments

Comments
 (0)