1 files changed, 5 insertions, 0 deletions

diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 8e0864b8dd83..a63c8325ffa7 100644
--- a/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -345,6 +345,11 @@ static const CXXMethodDecl *GetKeyFunction(const RecordDecl *D) {
     if (MD->isPure())
       continue;
 
+    // FIXME: This doesn't work.  If we have an out of line body, that body will
+    // set the MD to have a body, what we want to know is, was the body present
+    // inside the declaration of the class.  For now, we just avoid the problem
+    // by pretending there is no key function.
+    return 0;
     if (MD->getBody())
       continue;