commit 72a57c3259df5d32d1e794ea7398bbbc52e7e309
author Misha Brukman <brukman+llvm@gmail.com> Sat Nov 20 02:20:27 2004 +0000
committer Misha Brukman <brukman+llvm@gmail.com> Sat Nov 20 02:20:27 2004 +0000
tree 8a7e878e483a7163e200abc9276b5fcac39f946e
parent 91a88ae6d1f7985c56cc184a6e7e4077f6112f8c

Allow constructor parameter to override aggregating args; fix spacing

llvm-svn: 18028

llvm/lib/Transforms/Utils/CodeExtractor.cpp

diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
index b8b0980..3878ea2 100644
--- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
+++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
@@ -49,7 +49,7 @@
     const Type *RetTy;
   public:
     CodeExtractor(DominatorSet *ds = 0, bool AggArgs = false)
-      : DS(ds), AggregateArgs(AggregateArgsOpt), NumExitBlocks(~0U) {}
+      : DS(ds), AggregateArgs(AggArgs||AggregateArgsOpt), NumExitBlocks(~0U) {}
 
     Function *ExtractCodeRegion(const std::vector<BasicBlock*> &code);
 
@@ -403,7 +403,7 @@
 
   // Emit the call to the function
   CallInst *call = new CallInst(newFunction, params,
-                                NumExitBlocks > 1 ? "targetBlock": "");
+                                NumExitBlocks > 1 ? "targetBlock" : "");
   codeReplacer->getInstList().push_back(call);
 
   Function::aiterator OutputArgBegin = newFunction->abegin();