---

yaml
---
r: 348637
b: refs/heads/master
c: 2fdd5fc
h: refs/heads/master
i:
  348635: 62eb9af

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e439c0fdbea0431da9bfc2543a4282147669b5da
+refs/heads/master: 2fdd5fc857cf4dc8ad5ec4e9c9e624c9bf3f4e95
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/ClangImporter/ImportType.cpp

@@ -401,13 +401,9 @@ namespace {
 
       // With pointer conversions enabled, map to the normal pointer types
       // without special hints.
-      Type pointeeType;
-      if (pointeeQualType->isVoidType())
-        pointeeType = Impl.getNamedSwiftType(Impl.getStdlibModule(), "Void");
-      else
-        pointeeType = Impl.importTypeIgnoreIUO(
-            pointeeQualType, ImportTypeKind::Value, AllowNSUIntegerAsInt,
-            Bridgeability::None);
+      Type pointeeType = Impl.importTypeIgnoreIUO(
+          pointeeQualType, ImportTypeKind::Value, AllowNSUIntegerAsInt,
+          Bridgeability::None);
 
       // If the pointed-to type is unrepresentable in Swift, or its C
       // alignment is greater than the maximum Swift alignment, import as