From 66713ea929e69399ac536d9dd860a2a180b5fe62 Mon Sep 17 00:00:00 2001
From: Nadav Rotem <nadavrot@users.noreply.github.com>
Date: Mon, 7 Dec 2015 12:54:02 -0800
Subject: [PATCH] Revert "Fixes [SR-78] swift compiler seg fault"

---
 lib/IRGen/GenType.cpp            |  3 +--
 test/IRGen/generic_structs.swift | 26 --------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 test/IRGen/generic_structs.swift

diff --git a/lib/IRGen/GenType.cpp b/lib/IRGen/GenType.cpp
index fb6e2344cfaeb..3067a18fcf9f0 100644
--- a/lib/IRGen/GenType.cpp
+++ b/lib/IRGen/GenType.cpp
@@ -2031,9 +2031,8 @@ SILType irgen::getSingletonAggregateFieldType(IRGenModule &IGM,
 
     // If there's only one stored property, we have the layout of its field.
     auto allFields = structDecl->getStoredProperties();
-    
     auto field = allFields.begin();
-    if (!allFields.empty() && std::next(field) == allFields.end())
+    if (std::next(field) == allFields.end())
       return t.getFieldType(*field, *IGM.SILMod);
 
     return SILType();
diff --git a/test/IRGen/generic_structs.swift b/test/IRGen/generic_structs.swift
deleted file mode 100644
index faaec4b3f4255..0000000000000
--- a/test/IRGen/generic_structs.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %target-swift-frontend -primary-file %s -emit-ir | FileCheck %s
-
-struct A<T1, T2>
-{
-  var b: T1
-  var c: T2
-  var d: B<T1, T2>
-}
-struct B<T1, T2>
-{
-  var c: T1
-  var d: T2
-}
-
-struct C<T1>
-{}
-struct D<T2>
-{}
-
-struct Foo<A1, A2>
-{
-  var b: Bar<A1, A2>
-}
-
-struct Bar {
-}