[llvm] r209342 - Fix compilation issues.

[Eric Christopher]

Author: echristo
Date: Wed May 21 18:51:57 2014
New Revision: 209342

URL: http://llvm.org/viewvc/llvm-project?rev=209342&view=rev
Log:
Fix compilation issues.

Modified:
    llvm/trunk/lib/CodeGen/EarlyIfConversion.cpp
    llvm/trunk/lib/Target/ARM64/ARM64Subtarget.cpp
    llvm/trunk/lib/Target/X86/X86Subtarget.cpp

Modified: llvm/trunk/lib/CodeGen/EarlyIfConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/EarlyIfConversion.cpp?rev=209342&r1=209341&r2=209342&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/EarlyIfConversion.cpp (original)
+++ llvm/trunk/lib/CodeGen/EarlyIfConversion.cpp Wed May 21 18:51:57 2014
@@ -777,7 +777,9 @@ bool EarlyIfConverter::runOnMachineFunct
   DEBUG(dbgs() << "********** EARLY IF-CONVERSION **********\n"
                << "********** Function: " << MF.getName() << '\n');
   // Only run if conversion if the target wants it.
-  if (!MF.getTarget().getSubtarget().enableEarlyIfConversion())
+  if (!MF.getTarget()
+           .getSubtarget<TargetSubtargetInfo>()
+           .enableEarlyIfConversion())
     return true;
 
   TII = MF.getTarget().getInstrInfo();

Modified: llvm/trunk/lib/Target/ARM64/ARM64Subtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM64/ARM64Subtarget.cpp?rev=209342&r1=209341&r2=209342&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM64/ARM64Subtarget.cpp (original)
+++ llvm/trunk/lib/Target/ARM64/ARM64Subtarget.cpp Wed May 21 18:51:57 2014
@@ -110,6 +110,6 @@ void ARM64Subtarget::overrideSchedPolicy
   Policy.OnlyBottomUp = false;
 }
 
-bool ARM64Subtarget::enableEarlyIfConversion() const override {
+bool ARM64Subtarget::enableEarlyIfConversion() const {
   return EnableEarlyIfConvert;
 }

Modified: llvm/trunk/lib/Target/X86/X86Subtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.cpp?rev=209342&r1=209341&r2=209342&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86Subtarget.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86Subtarget.cpp Wed May 21 18:51:57 2014
@@ -16,6 +16,7 @@
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Host.h"
@@ -319,6 +320,6 @@ X86Subtarget::enablePostRAScheduler(Code
 }
 
 bool
-X86Subtarget::enableEarlyIfConversion() const override {
-  return hasCMOV() && X86EarlyIfConv;
+X86Subtarget::enableEarlyIfConversion() const {
+  return hasCMov() && X86EarlyIfConv;
 }