Combine several if stmts with returns into an if-then-elseif-else chain.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14414 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 12 insertions, 36 deletions

diff --git a/lib/Target/PowerPC/PPC32AsmPrinter.cpp b/lib/Target/PowerPC/PPC32AsmPrinter.cpp
index a200ce714e..d778550b57 100644
--- a/lib/Target/PowerPC/PPC32AsmPrinter.cpp
+++ b/lib/Target/PowerPC/PPC32AsmPrinter.cpp
@@ -490,7 +490,7 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
   const TargetInstrInfo &TII = *TM.getInstrInfo();
   const TargetInstrDescriptor &Desc = TII.get(Opcode);
   unsigned int i;
-  
+
   unsigned int ArgCount = Desc.TSFlags & PPC32II::ArgCountMask;
   unsigned int ArgType[] = {
     (Desc.TSFlags >> PPC32II::Arg0TypeShift) & PPC32II::ArgTypeMask,
@@ -508,7 +508,7 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
 
   if (Opcode == PPC32::MovePCtoLR) {
     O << "mflr r0\n";
-    O << "bcl 20,31,L" << CurrentFnName << "$pb\n";
+    O << "\tbcl 20,31,L" << CurrentFnName << "$pb\n";
     O << "L" << CurrentFnName << "$pb:\n";
     return;
   }
@@ -524,20 +524,14 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
     O << ", lo16(";
     printOp(MI->getOperand(2));
     O << "-L" << CurrentFnName << "$pb)\n";
-    return;
-  }
-
-  if (Opcode == PPC32::LOADHiAddr) {
+  } else if (Opcode == PPC32::LOADHiAddr) {
     printOp(MI->getOperand(0));
     O << ", ";
     printOp(MI->getOperand(1));
     O << ", ha16(" ;
     printOp(MI->getOperand(2));
      O << "-L" << CurrentFnName << "$pb)\n";
-    return;
-  }
-  
-  if (ArgCount == 3 && ArgType[1] == PPC32II::Disimm16) {
+  } else if (ArgCount == 3 && ArgType[1] == PPC32II::Disimm16) {
     printOp(MI->getOperand(0));
     O << ", ";
     printOp(MI->getOperand(1));
@@ -562,8 +556,6 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
         O << ", ";
     }
   }
-  
-  return;  
 }
 
 bool Printer::doInitialization(Module &M) {
diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp
index a200ce714e..d778550b57 100644
--- a/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -490,7 +490,7 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
   const TargetInstrInfo &TII = *TM.getInstrInfo();
   const TargetInstrDescriptor &Desc = TII.get(Opcode);
   unsigned int i;
-  
+
   unsigned int ArgCount = Desc.TSFlags & PPC32II::ArgCountMask;
   unsigned int ArgType[] = {
     (Desc.TSFlags >> PPC32II::Arg0TypeShift) & PPC32II::ArgTypeMask,
@@ -508,7 +508,7 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
 
   if (Opcode == PPC32::MovePCtoLR) {
     O << "mflr r0\n";
-    O << "bcl 20,31,L" << CurrentFnName << "$pb\n";
+    O << "\tbcl 20,31,L" << CurrentFnName << "$pb\n";
     O << "L" << CurrentFnName << "$pb:\n";
     return;
   }
@@ -524,20 +524,14 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
     O << ", lo16(";
     printOp(MI->getOperand(2));
     O << "-L" << CurrentFnName << "$pb)\n";
-    return;
-  }
-
-  if (Opcode == PPC32::LOADHiAddr) {
+  } else if (Opcode == PPC32::LOADHiAddr) {
     printOp(MI->getOperand(0));
     O << ", ";
     printOp(MI->getOperand(1));
     O << ", ha16(" ;
     printOp(MI->getOperand(2));
      O << "-L" << CurrentFnName << "$pb)\n";
-    return;
-  }
-  
-  if (ArgCount == 3 && ArgType[1] == PPC32II::Disimm16) {
+  } else if (ArgCount == 3 && ArgType[1] == PPC32II::Disimm16) {
     printOp(MI->getOperand(0));
     O << ", ";
     printOp(MI->getOperand(1));
@@ -562,8 +556,6 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
         O << ", ";
     }
   }
-  
-  return;  
 }
 
 bool Printer::doInitialization(Module &M) {
diff --git a/lib/Target/PowerPC/PowerPCAsmPrinter.cpp b/lib/Target/PowerPC/PowerPCAsmPrinter.cpp
index a200ce714e..d778550b57 100644
--- a/lib/Target/PowerPC/PowerPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/PowerPCAsmPrinter.cpp
@@ -490,7 +490,7 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
   const TargetInstrInfo &TII = *TM.getInstrInfo();
   const TargetInstrDescriptor &Desc = TII.get(Opcode);
   unsigned int i;
-  
+
   unsigned int ArgCount = Desc.TSFlags & PPC32II::ArgCountMask;
   unsigned int ArgType[] = {
     (Desc.TSFlags >> PPC32II::Arg0TypeShift) & PPC32II::ArgTypeMask,
@@ -508,7 +508,7 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
 
   if (Opcode == PPC32::MovePCtoLR) {
     O << "mflr r0\n";
-    O << "bcl 20,31,L" << CurrentFnName << "$pb\n";
+    O << "\tbcl 20,31,L" << CurrentFnName << "$pb\n";
     O << "L" << CurrentFnName << "$pb:\n";
     return;
   }
@@ -524,20 +524,14 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
     O << ", lo16(";
     printOp(MI->getOperand(2));
     O << "-L" << CurrentFnName << "$pb)\n";
-    return;
-  }
-
-  if (Opcode == PPC32::LOADHiAddr) {
+  } else if (Opcode == PPC32::LOADHiAddr) {
     printOp(MI->getOperand(0));
     O << ", ";
     printOp(MI->getOperand(1));
     O << ", ha16(" ;
     printOp(MI->getOperand(2));
      O << "-L" << CurrentFnName << "$pb)\n";
-    return;
-  }
-  
-  if (ArgCount == 3 && ArgType[1] == PPC32II::Disimm16) {
+  } else if (ArgCount == 3 && ArgType[1] == PPC32II::Disimm16) {
     printOp(MI->getOperand(0));
     O << ", ";
     printOp(MI->getOperand(1));
@@ -562,8 +556,6 @@ void Printer::printMachineInstruction(const MachineInstr *MI) {
         O << ", ";
     }
   }
-  
-  return;  
 }
 
 bool Printer::doInitialization(Module &M) {