diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td --- a/clang/include/clang/Basic/DiagnosticCommonKinds.td +++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td @@ -246,6 +246,11 @@ def warn_stack_clash_protection_inline_asm : Warning< "Unable to protect inline asm that clobbers stack pointer against stack clash">, InGroup>; + + def warn_slh_does_not_support_asm_goto + : Warning<"Speculative load hardening does not protect functions with " + "asm goto">, + InGroup>; } // Sema && Serialization diff --git a/clang/lib/Parse/ParseStmtAsm.cpp b/clang/lib/Parse/ParseStmtAsm.cpp --- a/clang/lib/Parse/ParseStmtAsm.cpp +++ b/clang/lib/Parse/ParseStmtAsm.cpp @@ -729,6 +729,9 @@ if (parseGNUAsmQualifierListOpt(GAQ)) return StmtError(); + if (GAQ.isGoto() && getLangOpts().SpeculativeLoadHardening) + Diag(Loc, diag::warn_slh_does_not_support_asm_goto); + BalancedDelimiterTracker T(*this, tok::l_paren); T.consumeOpen(); diff --git a/clang/test/Parser/slh-asm-goto-no-warn.cpp b/clang/test/Parser/slh-asm-goto-no-warn.cpp new file mode 100644 --- /dev/null +++ b/clang/test/Parser/slh-asm-goto-no-warn.cpp @@ -0,0 +1,5 @@ +// RUN: %clang_cc1 -Wno-slh-asm-goto -mspeculative-load-hardening -fsyntax-only -verify %s + +void f() { + __asm goto("movl %ecx, %edx"); // expected-no-diagnostics +} diff --git a/clang/test/Parser/slh-asm-goto.cpp b/clang/test/Parser/slh-asm-goto.cpp new file mode 100644 --- /dev/null +++ b/clang/test/Parser/slh-asm-goto.cpp @@ -0,0 +1,5 @@ +// RUN: %clang_cc1 -mspeculative-load-hardening -fsyntax-only -verify %s + +void f() { + __asm goto("movl %ecx, %edx"); // expected-warning {{Speculative load hardening does not protect functions with asm goto}} +}