From 789ad56248bf35b0e6f1f94a0a9f449bfdc7ed3e Mon Sep 17 00:00:00 2001
From: Quentin Colombet <qcolombet@apple.com>
Date: Thu, 7 Apr 2016 20:47:51 +0000
Subject: [PATCH] [AArch64][CallLowering] Do not build the API if GlobalISel is
 not built. This gets rid of some ifdefs and dummy implementations that were
 here just to fill the blanks.

llvm-svn: 265719
---
 llvm/lib/Target/AArch64/AArch64CallLowering.cpp | 17 ++++-------------
 llvm/lib/Target/AArch64/CMakeLists.txt          |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/llvm/lib/Target/AArch64/AArch64CallLowering.cpp b/llvm/lib/Target/AArch64/AArch64CallLowering.cpp
index 21e5b6e..0714ff7 100644
--- a/llvm/lib/Target/AArch64/AArch64CallLowering.cpp
+++ b/llvm/lib/Target/AArch64/AArch64CallLowering.cpp
@@ -21,22 +21,14 @@
 
 using namespace llvm;
 
+#ifndef LLVM_BUILD_GLOBAL_ISEL
+#error This shouldn't be built without GISel
+#endif
+
 AArch64CallLowering::AArch64CallLowering(const AArch64TargetLowering &TLI)
   : CallLowering(&TLI) {
 }
 
-#ifndef LLVM_BUILD_GLOBAL_ISEL
-bool AArch64CallLowering::LowerReturn(MachineIRBuilder &MIRBuilder,
-                                      const Value *Val, unsigned VReg) const {
-  return false;
-}
-
-bool AArch64CallLowering::LowerFormalArguments(
-    MachineIRBuilder &MIRBuilder, const Function::ArgumentListType &Args,
-    const SmallVectorImpl<unsigned> &VRegs) const {
-  return false;
-}
-#else
 bool AArch64CallLowering::LowerReturn(MachineIRBuilder &MIRBuilder,
                                         const Value *Val, unsigned VReg) const {
   MachineInstr *Return = MIRBuilder.buildInstr(AArch64::RET_ReallyLR);
@@ -110,4 +102,3 @@ bool AArch64CallLowering::LowerFormalArguments(
   }
   return true;
 }
-#endif
diff --git a/llvm/lib/Target/AArch64/CMakeLists.txt b/llvm/lib/Target/AArch64/CMakeLists.txt
index 0f2c55c..4bbb7ae 100644
--- a/llvm/lib/Target/AArch64/CMakeLists.txt
+++ b/llvm/lib/Target/AArch64/CMakeLists.txt
@@ -16,6 +16,7 @@ add_public_tablegen_target(AArch64CommonTableGen)
 
 # List of all GlobalISel files.
 set(GLOBAL_ISEL_FILES
+      AArch64CallLowering.cpp
       AArch64RegisterBankInfo.cpp
       )
 
@@ -34,7 +35,6 @@ add_llvm_target(AArch64CodeGen
   AArch64AdvSIMDScalarPass.cpp
   AArch64AsmPrinter.cpp
   AArch64BranchRelaxation.cpp
-  AArch64CallLowering.cpp
   AArch64CleanupLocalDynamicTLSPass.cpp
   AArch64CollectLOH.cpp
   AArch64ConditionalCompares.cpp
-- 
2.7.4