Merged master:c8f0d27ef37 into amd-gfx:80e004f6b88

Local branch amd-gfx 80e004f [AMDGPU] Add transformation of kills to demotes in simple scenarios
Remote branch master c8f0d27 [AMDGPU] Fix the gfx10 scheduling model for f32 conversions

Change-Id: I4bbb05b2bc548cef088ecb2e3ae145763aa9bbb7

Author: piotrAMD

clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp

@@ -105,12 +105,9 @@ void StringFindStartswithCheck::check(const MatchFinder::MatchResult &Result) {
 
   // Create a preprocessor #include FixIt hint (CreateIncludeInsertion checks
   // whether this already exists).
-  auto IncludeHint = IncludeInserter->CreateIncludeInsertion(
+  Diagnostic << IncludeInserter->CreateIncludeInsertion(
       Source.getFileID(ComparisonExpr->getBeginLoc()), AbseilStringsMatchHeader,
       false);
-  if (IncludeHint) {
-    Diagnostic << *IncludeHint;
-  }
 }
 
 void StringFindStartswithCheck::registerPPCallbacks(

clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp

@@ -45,7 +45,6 @@
 #include "StringIntegerAssignmentCheck.h"
 #include "StringLiteralWithEmbeddedNulCheck.h"
 #include "SuspiciousEnumUsageCheck.h"
-#include "SuspiciousIncludeCheck.h"
 #include "SuspiciousMemsetUsageCheck.h"
 #include "SuspiciousMissingCommaCheck.h"
 #include "SuspiciousSemicolonCheck.h"
@@ -141,8 +140,6 @@ class BugproneModule : public ClangTidyModule {
         "bugprone-string-literal-with-embedded-nul");
     CheckFactories.registerCheck<SuspiciousEnumUsageCheck>(
         "bugprone-suspicious-enum-usage");
-    CheckFactories.registerCheck<SuspiciousIncludeCheck>(
-        "bugprone-suspicious-include");
     CheckFactories.registerCheck<SuspiciousMemsetUsageCheck>(
         "bugprone-suspicious-memset-usage");
     CheckFactories.registerCheck<SuspiciousMissingCommaCheck>(

clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt

@@ -37,7 +37,6 @@ add_clang_library(clangTidyBugproneModule
   StringIntegerAssignmentCheck.cpp
   StringLiteralWithEmbeddedNulCheck.cpp
   SuspiciousEnumUsageCheck.cpp
-  SuspiciousIncludeCheck.cpp
   SuspiciousMemsetUsageCheck.cpp
   SuspiciousMissingCommaCheck.cpp
   SuspiciousSemicolonCheck.cpp

clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.cpp

@@ -96,10 +96,8 @@ void InitVariablesCheck::check(const MatchFinder::MatchResult &Result) {
                    MatchedDecl->getName().size()),
                InitializationString);
     if (AddMathInclude) {
-      auto IncludeHint = IncludeInserter->CreateIncludeInsertion(
+      Diagnostic << IncludeInserter->CreateIncludeInsertion(
           Source.getFileID(MatchedDecl->getBeginLoc()), MathHeader, false);
-      if (IncludeHint)
-        Diagnostic << *IncludeHint;
     }
   }
 }

clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.h

@@ -86,13 +86,10 @@ void ProBoundsConstantArrayIndexCheck::check(
                   SourceRange(BaseRange.getEnd().getLocWithOffset(1),
                               IndexRange.getBegin().getLocWithOffset(-1)),
                   ", ")
-           << FixItHint::CreateReplacement(Matched->getEndLoc(), ")");
-
-      Optional<FixItHint> Insertion = Inserter->CreateIncludeInsertion(
-          Result.SourceManager->getMainFileID(), GslHeader,
-          /*IsAngled=*/false);
-      if (Insertion)
-        Diag << Insertion.getValue();
+           << FixItHint::CreateReplacement(Matched->getEndLoc(), ")")
+           << Inserter->CreateIncludeInsertion(
+                  Result.SourceManager->getMainFileID(), GslHeader,
+                  /*IsAngled=*/false);
     }
     return;
   }

clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp

@@ -429,11 +429,9 @@ void MakeSmartPtrCheck::insertHeader(DiagnosticBuilder &Diag, FileID FD) {
   if (MakeSmartPtrFunctionHeader.empty()) {
     return;
   }
-  if (auto IncludeFixit = Inserter->CreateIncludeInsertion(
-          FD, MakeSmartPtrFunctionHeader,
-          /*IsAngled=*/MakeSmartPtrFunctionHeader == StdMemoryHeader)) {
-    Diag << *IncludeFixit;
-  }
+  Diag << Inserter->CreateIncludeInsertion(
+      FD, MakeSmartPtrFunctionHeader,
+      /*IsAngled=*/MakeSmartPtrFunctionHeader == StdMemoryHeader);
 }
 
 } // namespace modernize

clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp

@@ -53,20 +53,13 @@ bool parseFileExtensions(StringRef AllFileExtensions,
   return true;
 }
 
-llvm::Optional<StringRef>
-getFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions) {
+bool isFileExtension(StringRef FileName,
+                     const FileExtensionsSet &FileExtensions) {
   StringRef Extension = llvm::sys::path::extension(FileName);
   if (Extension.empty())
-    return llvm::None;
+    return false;
   // Skip "." prefix.
-  if (!FileExtensions.count(Extension.substr(1)))
-    return llvm::None;
-  return Extension;
-}
-
-bool isFileExtension(StringRef FileName,
-                     const FileExtensionsSet &FileExtensions) {
-  return getFileExtension(FileName, FileExtensions).hasValue();
+  return FileExtensions.count(Extension.substr(1)) > 0;
 }
 
 } // namespace utils

clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp

@@ -11,7 +11,6 @@
 
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/StringRef.h"
 
@@ -37,12 +36,6 @@ bool isSpellingLocInHeaderFile(SourceLocation Loc, SourceManager &SM,
 /// extensions.
 inline StringRef defaultHeaderFileExtensions() { return ";h;hh;hpp;hxx"; }
 
-/// Returns recommended default value for the list of implementaiton file
-/// extensions.
-inline StringRef defaultImplementationFileExtensions() {
-  return "c;cc;cpp;cxx";
-}
-
 /// Returns recommended default value for the list of file extension
 /// delimiters.
 inline StringRef defaultFileExtensionDelimiters() { return ",;"; }
@@ -52,11 +45,6 @@ bool parseFileExtensions(StringRef AllFileExtensions,
                          FileExtensionsSet &FileExtensions,
                          StringRef Delimiters);
 
-/// Decides whether a file has a header file extension.
-/// Returns the file extension, if included in the provided set.
-llvm::Optional<StringRef>
-getFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions);
-
 /// Decides whether a file has one of the specified file extensions.
 bool isFileExtension(StringRef FileName,
                      const FileExtensionsSet &FileExtensions);

clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.cpp

@@ -22,13 +22,13 @@ std::vector<std::string> parseStringList(StringRef Option) {
   for (StringRef &Name : Names) {
     Name = Name.trim();
     if (!Name.empty())
-      Result.push_back(std::string(Name));
+      Result.emplace_back(Name);
   }
   return Result;
 }
 
 std::string serializeStringList(ArrayRef<std::string> Strings) {
-  return llvm::join(Strings.begin(), Strings.end(), StringsDelimiter);
+  return llvm::join(Strings, StringsDelimiter);
 }
 
 } // namespace options