From 7eb5464bc551dc7c3c1b3fe2ee618f6efd588b6f Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@hanshq.net>
Date: Thu, 10 Sep 2015 17:07:54 +0000
Subject: Re-commit r247218: "Fix Clang-tidy misc-use-override warnings, other
 minor fixes"

This never broke the build; it was the LLVM side, r247216, that caused problems.

llvm-svn: 247302
---
 clang/lib/Basic/Targets.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'clang/lib/Basic/Targets.cpp')

diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index b9a74ac8fb0..16593b9b224 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -30,6 +30,7 @@
 #include "llvm/Support/TargetParser.h"
 #include <algorithm>
 #include <memory>
+
 using namespace clang;
 
 //===----------------------------------------------------------------------===//
@@ -739,7 +740,7 @@ namespace {
 template <typename Target>
 class WebAssemblyOSTargetInfo : public OSTargetInfo<Target> {
   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
-                    MacroBuilder &Builder) const override final {
+                    MacroBuilder &Builder) const final {
     // A common platform macro.
     if (Opts.POSIXThreads)
       Builder.defineMacro("_REENTRANT");
@@ -749,7 +750,7 @@ class WebAssemblyOSTargetInfo : public OSTargetInfo<Target> {
   }
 
   // As an optimization, group static init code together in a section.
-  const char *getStaticInitSectionSpecifier() const override final {
+  const char *getStaticInitSectionSpecifier() const final {
     return ".text.__startup";
   }
 
@@ -7011,13 +7012,13 @@ private:
       Features["simd128"] = true;
     return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);
   }
-  bool hasFeature(StringRef Feature) const override final {
+  bool hasFeature(StringRef Feature) const final {
     return llvm::StringSwitch<bool>(Feature)
         .Case("simd128", SIMDLevel >= SIMD128)
         .Default(false);
   }
   bool handleTargetFeatures(std::vector<std::string> &Features,
-                            DiagnosticsEngine &Diags) override final {
+                            DiagnosticsEngine &Diags) final {
     for (const auto &Feature : Features) {
       if (Feature == "+simd128") {
         SIMDLevel = std::max(SIMDLevel, SIMD128);
@@ -7034,7 +7035,7 @@ private:
     }
     return true;
   }
-  bool setCPU(const std::string &Name) override final {
+  bool setCPU(const std::string &Name) final {
     return llvm::StringSwitch<bool>(Name)
               .Case("mvp",           true)
               .Case("bleeding-edge", true)
@@ -7042,32 +7043,32 @@ private:
               .Default(false);
   }
   void getTargetBuiltins(const Builtin::Info *&Records,
-                         unsigned &NumRecords) const override final {
+                         unsigned &NumRecords) const final {
     Records = BuiltinInfo;
     NumRecords = clang::WebAssembly::LastTSBuiltin - Builtin::FirstTSBuiltin;
   }
-  BuiltinVaListKind getBuiltinVaListKind() const override final {
+  BuiltinVaListKind getBuiltinVaListKind() const final {
     // TODO: Implement va_list properly.
     return VoidPtrBuiltinVaList;
   }
   void getGCCRegNames(const char *const *&Names,
-                      unsigned &NumNames) const override final {
+                      unsigned &NumNames) const final {
     Names = nullptr;
     NumNames = 0;
   }
   void getGCCRegAliases(const GCCRegAlias *&Aliases,
-                        unsigned &NumAliases) const override final {
+                        unsigned &NumAliases) const final {
     Aliases = nullptr;
     NumAliases = 0;
   }
   bool
   validateAsmConstraint(const char *&Name,
-                        TargetInfo::ConstraintInfo &Info) const override final {
+                        TargetInfo::ConstraintInfo &Info) const final {
     return false;
   }
-  const char *getClobbers() const override final { return ""; }
-  bool isCLZForZeroUndef() const override final { return false; }
-  bool hasInt128Type() const override final { return true; }
+  const char *getClobbers() const final { return ""; }
+  bool isCLZForZeroUndef() const final { return false; }
+  bool hasInt128Type() const final { return true; }
 };
 
 const Builtin::Info WebAssemblyTargetInfo::BuiltinInfo[] = {
-- 
cgit v1.2.3