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 @@ -243,6 +243,10 @@ 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_gcc_asm_goto : Warning< + "speculative load hardening does not support use of GCC asm goto. asm goto " + "detected with SLH">; } // Sema && Serialization diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp --- a/clang/lib/CodeGen/CGStmt.cpp +++ b/clang/lib/CodeGen/CGStmt.cpp @@ -2300,6 +2300,10 @@ /* IsAlignStack */ false, AsmDialect); std::vector RegResults; if (IsGCCAsmGoto) { + const auto LO = getLangOpts(); + if (LO.SpeculativeLoadHardening) + CGM.getDiags().Report(S.getAsmLoc(), + diag::warn_slh_does_not_support_gcc_asm_goto); llvm::CallBrInst *Result = Builder.CreateCallBr(IA, Fallthrough, Transfer, Args); EmitBlock(Fallthrough); diff --git a/clang/test/Sema/asm-goto-slh.cpp b/clang/test/Sema/asm-goto-slh.cpp new file mode 100644 --- /dev/null +++ b/clang/test/Sema/asm-goto-slh.cpp @@ -0,0 +1,5 @@ +// RUN: %clang_cc1 %s -mspeculative-load-hardening -triple x86_64-pc-linux-gnu -emit-llvm -S + +void f() { + __asm goto("movl %ecx, %edx"); // expected-warning {{speculative load hardening does not support use of GCC asm goto. asm goto detected with SLH}} +}