Remove BLOCK_BYREF_LAYOUT_BYREF flags from list of
flags for __block variable meta-data.

llvm-svn: 166811
diff --git a/clang/lib/CodeGen/CGBlocks.h b/clang/lib/CodeGen/CGBlocks.h
index 73fa817..690fa8b 100644
--- a/clang/lib/CodeGen/CGBlocks.h
+++ b/clang/lib/CodeGen/CGBlocks.h
@@ -54,9 +54,8 @@
   BLOCK_BYREF_LAYOUT_EXTENDED          = (1   << 28),
   BLOCK_BYREF_LAYOUT_NON_OBJECT        = (2   << 28),
   BLOCK_BYREF_LAYOUT_STRONG            = (3   << 28),
-  BLOCK_BYREF_LAYOUT_BYREF             = (4   << 28),
-  BLOCK_BYREF_LAYOUT_WEAK              = (5   << 28),
-  BLOCK_BYREF_LAYOUT_UNRETAINED        = (6   << 28)
+  BLOCK_BYREF_LAYOUT_WEAK              = (4   << 28),
+  BLOCK_BYREF_LAYOUT_UNRETAINED        = (5   << 28)
 };
 
 enum BlockLiteralFlags {