From: Joel E. Denny <jdenny.ornl@gmail.com>
Date: Wed, 16 May 2018 15:18:27 +0000 (+0000)
Subject: Revert r332474: [Attr] Don't print fake MSInheritance argument
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d870f06205c5805012062898804c03905778312;p=clang

Revert r332474: [Attr] Don't print fake MSInheritance argument

I botched the commit log attributes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@332480 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index d72544f655..afd1e01975 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -184,8 +184,7 @@ class VersionArgument<string name, bit opt = 0> : Argument<name, opt>;
 class AlignedArgument<string name, bit opt = 0> : Argument<name, opt>;
 
 // A bool argument with a default value
-class DefaultBoolArgument<string name, bit default, bit fake = 0>
-    : BoolArgument<name, 1, fake> {
+class DefaultBoolArgument<string name, bit default> : BoolArgument<name, 1> {
   bit Default = default;
 }
 
@@ -2625,7 +2624,7 @@ def UPtr : TypeAttr {
 
 def MSInheritance : InheritableAttr {
   let LangOpts = [MicrosoftExt];
-  let Args = [DefaultBoolArgument<"BestCase", /*default*/1, /*fake*/1>];
+  let Args = [DefaultBoolArgument<"BestCase", 1>];
   let Spellings = [Keyword<"__single_inheritance">,
                    Keyword<"__multiple_inheritance">,
                    Keyword<"__virtual_inheritance">,
diff --git a/test/SemaCXX/attr-print.cpp b/test/SemaCXX/attr-print.cpp
index 960050bc71..f40d803e94 100644
--- a/test/SemaCXX/attr-print.cpp
+++ b/test/SemaCXX/attr-print.cpp
@@ -34,12 +34,3 @@ class __attribute__((consumable(unknown))) AttrTester1 {
   // CHECK: void callableWhen() __attribute__((callable_when("unconsumed", "consumed")));
   void callableWhen()  __attribute__((callable_when("unconsumed", "consumed")));
 };
-
-// CHECK: class __single_inheritance SingleInheritance;
-class __single_inheritance SingleInheritance;
-
-// CHECK: class __multiple_inheritance MultipleInheritance;
-class __multiple_inheritance MultipleInheritance;
-
-// CHECK: class __virtual_inheritance VirtualInheritance;
-class __virtual_inheritance VirtualInheritance;