From 20ac821dee568d0293fc7efee414aa1b961b5142 Mon Sep 17 00:00:00 2001 From: Charles Davis Date: Mon, 8 Aug 2016 21:19:08 +0000 Subject: [PATCH] Revert "[Attr] Add support for the `ms_hook_prologue` attribute." This reverts commit r278050. It depends on r278048, which will be reverted. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@278052 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/Attr.td | 7 ------- include/clang/Basic/AttrDocs.td | 16 -------------- lib/CodeGen/TargetInfo.cpp | 8 ------- lib/Sema/SemaDeclAttr.cpp | 19 ++++++++++------- test/CodeGen/function-attributes.c | 7 ------- test/Sema/attr-ms-hook-prologue-wrong-arch.c | 6 ------ test/Sema/attr-ms-hook-prologue.c | 22 -------------------- 7 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 test/Sema/attr-ms-hook-prologue-wrong-arch.c delete mode 100644 test/Sema/attr-ms-hook-prologue.c diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td index 49a3273b77..7da1efe5ff 100644 --- a/include/clang/Basic/Attr.td +++ b/include/clang/Basic/Attr.td @@ -257,7 +257,6 @@ def TargetMips : TargetArch<["mips", "mipsel"]>; def TargetMSP430 : TargetArch<["msp430"]>; def TargetX86 : TargetArch<["x86"]>; def TargetAnyX86 : TargetArch<["x86", "x86_64"]>; -def TargetWindowsArches : TargetArch<["x86", "x86_64", "arm", "thumb"]>; def TargetWindows : TargetArch<["x86", "x86_64", "arm", "thumb"]> { let OSes = ["Win32"]; } @@ -2070,12 +2069,6 @@ def TypeTagForDatatype : InheritableAttr { // Microsoft-related attributes -def MSHookPrologue : InheritableAttr, TargetSpecificAttr { - let Spellings = [GCC<"ms_hook_prologue">]; - let Subjects = SubjectList<[Function]>; - let Documentation = [MSHookPrologueDocs]; -} - def MSNoVTable : InheritableAttr, TargetSpecificAttr { let Spellings = [Declspec<"novtable">]; let Subjects = SubjectList<[CXXRecord]>; diff --git a/include/clang/Basic/AttrDocs.td b/include/clang/Basic/AttrDocs.td index 4a78f53754..9b1ddca05a 100644 --- a/include/clang/Basic/AttrDocs.td +++ b/include/clang/Basic/AttrDocs.td @@ -548,22 +548,6 @@ Query for this feature with ``__has_attribute(objc_method_family)``. }]; } -def MSHookPrologueDocs : Documentation { - let Category = DocCatFunction; - let Content = [{ -The ``ms_hook_prologue`` attribute marks a function as "hotpatchable" according -to conventions used on Windows. Specifically, enough space will be ensured -in the prologue for a short jump, and an architecturally dependently sized -patch space will be reserved prior to the entry point. See the documentation -for the `/HOTPATCH`_ switch on MSDN. - -This attribute cannot be used in conjunction with the ``naked``, -``always_inline``, or ``__forceinline`` attributes. - -.. _`/HOTPATCH`: https://msdn.microsoft.com/en-us/library/ms173507.aspx - }]; -} - def NoDebugDocs : Documentation { let Category = DocCatVariable; let Content = [{ diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 1e8ac63993..fa1b58ddd5 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -1779,10 +1779,6 @@ void X86_32TargetCodeGenInfo::setTargetAttributes(const Decl *D, llvm::Function *Fn = cast(GV); Fn->setCallingConv(llvm::CallingConv::X86_INTR); } - if (FD->hasAttr()) { - llvm::Function *Fn = cast(GV); - Fn->addFnAttr("patchable-function", "ms-hotpatch"); - } } } @@ -2113,10 +2109,6 @@ public: llvm::Function *Fn = cast(GV); Fn->setCallingConv(llvm::CallingConv::X86_INTR); } - if (FD->hasAttr()) { - llvm::Function *Fn = cast(GV); - Fn->addFnAttr("patchable-function", "ms-hotpatch"); - } } } }; diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 5dbe7aa52e..d74cebc718 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -1664,6 +1664,15 @@ static void handleCommonAttr(Sema &S, Decl *D, const AttributeList &Attr) { D->addAttr(CA); } +static void handleNakedAttr(Sema &S, Decl *D, const AttributeList &Attr) { + if (checkAttrMutualExclusion(S, D, Attr.getRange(), + Attr.getName())) + return; + + D->addAttr(::new (S.Context) NakedAttr(Attr.getRange(), S.Context, + Attr.getAttributeSpellingListIndex())); +} + static void handleNoReturnAttr(Sema &S, Decl *D, const AttributeList &attr) { if (hasDeclarator(D)) return; @@ -3664,9 +3673,7 @@ OptimizeNoneAttr *Sema::mergeOptimizeNoneAttr(Decl *D, SourceRange Range, static void handleAlwaysInlineAttr(Sema &S, Decl *D, const AttributeList &Attr) { if (checkAttrMutualExclusion(S, D, Attr.getRange(), - Attr.getName()) || - checkAttrMutualExclusion(S, D, Attr.getRange(), - Attr.getName())) + Attr.getName())) return; if (AlwaysInlineAttr *Inline = S.mergeAlwaysInlineAttr( @@ -5545,8 +5552,7 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, handleHotAttr(S, D, Attr); break; case AttributeList::AT_Naked: - handleSimpleAttributeWithExclusions(S, D, Attr); + handleNakedAttr(S, D, Attr); break; case AttributeList::AT_NoReturn: handleNoReturnAttr(S, D, Attr); @@ -5774,9 +5780,6 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, break; case AttributeList::AT_LayoutVersion: handleLayoutVersion(S, D, Attr); - case AttributeList::AT_MSHookPrologue: - handleSimpleAttributeWithExclusions(S, D, Attr); break; case AttributeList::AT_MSNoVTable: handleSimpleAttribute(S, D, Attr); diff --git a/test/CodeGen/function-attributes.c b/test/CodeGen/function-attributes.c index d0374c1866..8f682a715d 100644 --- a/test/CodeGen/function-attributes.c +++ b/test/CodeGen/function-attributes.c @@ -108,18 +108,11 @@ void f20(void) { _setjmp(0); } -// CHECK-LABEL: define void @f21 -// CHECK: [[HOTPATCH:#[0-9]+]] -// CHECK: { -void __attribute__((ms_hook_prologue)) f21(void) { -} - // CHECK: attributes [[NUW]] = { nounwind optsize{{.*}} } // CHECK: attributes [[AI]] = { alwaysinline nounwind optsize{{.*}} } // CHECK: attributes [[NUW_OS_RN]] = { nounwind optsize readnone{{.*}} } // CHECK: attributes [[ALIGN]] = { nounwind optsize alignstack=16{{.*}} } // CHECK: attributes [[RT]] = { nounwind optsize returns_twice{{.*}} } -// CHECK: attributes [[HOTPATCH]] = { nounwind optsize{{.*}}"patchable-function"="ms-hotpatch"{{.*}} } // CHECK: attributes [[NR]] = { noreturn optsize } // CHECK: attributes [[NUW_RN]] = { nounwind optsize readnone } // CHECK: attributes [[RT_CALL]] = { optsize returns_twice } diff --git a/test/Sema/attr-ms-hook-prologue-wrong-arch.c b/test/Sema/attr-ms-hook-prologue-wrong-arch.c deleted file mode 100644 index cd4b591cbb..0000000000 --- a/test/Sema/attr-ms-hook-prologue-wrong-arch.c +++ /dev/null @@ -1,6 +0,0 @@ -// RUN: %clang_cc1 -triple s390x-unknown-linux -fms-extensions -fsyntax-only -verify %s - -// expected-warning@+1{{unknown attribute 'ms_hook_prologue' ignored}} -int __attribute__((ms_hook_prologue)) foo(int a, int b) { - return a+b; -} diff --git a/test/Sema/attr-ms-hook-prologue.c b/test/Sema/attr-ms-hook-prologue.c deleted file mode 100644 index 5417f4aa59..0000000000 --- a/test/Sema/attr-ms-hook-prologue.c +++ /dev/null @@ -1,22 +0,0 @@ -// RUN: %clang_cc1 -triple i386-pc-linux -fms-extensions -fsyntax-only -verify %s - -int __attribute__((ms_hook_prologue)) foo(int a, int b) { - return a+b; -} - -// expected-note@+2{{conflicting attribute is here}} -// expected-error@+1{{'naked' and 'ms_hook_prologue' attributes are not compatible}} -__declspec(naked) int __attribute__((ms_hook_prologue)) bar(int a, int b) { -} - -// expected-note@+2{{conflicting attribute is here}} -// expected-error@+1{{'__forceinline' and 'ms_hook_prologue' attributes are not compatible}} -__forceinline int __attribute__((ms_hook_prologue)) baz(int a, int b) { - return a-b; -} - -// expected-warning@+1{{'ms_hook_prologue' attribute only applies to functions}} -int x __attribute__((ms_hook_prologue)); - -// expected-error@+1{{'ms_hook_prologue' attribute takes no arguments}} -int f(int a, int b) __attribute__((ms_hook_prologue(2))); -- 2.40.0