From 5a18d2f1fc25509646440ab21963781c7e9b494c Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Tue, 16 Jan 2018 03:01:50 +0000 Subject: [PATCH] [Sema] Fix a crash on invalid features in multiversioning We were trying to emit a diag::err_bad_multiversion_option diagnostic, which expects an int as its first argument, with a string argument. As it happens, the string `Feature` that was causing this was shadowing an int `Feature` from the surrounding scope. :) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@322530 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDecl.cpp | 6 +++--- test/SemaCXX/attr-target-mv.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 23fcfb4ec7..1a7d9a8430 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -9175,9 +9175,9 @@ static bool CheckMultiVersionValue(Sema &S, const FunctionDecl *FD) { return true; } - for (const auto &Feature : ParseInfo.Features) { - auto BareFeat = StringRef{Feature}.substr(1); - if (Feature[0] == '-') { + for (const auto &Feat : ParseInfo.Features) { + auto BareFeat = StringRef{Feat}.substr(1); + if (Feat[0] == '-') { S.Diag(FD->getLocation(), diag::err_bad_multiversion_option) << Feature << ("no-" + BareFeat).str(); return true; diff --git a/test/SemaCXX/attr-target-mv.cpp b/test/SemaCXX/attr-target-mv.cpp index 18ec1bf7ca..cc2d4f16c3 100644 --- a/test/SemaCXX/attr-target-mv.cpp +++ b/test/SemaCXX/attr-target-mv.cpp @@ -1,4 +1,11 @@ // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -verify -fexceptions -fcxx-exceptions %s -std=c++14 +void __attribute__((target("default"))) invalid_features(void); +//expected-error@+2 {{function multiversioning doesn't support feature 'hello_world'}} +//expected-warning@+1 {{ignoring unsupported 'hello_world' in the target attribute string}} +void __attribute__((target("hello_world"))) invalid_features(void); +//expected-error@+1 {{function multiversioning doesn't support feature 'no-sse4.2'}} +void __attribute__((target("no-sse4.2"))) invalid_features(void); + void __attribute__((target("sse4.2"))) no_default(void); void __attribute__((target("arch=sandybridge"))) no_default(void); -- 2.40.0