From c9d63888fe4bf61cab2ca02db39caf47711f401d Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sat, 31 Jan 2015 21:57:38 +0000
Subject: Merge llvm 3.6.0rc2 from ^/vendor/llvm/dist, merge clang 3.6.0rc2
 from ^/vendor/clang/dist, resolve conflicts, and cleanup patches.

---
 contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp')

diff --git a/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp b/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp
index 43b37c5..d7ce6f1 100644
--- a/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp
@@ -4396,9 +4396,6 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case AttributeList::AT_OptimizeNone:
     handleOptimizeNoneAttr(S, D, Attr);
     break;
-  case AttributeList::AT_FlagEnum:
-    handleSimpleAttribute<FlagEnumAttr>(S, D, Attr);
-    break;
   case AttributeList::AT_Flatten:
     handleSimpleAttribute<FlattenAttr>(S, D, Attr);
     break;
-- 
cgit v1.1