Index: lib/AST/ASTContext.cpp
===================================================================
--- lib/AST/ASTContext.cpp	(revision 54121)
+++ lib/AST/ASTContext.cpp	(working copy)
@@ -369,8 +369,8 @@
     if (!FD->getIdentifier())
       FieldAlign = 1;
   } else {
-    if (FD->getType()->isIncompleteType()) {
-      // This must be a flexible array member; we can't directly
+    if (FD->getType()->isIncompleteArrayType()) {
+      // This is a flexible array member; we can't directly
       // query getTypeInfo about these, so we figure it out here.
       // Flexible array members don't have any size, but they
       // have to be aligned appropriately for their element type.
