From 76fd58d0fe69667304569cb1c4cffe041c3cb9c5 Mon Sep 17 00:00:00 2001
From: Carey Williams <carey.williams@arm.com>
Date: Fri, 29 Nov 2019 17:01:05 +0000
Subject: Revert "[ARM] Allocatable Global Register Variables for ARM"

This reverts commit 2d739f98d8a53e38bf9faa88cdb6b0c2a363fb77.
---
 clang/lib/Basic/Targets/ARM.cpp | 32 --------------------------------
 clang/lib/Basic/Targets/ARM.h   |  3 ---
 2 files changed, 35 deletions(-)

(limited to 'clang/lib/Basic')

diff --git a/clang/lib/Basic/Targets/ARM.cpp b/clang/lib/Basic/Targets/ARM.cpp
index 92e5e26eba3..437a77afdc9 100644
--- a/clang/lib/Basic/Targets/ARM.cpp
+++ b/clang/lib/Basic/Targets/ARM.cpp
@@ -879,38 +879,6 @@ ArrayRef<TargetInfo::GCCRegAlias> ARMTargetInfo::getGCCRegAliases() const {
   return llvm::makeArrayRef(GCCRegAliases);
 }
 
-bool ARMTargetInfo::validateGlobalRegisterVariable(
-    StringRef RegName, unsigned RegSize, bool &HasSizeMismatch) const {
-  bool isValid = llvm::StringSwitch<bool>(RegName)
-                     .Case("r6", true)
-                     .Case("r7", true)
-                     .Case("r8", true)
-                     .Case("r9", true)
-                     .Case("r10", true)
-                     .Case("r11", true)
-                     .Case("sp", true)
-                     .Default(false);
-  HasSizeMismatch = false;
-  return isValid;
-}
-
-bool ARMTargetInfo::isRegisterReservedGlobally(StringRef RegName) const {
-  // The "sp" register does not have a -ffixed-sp option,
-  // so reserve it unconditionally.
-  if (RegName.equals("sp"))
-    return true;
-
-  // reserve rN (N:6-11) registers only if the corresponding
-  // +reserve-rN feature is found
-  const std::vector<std::string> &Features = getTargetOpts().Features;
-  const std::string SearchFeature = "+reserve-" + RegName.str();
-  for (const std::string &Feature : Features) {
-    if (Feature.compare(SearchFeature) == 0)
-      return true;
-  }
-  return false;
-}
-
 bool ARMTargetInfo::validateAsmConstraint(
     const char *&Name, TargetInfo::ConstraintInfo &Info) const {
   switch (*Name) {
diff --git a/clang/lib/Basic/Targets/ARM.h b/clang/lib/Basic/Targets/ARM.h
index 90fb20f8f7a..ce87a626593 100644
--- a/clang/lib/Basic/Targets/ARM.h
+++ b/clang/lib/Basic/Targets/ARM.h
@@ -161,9 +161,6 @@ public:
 
   ArrayRef<const char *> getGCCRegNames() const override;
   ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override;
-  bool validateGlobalRegisterVariable(StringRef RegName, unsigned RegSize,
-                                      bool &HasSizeMismatch) const override;
-  bool isRegisterReservedGlobally(StringRef RegName) const override;
   bool validateAsmConstraint(const char *&Name,
                              TargetInfo::ConstraintInfo &Info) const override;
   std::string convertConstraint(const char *&Constraint) const override;
-- 
cgit v1.2.3