From 50cdabcfd52e88381ade61450d98a1c757195bef Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Mon, 19 Nov 2007 20:46:23 +0000
Subject: [PATCH] Remove meaningless qualifiers from return types, avoiding
 compiler warnings.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44240 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Analysis/Dominators.h      | 2 +-
 include/llvm/BasicBlock.h               | 2 +-
 include/llvm/Target/TargetMachine.h     | 4 ++--
 lib/Target/PowerPC/PPCTargetMachine.cpp | 2 +-
 lib/Target/PowerPC/PPCTargetMachine.h   | 2 +-
 lib/VMCore/BasicBlock.cpp               | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index 53d7e3d01f6..9b0ef723efd 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -345,7 +345,7 @@ public:
 
   /// isReachableFromEntry - Return true if A is dominated by the entry
   /// block of the function containing it.
-  const bool isReachableFromEntry(NodeT* A) {
+  bool isReachableFromEntry(NodeT* A) {
     assert (!this->isPostDominator() 
             && "This is not implemented for post dominators");
     return dominates(&A->getParent()->front(), A);
diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h
index f2722b0382e..cd38b4280c8 100644
--- a/include/llvm/BasicBlock.h
+++ b/include/llvm/BasicBlock.h
@@ -93,7 +93,7 @@ public:
   /// null pointer back.
   ///
   TerminatorInst *getTerminator();
-  const TerminatorInst *const getTerminator() const;
+  const TerminatorInst *getTerminator() const;
   
   /// Returns a pointer to the first instructon in this block that is not a 
   /// PHINode instruction. When adding instruction to the beginning of the
diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index 056dfc9fa15..5311d05eefc 100644
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -187,7 +187,7 @@ public:
 
   /// getEnableTailMergeDefault - the default setting for -enable-tail-merge
   /// on this target.  User flag overrides.
-  virtual const bool getEnableTailMergeDefault() const { return true; }
+  virtual bool getEnableTailMergeDefault() const { return true; }
 
   /// addPassesToEmitFile - Add passes to the specified pass manager to get the
   /// specified file emitted.  Typically this will involve several steps of code
@@ -325,7 +325,7 @@ public:
 
   /// getEnableTailMergeDefault - the default setting for -enable-tail-merge
   /// on this target.  User flag overrides.
-  virtual const bool getEnableTailMergeDefault() const { return true; }
+  virtual bool getEnableTailMergeDefault() const { return true; }
 };
 
 } // End llvm namespace
diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
index 86da3d78259..a09681ab15b 100644
--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -101,7 +101,7 @@ PPCTargetMachine::PPCTargetMachine(const Module &M, const std::string &FS,
 
 /// Override this for PowerPC.  Tail merging happily breaks up instruction issue
 /// groups, which typically degrades performance.
-const bool PPCTargetMachine::getEnableTailMergeDefault() const { return false; }
+bool PPCTargetMachine::getEnableTailMergeDefault() const { return false; }
 
 PPC32TargetMachine::PPC32TargetMachine(const Module &M, const std::string &FS) 
   : PPCTargetMachine(M, FS, false) {
diff --git a/lib/Target/PowerPC/PPCTargetMachine.h b/lib/Target/PowerPC/PPCTargetMachine.h
index a00f8583749..b3477cc36ef 100644
--- a/lib/Target/PowerPC/PPCTargetMachine.h
+++ b/lib/Target/PowerPC/PPCTargetMachine.h
@@ -73,7 +73,7 @@ public:
                               bool DumpAsm, MachineCodeEmitter &MCE);
   virtual bool addSimpleCodeEmitter(FunctionPassManager &PM, bool Fast,
                                     bool DumpAsm, MachineCodeEmitter &MCE);
-  virtual const bool getEnableTailMergeDefault() const;
+  virtual bool getEnableTailMergeDefault() const;
 };
 
 /// PPC32TargetMachine - PowerPC 32-bit target machine.
diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp
index 92734bb2138..d45a1c41aa7 100644
--- a/lib/VMCore/BasicBlock.cpp
+++ b/lib/VMCore/BasicBlock.cpp
@@ -134,7 +134,7 @@ TerminatorInst *BasicBlock::getTerminator() {
   return dyn_cast<TerminatorInst>(&InstList.back());
 }
 
-const TerminatorInst *const BasicBlock::getTerminator() const {
+const TerminatorInst *BasicBlock::getTerminator() const {
   if (InstList.empty()) return 0;
   return dyn_cast<TerminatorInst>(&InstList.back());
 }
-- 
2.34.1