Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 1 | //===- CodeExtractor.cpp - Pull code region into a new function -----------===// |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 2 | // |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 3 | // The LLVM Compiler Infrastructure |
| 4 | // |
Chris Lattner | f3ebc3f | 2007-12-29 20:36:04 +0000 | [diff] [blame] | 5 | // This file is distributed under the University of Illinois Open Source |
| 6 | // License. See LICENSE.TXT for details. |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 7 | // |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 8 | //===----------------------------------------------------------------------===// |
| 9 | // |
| 10 | // This file implements the interface to tear out a code region, such as an |
| 11 | // individual loop or a parallel section, into a new function, replacing it with |
| 12 | // a call to the new function. |
| 13 | // |
| 14 | //===----------------------------------------------------------------------===// |
| 15 | |
Chris Lattner | cee3404 | 2004-03-18 03:15:29 +0000 | [diff] [blame] | 16 | #include "llvm/Transforms/Utils/FunctionUtils.h" |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 17 | #include "llvm/Constants.h" |
| 18 | #include "llvm/DerivedTypes.h" |
| 19 | #include "llvm/Instructions.h" |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 20 | #include "llvm/Intrinsics.h" |
Owen Anderson | e70b637 | 2009-07-05 22:41:43 +0000 | [diff] [blame] | 21 | #include "llvm/LLVMContext.h" |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 22 | #include "llvm/Module.h" |
| 23 | #include "llvm/Pass.h" |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 24 | #include "llvm/Analysis/Dominators.h" |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 25 | #include "llvm/Analysis/LoopInfo.h" |
Chris Lattner | 3684469 | 2004-03-14 03:17:22 +0000 | [diff] [blame] | 26 | #include "llvm/Analysis/Verifier.h" |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 27 | #include "llvm/Transforms/Utils/BasicBlockUtils.h" |
Reid Spencer | 7c16caa | 2004-09-01 22:55:40 +0000 | [diff] [blame] | 28 | #include "llvm/Support/CommandLine.h" |
Reid Spencer | 557ab15 | 2007-02-05 23:32:05 +0000 | [diff] [blame] | 29 | #include "llvm/Support/Compiler.h" |
Reid Spencer | 7c16caa | 2004-09-01 22:55:40 +0000 | [diff] [blame] | 30 | #include "llvm/Support/Debug.h" |
Torok Edwin | ccb29cd | 2009-07-11 13:10:19 +0000 | [diff] [blame] | 31 | #include "llvm/Support/ErrorHandling.h" |
Chris Lattner | b25de3f | 2009-08-23 04:37:46 +0000 | [diff] [blame^] | 32 | #include "llvm/Support/raw_ostream.h" |
Reid Spencer | 7c16caa | 2004-09-01 22:55:40 +0000 | [diff] [blame] | 33 | #include "llvm/ADT/StringExtras.h" |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 34 | #include <algorithm> |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 35 | #include <set> |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 36 | using namespace llvm; |
| 37 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 38 | // Provide a command-line option to aggregate function arguments into a struct |
Misha Brukman | 234b44a | 2008-12-13 05:21:37 +0000 | [diff] [blame] | 39 | // for functions produced by the code extractor. This is useful when converting |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 40 | // extracted functions to pthread-based code, as only one argument (void*) can |
| 41 | // be passed in to pthread_create(). |
| 42 | static cl::opt<bool> |
| 43 | AggregateArgsOpt("aggregate-extracted-args", cl::Hidden, |
| 44 | cl::desc("Aggregate arguments to code-extracted functions")); |
| 45 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 46 | namespace { |
Reid Spencer | 557ab15 | 2007-02-05 23:32:05 +0000 | [diff] [blame] | 47 | class VISIBILITY_HIDDEN CodeExtractor { |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 48 | typedef std::vector<Value*> Values; |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 49 | std::set<BasicBlock*> BlocksToExtract; |
Owen Anderson | f095bf3 | 2007-04-07 05:31:27 +0000 | [diff] [blame] | 50 | DominatorTree* DT; |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 51 | bool AggregateArgs; |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 52 | unsigned NumExitBlocks; |
| 53 | const Type *RetTy; |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 54 | public: |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 55 | CodeExtractor(DominatorTree* dt = 0, bool AggArgs = false) |
| 56 | : DT(dt), AggregateArgs(AggArgs||AggregateArgsOpt), NumExitBlocks(~0U) {} |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 57 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 58 | Function *ExtractCodeRegion(const std::vector<BasicBlock*> &code); |
| 59 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 60 | bool isEligible(const std::vector<BasicBlock*> &code); |
| 61 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 62 | private: |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 63 | /// definedInRegion - Return true if the specified value is defined in the |
| 64 | /// extracted region. |
| 65 | bool definedInRegion(Value *V) const { |
| 66 | if (Instruction *I = dyn_cast<Instruction>(V)) |
| 67 | if (BlocksToExtract.count(I->getParent())) |
| 68 | return true; |
| 69 | return false; |
| 70 | } |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 71 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 72 | /// definedInCaller - Return true if the specified value is defined in the |
| 73 | /// function being code extracted, but not in the region being extracted. |
| 74 | /// These values must be passed in as live-ins to the function. |
| 75 | bool definedInCaller(Value *V) const { |
| 76 | if (isa<Argument>(V)) return true; |
| 77 | if (Instruction *I = dyn_cast<Instruction>(V)) |
| 78 | if (!BlocksToExtract.count(I->getParent())) |
| 79 | return true; |
| 80 | return false; |
| 81 | } |
| 82 | |
| 83 | void severSplitPHINodes(BasicBlock *&Header); |
Chris Lattner | 13d2ddf | 2004-05-12 16:07:41 +0000 | [diff] [blame] | 84 | void splitReturnBlocks(); |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 85 | void findInputsOutputs(Values &inputs, Values &outputs); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 86 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 87 | Function *constructFunction(const Values &inputs, |
| 88 | const Values &outputs, |
Chris Lattner | 320d59f | 2004-03-18 05:28:49 +0000 | [diff] [blame] | 89 | BasicBlock *header, |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 90 | BasicBlock *newRootNode, BasicBlock *newHeader, |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 91 | Function *oldFunction, Module *M); |
| 92 | |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 93 | void moveCodeToFunction(Function *newFunction); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 94 | |
| 95 | void emitCallAndSwitchStatement(Function *newFunction, |
| 96 | BasicBlock *newHeader, |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 97 | Values &inputs, |
| 98 | Values &outputs); |
| 99 | |
| 100 | }; |
| 101 | } |
| 102 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 103 | /// severSplitPHINodes - If a PHI node has multiple inputs from outside of the |
| 104 | /// region, we need to split the entry block of the region so that the PHI node |
| 105 | /// is easier to deal with. |
| 106 | void CodeExtractor::severSplitPHINodes(BasicBlock *&Header) { |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 107 | bool HasPredsFromRegion = false; |
| 108 | unsigned NumPredsOutsideRegion = 0; |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 109 | |
Dan Gohman | dcb291f | 2007-03-22 16:38:57 +0000 | [diff] [blame] | 110 | if (Header != &Header->getParent()->getEntryBlock()) { |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 111 | PHINode *PN = dyn_cast<PHINode>(Header->begin()); |
| 112 | if (!PN) return; // No PHI nodes. |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 113 | |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 114 | // If the header node contains any PHI nodes, check to see if there is more |
| 115 | // than one entry from outside the region. If so, we need to sever the |
| 116 | // header block into two. |
| 117 | for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) |
| 118 | if (BlocksToExtract.count(PN->getIncomingBlock(i))) |
| 119 | HasPredsFromRegion = true; |
| 120 | else |
| 121 | ++NumPredsOutsideRegion; |
| 122 | |
| 123 | // If there is one (or fewer) predecessor from outside the region, we don't |
| 124 | // need to do anything special. |
| 125 | if (NumPredsOutsideRegion <= 1) return; |
| 126 | } |
| 127 | |
| 128 | // Otherwise, we need to split the header block into two pieces: one |
| 129 | // containing PHI nodes merging values from outside of the region, and a |
| 130 | // second that contains all of the code for the block and merges back any |
| 131 | // incoming values from inside of the region. |
Dan Gohman | f96e137 | 2008-05-23 21:05:58 +0000 | [diff] [blame] | 132 | BasicBlock::iterator AfterPHIs = Header->getFirstNonPHI(); |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 133 | BasicBlock *NewBB = Header->splitBasicBlock(AfterPHIs, |
| 134 | Header->getName()+".ce"); |
| 135 | |
| 136 | // We only want to code extract the second block now, and it becomes the new |
| 137 | // header of the region. |
| 138 | BasicBlock *OldPred = Header; |
| 139 | BlocksToExtract.erase(OldPred); |
| 140 | BlocksToExtract.insert(NewBB); |
| 141 | Header = NewBB; |
| 142 | |
| 143 | // Okay, update dominator sets. The blocks that dominate the new one are the |
| 144 | // blocks that dominate TIBB plus the new block itself. |
Devang Patel | d5258a23 | 2007-06-21 17:23:45 +0000 | [diff] [blame] | 145 | if (DT) |
| 146 | DT->splitBlock(NewBB); |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 147 | |
| 148 | // Okay, now we need to adjust the PHI nodes and any branches from within the |
| 149 | // region to go to the new header block instead of the old header block. |
| 150 | if (HasPredsFromRegion) { |
| 151 | PHINode *PN = cast<PHINode>(OldPred->begin()); |
| 152 | // Loop over all of the predecessors of OldPred that are in the region, |
| 153 | // changing them to branch to NewBB instead. |
| 154 | for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) |
| 155 | if (BlocksToExtract.count(PN->getIncomingBlock(i))) { |
| 156 | TerminatorInst *TI = PN->getIncomingBlock(i)->getTerminator(); |
| 157 | TI->replaceUsesOfWith(OldPred, NewBB); |
| 158 | } |
| 159 | |
| 160 | // Okay, everthing within the region is now branching to the right block, we |
| 161 | // just have to update the PHI nodes now, inserting PHI nodes into NewBB. |
Reid Spencer | 6614946 | 2004-09-15 17:06:42 +0000 | [diff] [blame] | 162 | for (AfterPHIs = OldPred->begin(); isa<PHINode>(AfterPHIs); ++AfterPHIs) { |
| 163 | PHINode *PN = cast<PHINode>(AfterPHIs); |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 164 | // Create a new PHI node in the new region, which has an incoming value |
| 165 | // from OldPred of PN. |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 166 | PHINode *NewPN = PHINode::Create(PN->getType(), PN->getName()+".ce", |
| 167 | NewBB->begin()); |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 168 | NewPN->addIncoming(PN, OldPred); |
| 169 | |
| 170 | // Loop over all of the incoming value in PN, moving them to NewPN if they |
| 171 | // are from the extracted region. |
| 172 | for (unsigned i = 0; i != PN->getNumIncomingValues(); ++i) { |
| 173 | if (BlocksToExtract.count(PN->getIncomingBlock(i))) { |
| 174 | NewPN->addIncoming(PN->getIncomingValue(i), PN->getIncomingBlock(i)); |
| 175 | PN->removeIncomingValue(i); |
| 176 | --i; |
| 177 | } |
| 178 | } |
| 179 | } |
| 180 | } |
Chris Lattner | 13d2ddf | 2004-05-12 16:07:41 +0000 | [diff] [blame] | 181 | } |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 182 | |
Chris Lattner | 13d2ddf | 2004-05-12 16:07:41 +0000 | [diff] [blame] | 183 | void CodeExtractor::splitReturnBlocks() { |
| 184 | for (std::set<BasicBlock*>::iterator I = BlocksToExtract.begin(), |
| 185 | E = BlocksToExtract.end(); I != E; ++I) |
| 186 | if (ReturnInst *RI = dyn_cast<ReturnInst>((*I)->getTerminator())) |
| 187 | (*I)->splitBasicBlock(RI, (*I)->getName()+".ret"); |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 188 | } |
| 189 | |
| 190 | // findInputsOutputs - Find inputs to, outputs from the code region. |
| 191 | // |
| 192 | void CodeExtractor::findInputsOutputs(Values &inputs, Values &outputs) { |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 193 | std::set<BasicBlock*> ExitBlocks; |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 194 | for (std::set<BasicBlock*>::const_iterator ci = BlocksToExtract.begin(), |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 195 | ce = BlocksToExtract.end(); ci != ce; ++ci) { |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 196 | BasicBlock *BB = *ci; |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 197 | |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 198 | for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { |
| 199 | // If a used value is defined outside the region, it's an input. If an |
| 200 | // instruction is used outside the region, it's an output. |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 201 | for (User::op_iterator O = I->op_begin(), E = I->op_end(); O != E; ++O) |
| 202 | if (definedInCaller(*O)) |
| 203 | inputs.push_back(*O); |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 204 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 205 | // Consider uses of this instruction (outputs). |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 206 | for (Value::use_iterator UI = I->use_begin(), E = I->use_end(); |
| 207 | UI != E; ++UI) |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 208 | if (!definedInRegion(*UI)) { |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 209 | outputs.push_back(I); |
| 210 | break; |
| 211 | } |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 212 | } // for: insts |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 213 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 214 | // Keep track of the exit blocks from the region. |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 215 | TerminatorInst *TI = BB->getTerminator(); |
| 216 | for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i) |
| 217 | if (!BlocksToExtract.count(TI->getSuccessor(i))) |
| 218 | ExitBlocks.insert(TI->getSuccessor(i)); |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 219 | } // for: basic blocks |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 220 | |
| 221 | NumExitBlocks = ExitBlocks.size(); |
Chris Lattner | 66219ab | 2004-05-12 16:26:18 +0000 | [diff] [blame] | 222 | |
| 223 | // Eliminate duplicates. |
| 224 | std::sort(inputs.begin(), inputs.end()); |
| 225 | inputs.erase(std::unique(inputs.begin(), inputs.end()), inputs.end()); |
| 226 | std::sort(outputs.begin(), outputs.end()); |
| 227 | outputs.erase(std::unique(outputs.begin(), outputs.end()), outputs.end()); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 228 | } |
| 229 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 230 | /// constructFunction - make a function based on inputs and outputs, as follows: |
| 231 | /// f(in0, ..., inN, out0, ..., outN) |
| 232 | /// |
| 233 | Function *CodeExtractor::constructFunction(const Values &inputs, |
| 234 | const Values &outputs, |
Chris Lattner | 320d59f | 2004-03-18 05:28:49 +0000 | [diff] [blame] | 235 | BasicBlock *header, |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 236 | BasicBlock *newRootNode, |
| 237 | BasicBlock *newHeader, |
Chris Lattner | 320d59f | 2004-03-18 05:28:49 +0000 | [diff] [blame] | 238 | Function *oldFunction, |
| 239 | Module *M) { |
Chris Lattner | b25de3f | 2009-08-23 04:37:46 +0000 | [diff] [blame^] | 240 | DEBUG(errs() << "inputs: " << inputs.size() << "\n"); |
| 241 | DEBUG(errs() << "outputs: " << outputs.size() << "\n"); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 242 | |
| 243 | // This function returns unsigned, outputs will go back by reference. |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 244 | switch (NumExitBlocks) { |
| 245 | case 0: |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 246 | case 1: RetTy = Type::getVoidTy(header->getContext()); break; |
| 247 | case 2: RetTy = Type::getInt1Ty(header->getContext()); break; |
| 248 | default: RetTy = Type::getInt16Ty(header->getContext()); break; |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 249 | } |
| 250 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 251 | std::vector<const Type*> paramTy; |
| 252 | |
| 253 | // Add the types of the input values to the function's argument list |
| 254 | for (Values::const_iterator i = inputs.begin(), |
| 255 | e = inputs.end(); i != e; ++i) { |
| 256 | const Value *value = *i; |
Chris Lattner | b25de3f | 2009-08-23 04:37:46 +0000 | [diff] [blame^] | 257 | DEBUG(errs() << "value used in func: " << *value << "\n"); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 258 | paramTy.push_back(value->getType()); |
| 259 | } |
| 260 | |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 261 | // Add the types of the output values to the function's argument list. |
| 262 | for (Values::const_iterator I = outputs.begin(), E = outputs.end(); |
| 263 | I != E; ++I) { |
Chris Lattner | b25de3f | 2009-08-23 04:37:46 +0000 | [diff] [blame^] | 264 | DEBUG(errs() << "instr used in func: " << **I << "\n"); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 265 | if (AggregateArgs) |
| 266 | paramTy.push_back((*I)->getType()); |
| 267 | else |
Owen Anderson | 4056ca9 | 2009-07-29 22:17:13 +0000 | [diff] [blame] | 268 | paramTy.push_back(PointerType::getUnqual((*I)->getType())); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 269 | } |
| 270 | |
Chris Lattner | b25de3f | 2009-08-23 04:37:46 +0000 | [diff] [blame^] | 271 | DEBUG(errs() << "Function type: " << *RetTy << " f("); |
Bill Wendling | 4ae4010 | 2006-11-26 10:17:54 +0000 | [diff] [blame] | 272 | for (std::vector<const Type*>::iterator i = paramTy.begin(), |
| 273 | e = paramTy.end(); i != e; ++i) |
Chris Lattner | b25de3f | 2009-08-23 04:37:46 +0000 | [diff] [blame^] | 274 | DEBUG(errs() << **i << ", "); |
| 275 | DEBUG(errs() << ")\n"); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 276 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 277 | if (AggregateArgs && (inputs.size() + outputs.size() > 0)) { |
Owen Anderson | e70b637 | 2009-07-05 22:41:43 +0000 | [diff] [blame] | 278 | PointerType *StructPtr = |
Owen Anderson | 03cb69f | 2009-08-05 23:16:16 +0000 | [diff] [blame] | 279 | PointerType::getUnqual(StructType::get(M->getContext(), paramTy)); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 280 | paramTy.clear(); |
| 281 | paramTy.push_back(StructPtr); |
| 282 | } |
Owen Anderson | e70b637 | 2009-07-05 22:41:43 +0000 | [diff] [blame] | 283 | const FunctionType *funcType = |
Owen Anderson | 4056ca9 | 2009-07-29 22:17:13 +0000 | [diff] [blame] | 284 | FunctionType::get(RetTy, paramTy, false); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 285 | |
| 286 | // Create the new function |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 287 | Function *newFunction = Function::Create(funcType, |
| 288 | GlobalValue::InternalLinkage, |
| 289 | oldFunction->getName() + "_" + |
| 290 | header->getName(), M); |
Chris Lattner | 4caf5eb | 2008-12-18 05:52:56 +0000 | [diff] [blame] | 291 | // If the old function is no-throw, so is the new one. |
| 292 | if (oldFunction->doesNotThrow()) |
| 293 | newFunction->setDoesNotThrow(true); |
| 294 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 295 | newFunction->getBasicBlockList().push_back(newRootNode); |
| 296 | |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 297 | // Create an iterator to name all of the arguments we inserted. |
Chris Lattner | 531f9e9 | 2005-03-15 04:54:21 +0000 | [diff] [blame] | 298 | Function::arg_iterator AI = newFunction->arg_begin(); |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 299 | |
| 300 | // Rewrite all users of the inputs in the extracted region to use the |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 301 | // arguments (or appropriate addressing into struct) instead. |
| 302 | for (unsigned i = 0, e = inputs.size(); i != e; ++i) { |
| 303 | Value *RewriteVal; |
| 304 | if (AggregateArgs) { |
David Greene | c656cbb | 2007-09-04 15:46:09 +0000 | [diff] [blame] | 305 | Value *Idx[2]; |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 306 | Idx[0] = Constant::getNullValue(Type::getInt32Ty(header->getContext())); |
| 307 | Idx[1] = ConstantInt::get(Type::getInt32Ty(header->getContext()), i); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 308 | TerminatorInst *TI = newFunction->begin()->getTerminator(); |
Daniel Dunbar | 12368685 | 2009-07-24 08:24:36 +0000 | [diff] [blame] | 309 | GetElementPtrInst *GEP = |
| 310 | GetElementPtrInst::Create(AI, Idx, Idx+2, |
| 311 | "gep_" + inputs[i]->getName(), TI); |
| 312 | RewriteVal = new LoadInst(GEP, "loadgep_" + inputs[i]->getName(), TI); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 313 | } else |
| 314 | RewriteVal = AI++; |
| 315 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 316 | std::vector<User*> Users(inputs[i]->use_begin(), inputs[i]->use_end()); |
| 317 | for (std::vector<User*>::iterator use = Users.begin(), useE = Users.end(); |
Chris Lattner | 3684469 | 2004-03-14 03:17:22 +0000 | [diff] [blame] | 318 | use != useE; ++use) |
| 319 | if (Instruction* inst = dyn_cast<Instruction>(*use)) |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 320 | if (BlocksToExtract.count(inst->getParent())) |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 321 | inst->replaceUsesOfWith(inputs[i], RewriteVal); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 322 | } |
| 323 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 324 | // Set names for input and output arguments. |
| 325 | if (!AggregateArgs) { |
Chris Lattner | 531f9e9 | 2005-03-15 04:54:21 +0000 | [diff] [blame] | 326 | AI = newFunction->arg_begin(); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 327 | for (unsigned i = 0, e = inputs.size(); i != e; ++i, ++AI) |
Owen Anderson | 7629b71 | 2008-04-14 17:38:21 +0000 | [diff] [blame] | 328 | AI->setName(inputs[i]->getName()); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 329 | for (unsigned i = 0, e = outputs.size(); i != e; ++i, ++AI) |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 330 | AI->setName(outputs[i]->getName()+".out"); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 331 | } |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 332 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 333 | // Rewrite branches to basic blocks outside of the loop to new dummy blocks |
| 334 | // within the new function. This must be done before we lose track of which |
| 335 | // blocks were originally in the code region. |
| 336 | std::vector<User*> Users(header->use_begin(), header->use_end()); |
Chris Lattner | 320d59f | 2004-03-18 05:28:49 +0000 | [diff] [blame] | 337 | for (unsigned i = 0, e = Users.size(); i != e; ++i) |
| 338 | // The BasicBlock which contains the branch is not in the region |
| 339 | // modify the branch target to a new block |
| 340 | if (TerminatorInst *TI = dyn_cast<TerminatorInst>(Users[i])) |
| 341 | if (!BlocksToExtract.count(TI->getParent()) && |
| 342 | TI->getParent()->getParent() == oldFunction) |
| 343 | TI->replaceUsesOfWith(header, newHeader); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 344 | |
| 345 | return newFunction; |
| 346 | } |
| 347 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 348 | /// emitCallAndSwitchStatement - This method sets up the caller side by adding |
| 349 | /// the call instruction, splitting any PHI nodes in the header block as |
| 350 | /// necessary. |
| 351 | void CodeExtractor:: |
| 352 | emitCallAndSwitchStatement(Function *newFunction, BasicBlock *codeReplacer, |
| 353 | Values &inputs, Values &outputs) { |
| 354 | // Emit a call to the new function, passing in: *pointer to struct (if |
| 355 | // aggregating parameters), or plan inputs and allocated memory for outputs |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 356 | std::vector<Value*> params, StructValues, ReloadOutputs; |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 357 | |
| 358 | LLVMContext &Context = newFunction->getContext(); |
Chris Lattner | d8017a3 | 2004-03-18 04:12:05 +0000 | [diff] [blame] | 359 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 360 | // Add inputs as params, or to be filled into the struct |
| 361 | for (Values::iterator i = inputs.begin(), e = inputs.end(); i != e; ++i) |
| 362 | if (AggregateArgs) |
| 363 | StructValues.push_back(*i); |
| 364 | else |
| 365 | params.push_back(*i); |
| 366 | |
| 367 | // Create allocas for the outputs |
| 368 | for (Values::iterator i = outputs.begin(), e = outputs.end(); i != e; ++i) { |
| 369 | if (AggregateArgs) { |
| 370 | StructValues.push_back(*i); |
| 371 | } else { |
| 372 | AllocaInst *alloca = |
Owen Anderson | 4fdeba9 | 2009-07-15 23:53:25 +0000 | [diff] [blame] | 373 | new AllocaInst((*i)->getType(), 0, (*i)->getName()+".loc", |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 374 | codeReplacer->getParent()->begin()->begin()); |
| 375 | ReloadOutputs.push_back(alloca); |
| 376 | params.push_back(alloca); |
| 377 | } |
| 378 | } |
| 379 | |
| 380 | AllocaInst *Struct = 0; |
| 381 | if (AggregateArgs && (inputs.size() + outputs.size() > 0)) { |
| 382 | std::vector<const Type*> ArgTypes; |
| 383 | for (Values::iterator v = StructValues.begin(), |
| 384 | ve = StructValues.end(); v != ve; ++v) |
| 385 | ArgTypes.push_back((*v)->getType()); |
| 386 | |
| 387 | // Allocate a struct at the beginning of this function |
Owen Anderson | 03cb69f | 2009-08-05 23:16:16 +0000 | [diff] [blame] | 388 | Type *StructArgTy = StructType::get(newFunction->getContext(), ArgTypes); |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 389 | Struct = |
Owen Anderson | 4fdeba9 | 2009-07-15 23:53:25 +0000 | [diff] [blame] | 390 | new AllocaInst(StructArgTy, 0, "structArg", |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 391 | codeReplacer->getParent()->begin()->begin()); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 392 | params.push_back(Struct); |
| 393 | |
| 394 | for (unsigned i = 0, e = inputs.size(); i != e; ++i) { |
David Greene | c656cbb | 2007-09-04 15:46:09 +0000 | [diff] [blame] | 395 | Value *Idx[2]; |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 396 | Idx[0] = Constant::getNullValue(Type::getInt32Ty(Context)); |
| 397 | Idx[1] = ConstantInt::get(Type::getInt32Ty(Context), i); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 398 | GetElementPtrInst *GEP = |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 399 | GetElementPtrInst::Create(Struct, Idx, Idx + 2, |
| 400 | "gep_" + StructValues[i]->getName()); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 401 | codeReplacer->getInstList().push_back(GEP); |
| 402 | StoreInst *SI = new StoreInst(StructValues[i], GEP); |
| 403 | codeReplacer->getInstList().push_back(SI); |
| 404 | } |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 405 | } |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 406 | |
| 407 | // Emit the call to the function |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 408 | CallInst *call = CallInst::Create(newFunction, params.begin(), params.end(), |
| 409 | NumExitBlocks > 1 ? "targetBlock" : ""); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 410 | codeReplacer->getInstList().push_back(call); |
| 411 | |
Chris Lattner | 531f9e9 | 2005-03-15 04:54:21 +0000 | [diff] [blame] | 412 | Function::arg_iterator OutputArgBegin = newFunction->arg_begin(); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 413 | unsigned FirstOut = inputs.size(); |
| 414 | if (!AggregateArgs) |
| 415 | std::advance(OutputArgBegin, inputs.size()); |
| 416 | |
| 417 | // Reload the outputs passed in by reference |
| 418 | for (unsigned i = 0, e = outputs.size(); i != e; ++i) { |
| 419 | Value *Output = 0; |
| 420 | if (AggregateArgs) { |
David Greene | c656cbb | 2007-09-04 15:46:09 +0000 | [diff] [blame] | 421 | Value *Idx[2]; |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 422 | Idx[0] = Constant::getNullValue(Type::getInt32Ty(Context)); |
| 423 | Idx[1] = ConstantInt::get(Type::getInt32Ty(Context), FirstOut + i); |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 424 | GetElementPtrInst *GEP |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 425 | = GetElementPtrInst::Create(Struct, Idx, Idx + 2, |
| 426 | "gep_reload_" + outputs[i]->getName()); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 427 | codeReplacer->getInstList().push_back(GEP); |
| 428 | Output = GEP; |
| 429 | } else { |
| 430 | Output = ReloadOutputs[i]; |
| 431 | } |
| 432 | LoadInst *load = new LoadInst(Output, outputs[i]->getName()+".reload"); |
Chris Lattner | 37de257 | 2004-03-18 03:49:40 +0000 | [diff] [blame] | 433 | codeReplacer->getInstList().push_back(load); |
| 434 | std::vector<User*> Users(outputs[i]->use_begin(), outputs[i]->use_end()); |
| 435 | for (unsigned u = 0, e = Users.size(); u != e; ++u) { |
| 436 | Instruction *inst = cast<Instruction>(Users[u]); |
| 437 | if (!BlocksToExtract.count(inst->getParent())) |
| 438 | inst->replaceUsesOfWith(outputs[i], load); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 439 | } |
| 440 | } |
Chris Lattner | b4d8bf3 | 2004-03-14 23:05:49 +0000 | [diff] [blame] | 441 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 442 | // Now we can emit a switch statement using the call as a value. |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 443 | SwitchInst *TheSwitch = |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 444 | SwitchInst::Create(Constant::getNullValue(Type::getInt16Ty(Context)), |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 445 | codeReplacer, 0, codeReplacer); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 446 | |
| 447 | // Since there may be multiple exits from the original region, make the new |
Chris Lattner | b4d8bf3 | 2004-03-14 23:05:49 +0000 | [diff] [blame] | 448 | // function return an unsigned, switch on that number. This loop iterates |
| 449 | // over all of the blocks in the extracted region, updating any terminator |
| 450 | // instructions in the to-be-extracted region that branch to blocks that are |
| 451 | // not in the region to be extracted. |
| 452 | std::map<BasicBlock*, BasicBlock*> ExitBlockMap; |
| 453 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 454 | unsigned switchVal = 0; |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 455 | for (std::set<BasicBlock*>::const_iterator i = BlocksToExtract.begin(), |
| 456 | e = BlocksToExtract.end(); i != e; ++i) { |
Chris Lattner | b4d8bf3 | 2004-03-14 23:05:49 +0000 | [diff] [blame] | 457 | TerminatorInst *TI = (*i)->getTerminator(); |
| 458 | for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i) |
| 459 | if (!BlocksToExtract.count(TI->getSuccessor(i))) { |
| 460 | BasicBlock *OldTarget = TI->getSuccessor(i); |
| 461 | // add a new basic block which returns the appropriate value |
| 462 | BasicBlock *&NewTarget = ExitBlockMap[OldTarget]; |
| 463 | if (!NewTarget) { |
| 464 | // If we don't already have an exit stub for this non-extracted |
| 465 | // destination, create one now! |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 466 | NewTarget = BasicBlock::Create(Context, |
| 467 | OldTarget->getName() + ".exitStub", |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 468 | newFunction); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 469 | unsigned SuccNum = switchVal++; |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 470 | |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 471 | Value *brVal = 0; |
| 472 | switch (NumExitBlocks) { |
| 473 | case 0: |
| 474 | case 1: break; // No value needed. |
| 475 | case 2: // Conditional branch, return a bool |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 476 | brVal = ConstantInt::get(Type::getInt1Ty(Context), !SuccNum); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 477 | break; |
| 478 | default: |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 479 | brVal = ConstantInt::get(Type::getInt16Ty(Context), SuccNum); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 480 | break; |
| 481 | } |
| 482 | |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 483 | ReturnInst *NTRet = ReturnInst::Create(Context, brVal, NewTarget); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 484 | |
Chris Lattner | b4d8bf3 | 2004-03-14 23:05:49 +0000 | [diff] [blame] | 485 | // Update the switch instruction. |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 486 | TheSwitch->addCase(ConstantInt::get(Type::getInt16Ty(Context), |
| 487 | SuccNum), |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 488 | OldTarget); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 489 | |
Chris Lattner | b4d8bf3 | 2004-03-14 23:05:49 +0000 | [diff] [blame] | 490 | // Restore values just before we exit |
Chris Lattner | 531f9e9 | 2005-03-15 04:54:21 +0000 | [diff] [blame] | 491 | Function::arg_iterator OAI = OutputArgBegin; |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 492 | for (unsigned out = 0, e = outputs.size(); out != e; ++out) { |
| 493 | // For an invoke, the normal destination is the only one that is |
| 494 | // dominated by the result of the invocation |
| 495 | BasicBlock *DefBlock = cast<Instruction>(outputs[out])->getParent(); |
Chris Lattner | 9b0291b | 2004-11-13 00:06:45 +0000 | [diff] [blame] | 496 | |
| 497 | bool DominatesDef = true; |
| 498 | |
Chris Lattner | 5bcca60 | 2004-11-12 23:50:44 +0000 | [diff] [blame] | 499 | if (InvokeInst *Invoke = dyn_cast<InvokeInst>(outputs[out])) { |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 500 | DefBlock = Invoke->getNormalDest(); |
Chris Lattner | 5bcca60 | 2004-11-12 23:50:44 +0000 | [diff] [blame] | 501 | |
| 502 | // Make sure we are looking at the original successor block, not |
| 503 | // at a newly inserted exit block, which won't be in the dominator |
| 504 | // info. |
| 505 | for (std::map<BasicBlock*, BasicBlock*>::iterator I = |
| 506 | ExitBlockMap.begin(), E = ExitBlockMap.end(); I != E; ++I) |
| 507 | if (DefBlock == I->second) { |
| 508 | DefBlock = I->first; |
| 509 | break; |
| 510 | } |
Chris Lattner | 9b0291b | 2004-11-13 00:06:45 +0000 | [diff] [blame] | 511 | |
| 512 | // In the extract block case, if the block we are extracting ends |
| 513 | // with an invoke instruction, make sure that we don't emit a |
| 514 | // store of the invoke value for the unwind block. |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 515 | if (!DT && DefBlock != OldTarget) |
Chris Lattner | 9b0291b | 2004-11-13 00:06:45 +0000 | [diff] [blame] | 516 | DominatesDef = false; |
Chris Lattner | 5bcca60 | 2004-11-12 23:50:44 +0000 | [diff] [blame] | 517 | } |
| 518 | |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 519 | if (DT) |
| 520 | DominatesDef = DT->dominates(DefBlock, OldTarget); |
Chris Lattner | 9b0291b | 2004-11-13 00:06:45 +0000 | [diff] [blame] | 521 | |
| 522 | if (DominatesDef) { |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 523 | if (AggregateArgs) { |
David Greene | c656cbb | 2007-09-04 15:46:09 +0000 | [diff] [blame] | 524 | Value *Idx[2]; |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 525 | Idx[0] = Constant::getNullValue(Type::getInt32Ty(Context)); |
| 526 | Idx[1] = ConstantInt::get(Type::getInt32Ty(Context), |
| 527 | FirstOut+out); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 528 | GetElementPtrInst *GEP = |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 529 | GetElementPtrInst::Create(OAI, Idx, Idx + 2, |
| 530 | "gep_" + outputs[out]->getName(), |
| 531 | NTRet); |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 532 | new StoreInst(outputs[out], GEP, NTRet); |
Chris Lattner | 9b0291b | 2004-11-13 00:06:45 +0000 | [diff] [blame] | 533 | } else { |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 534 | new StoreInst(outputs[out], OAI, NTRet); |
Chris Lattner | 9b0291b | 2004-11-13 00:06:45 +0000 | [diff] [blame] | 535 | } |
| 536 | } |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 537 | // Advance output iterator even if we don't emit a store |
| 538 | if (!AggregateArgs) ++OAI; |
| 539 | } |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 540 | } |
Chris Lattner | b4d8bf3 | 2004-03-14 23:05:49 +0000 | [diff] [blame] | 541 | |
| 542 | // rewrite the original branch instruction with this new target |
| 543 | TI->setSuccessor(i, NewTarget); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 544 | } |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 545 | } |
Chris Lattner | 5b2072e | 2004-03-14 23:43:24 +0000 | [diff] [blame] | 546 | |
Chris Lattner | 3d1ca67 | 2004-05-12 03:22:33 +0000 | [diff] [blame] | 547 | // Now that we've done the deed, simplify the switch instruction. |
Chris Lattner | 7f1c7ed | 2004-08-12 03:17:02 +0000 | [diff] [blame] | 548 | const Type *OldFnRetTy = TheSwitch->getParent()->getParent()->getReturnType(); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 549 | switch (NumExitBlocks) { |
| 550 | case 0: |
Chris Lattner | 7f1c7ed | 2004-08-12 03:17:02 +0000 | [diff] [blame] | 551 | // There are no successors (the block containing the switch itself), which |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 552 | // means that previously this was the last part of the function, and hence |
| 553 | // this should be rewritten as a `ret' |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 554 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 555 | // Check if the function should return a value |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 556 | if (OldFnRetTy == Type::getVoidTy(Context)) { |
| 557 | ReturnInst::Create(Context, 0, TheSwitch); // Return void |
Chris Lattner | 7f1c7ed | 2004-08-12 03:17:02 +0000 | [diff] [blame] | 558 | } else if (OldFnRetTy == TheSwitch->getCondition()->getType()) { |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 559 | // return what we have |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 560 | ReturnInst::Create(Context, TheSwitch->getCondition(), TheSwitch); |
Chris Lattner | 7f1c7ed | 2004-08-12 03:17:02 +0000 | [diff] [blame] | 561 | } else { |
| 562 | // Otherwise we must have code extracted an unwind or something, just |
| 563 | // return whatever we want. |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 564 | ReturnInst::Create(Context, |
| 565 | Constant::getNullValue(OldFnRetTy), TheSwitch); |
Chris Lattner | 7f1c7ed | 2004-08-12 03:17:02 +0000 | [diff] [blame] | 566 | } |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 567 | |
Dan Gohman | 158ff2c | 2008-06-21 22:08:46 +0000 | [diff] [blame] | 568 | TheSwitch->eraseFromParent(); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 569 | break; |
| 570 | case 1: |
| 571 | // Only a single destination, change the switch into an unconditional |
| 572 | // branch. |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 573 | BranchInst::Create(TheSwitch->getSuccessor(1), TheSwitch); |
Dan Gohman | 158ff2c | 2008-06-21 22:08:46 +0000 | [diff] [blame] | 574 | TheSwitch->eraseFromParent(); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 575 | break; |
| 576 | case 2: |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 577 | BranchInst::Create(TheSwitch->getSuccessor(1), TheSwitch->getSuccessor(2), |
| 578 | call, TheSwitch); |
Dan Gohman | 158ff2c | 2008-06-21 22:08:46 +0000 | [diff] [blame] | 579 | TheSwitch->eraseFromParent(); |
Chris Lattner | ffc4926 | 2004-05-12 04:14:24 +0000 | [diff] [blame] | 580 | break; |
| 581 | default: |
| 582 | // Otherwise, make the default destination of the switch instruction be one |
| 583 | // of the other successors. |
| 584 | TheSwitch->setOperand(0, call); |
| 585 | TheSwitch->setSuccessor(0, TheSwitch->getSuccessor(NumExitBlocks)); |
| 586 | TheSwitch->removeCase(NumExitBlocks); // Remove redundant case |
| 587 | break; |
Chris Lattner | 5b2072e | 2004-03-14 23:43:24 +0000 | [diff] [blame] | 588 | } |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 589 | } |
| 590 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 591 | void CodeExtractor::moveCodeToFunction(Function *newFunction) { |
| 592 | Function *oldFunc = (*BlocksToExtract.begin())->getParent(); |
| 593 | Function::BasicBlockListType &oldBlocks = oldFunc->getBasicBlockList(); |
| 594 | Function::BasicBlockListType &newBlocks = newFunction->getBasicBlockList(); |
| 595 | |
| 596 | for (std::set<BasicBlock*>::const_iterator i = BlocksToExtract.begin(), |
| 597 | e = BlocksToExtract.end(); i != e; ++i) { |
| 598 | // Delete the basic block from the old function, and the list of blocks |
| 599 | oldBlocks.remove(*i); |
| 600 | |
| 601 | // Insert this basic block into the new function |
| 602 | newBlocks.push_back(*i); |
| 603 | } |
| 604 | } |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 605 | |
| 606 | /// ExtractRegion - Removes a loop from a function, replaces it with a call to |
| 607 | /// new function. Returns pointer to the new function. |
| 608 | /// |
| 609 | /// algorithm: |
| 610 | /// |
| 611 | /// find inputs and outputs for the region |
| 612 | /// |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 613 | /// for inputs: add to function as args, map input instr* to arg# |
| 614 | /// for outputs: add allocas for scalars, |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 615 | /// add to func as args, map output instr* to arg# |
| 616 | /// |
| 617 | /// rewrite func to use argument #s instead of instr* |
| 618 | /// |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 619 | /// for each scalar output in the function: at every exit, store intermediate |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 620 | /// computed result back into memory. |
| 621 | /// |
Chris Lattner | 7f1c7ed | 2004-08-12 03:17:02 +0000 | [diff] [blame] | 622 | Function *CodeExtractor:: |
| 623 | ExtractCodeRegion(const std::vector<BasicBlock*> &code) { |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 624 | if (!isEligible(code)) |
| 625 | return 0; |
| 626 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 627 | // 1) Find inputs, outputs |
| 628 | // 2) Construct new function |
| 629 | // * Add allocas for defs, pass as args by reference |
| 630 | // * Pass in uses as args |
| 631 | // 3) Move code region, add call instr to func |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 632 | // |
| 633 | BlocksToExtract.insert(code.begin(), code.end()); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 634 | |
| 635 | Values inputs, outputs; |
| 636 | |
| 637 | // Assumption: this is a single-entry code region, and the header is the first |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 638 | // block in the region. |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 639 | BasicBlock *header = code[0]; |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 640 | |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 641 | for (unsigned i = 1, e = code.size(); i != e; ++i) |
| 642 | for (pred_iterator PI = pred_begin(code[i]), E = pred_end(code[i]); |
| 643 | PI != E; ++PI) |
| 644 | assert(BlocksToExtract.count(*PI) && |
| 645 | "No blocks in this region may have entries from outside the region" |
| 646 | " except for the first block!"); |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 647 | |
Chris Lattner | 13d2ddf | 2004-05-12 16:07:41 +0000 | [diff] [blame] | 648 | // If we have to split PHI nodes or the entry block, do so now. |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 649 | severSplitPHINodes(header); |
| 650 | |
Chris Lattner | 13d2ddf | 2004-05-12 16:07:41 +0000 | [diff] [blame] | 651 | // If we have any return instructions in the region, split those blocks so |
| 652 | // that the return is not in the region. |
| 653 | splitReturnBlocks(); |
| 654 | |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 655 | Function *oldFunction = header->getParent(); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 656 | |
| 657 | // This takes place of the original loop |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 658 | BasicBlock *codeReplacer = BasicBlock::Create(header->getContext(), |
| 659 | "codeRepl", oldFunction, |
Gabor Greif | 697e94c | 2008-05-15 10:04:30 +0000 | [diff] [blame] | 660 | header); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 661 | |
| 662 | // The new function needs a root node because other nodes can branch to the |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 663 | // head of the region, but the entry node of a function cannot have preds. |
Owen Anderson | 55f1c09 | 2009-08-13 21:58:54 +0000 | [diff] [blame] | 664 | BasicBlock *newFuncRoot = BasicBlock::Create(header->getContext(), |
| 665 | "newFuncRoot"); |
Gabor Greif | e9ecc68 | 2008-04-06 20:25:17 +0000 | [diff] [blame] | 666 | newFuncRoot->getInstList().push_back(BranchInst::Create(header)); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 667 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 668 | // Find inputs to, outputs from the code region. |
| 669 | findInputsOutputs(inputs, outputs); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 670 | |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 671 | // Construct new function based on inputs/outputs & add allocas for all defs. |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 672 | Function *newFunction = constructFunction(inputs, outputs, header, |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 673 | newFuncRoot, |
Chris Lattner | 73ab1fa | 2004-03-15 01:18:23 +0000 | [diff] [blame] | 674 | codeReplacer, oldFunction, |
| 675 | oldFunction->getParent()); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 676 | |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 677 | emitCallAndSwitchStatement(newFunction, codeReplacer, inputs, outputs); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 678 | |
Chris Lattner | 9c431f6 | 2004-03-14 22:34:55 +0000 | [diff] [blame] | 679 | moveCodeToFunction(newFunction); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 680 | |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 681 | // Loop over all of the PHI nodes in the header block, and change any |
Chris Lattner | 320d59f | 2004-03-18 05:28:49 +0000 | [diff] [blame] | 682 | // references to the old incoming edge to be the new incoming edge. |
Reid Spencer | 6614946 | 2004-09-15 17:06:42 +0000 | [diff] [blame] | 683 | for (BasicBlock::iterator I = header->begin(); isa<PHINode>(I); ++I) { |
| 684 | PHINode *PN = cast<PHINode>(I); |
Chris Lattner | 320d59f | 2004-03-18 05:28:49 +0000 | [diff] [blame] | 685 | for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) |
| 686 | if (!BlocksToExtract.count(PN->getIncomingBlock(i))) |
| 687 | PN->setIncomingBlock(i, newFuncRoot); |
Reid Spencer | 6614946 | 2004-09-15 17:06:42 +0000 | [diff] [blame] | 688 | } |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 689 | |
Chris Lattner | acd7598 | 2004-03-18 05:38:31 +0000 | [diff] [blame] | 690 | // Look at all successors of the codeReplacer block. If any of these blocks |
| 691 | // had PHI nodes in them, we need to update the "from" block to be the code |
| 692 | // replacer, not the original block in the extracted region. |
| 693 | std::vector<BasicBlock*> Succs(succ_begin(codeReplacer), |
| 694 | succ_end(codeReplacer)); |
| 695 | for (unsigned i = 0, e = Succs.size(); i != e; ++i) |
Reid Spencer | 6614946 | 2004-09-15 17:06:42 +0000 | [diff] [blame] | 696 | for (BasicBlock::iterator I = Succs[i]->begin(); isa<PHINode>(I); ++I) { |
| 697 | PHINode *PN = cast<PHINode>(I); |
Chris Lattner | 5627382 | 2004-08-13 03:27:07 +0000 | [diff] [blame] | 698 | std::set<BasicBlock*> ProcessedPreds; |
Chris Lattner | acd7598 | 2004-03-18 05:38:31 +0000 | [diff] [blame] | 699 | for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) |
Anton Korobeynikov | 1bfd121 | 2008-02-20 11:26:25 +0000 | [diff] [blame] | 700 | if (BlocksToExtract.count(PN->getIncomingBlock(i))) { |
Chris Lattner | 5627382 | 2004-08-13 03:27:07 +0000 | [diff] [blame] | 701 | if (ProcessedPreds.insert(PN->getIncomingBlock(i)).second) |
| 702 | PN->setIncomingBlock(i, codeReplacer); |
| 703 | else { |
| 704 | // There were multiple entries in the PHI for this block, now there |
| 705 | // is only one, so remove the duplicated entries. |
| 706 | PN->removeIncomingValue(i, false); |
| 707 | --i; --e; |
| 708 | } |
Anton Korobeynikov | 1bfd121 | 2008-02-20 11:26:25 +0000 | [diff] [blame] | 709 | } |
Chris Lattner | 5627382 | 2004-08-13 03:27:07 +0000 | [diff] [blame] | 710 | } |
Misha Brukman | b1c9317 | 2005-04-21 23:48:37 +0000 | [diff] [blame] | 711 | |
Bill Wendling | f3baad3 | 2006-12-07 01:30:32 +0000 | [diff] [blame] | 712 | //cerr << "NEW FUNCTION: " << *newFunction; |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 713 | // verifyFunction(*newFunction); |
| 714 | |
Bill Wendling | f3baad3 | 2006-12-07 01:30:32 +0000 | [diff] [blame] | 715 | // cerr << "OLD FUNCTION: " << *oldFunction; |
Chris Lattner | 795c993 | 2004-05-12 15:29:13 +0000 | [diff] [blame] | 716 | // verifyFunction(*oldFunction); |
Chris Lattner | acd7598 | 2004-03-18 05:38:31 +0000 | [diff] [blame] | 717 | |
Torok Edwin | ccb29cd | 2009-07-11 13:10:19 +0000 | [diff] [blame] | 718 | DEBUG(if (verifyFunction(*newFunction)) |
| 719 | llvm_report_error("verifyFunction failed!")); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 720 | return newFunction; |
| 721 | } |
| 722 | |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 723 | bool CodeExtractor::isEligible(const std::vector<BasicBlock*> &code) { |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 724 | // Deny code region if it contains allocas or vastarts. |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 725 | for (std::vector<BasicBlock*>::const_iterator BB = code.begin(), e=code.end(); |
| 726 | BB != e; ++BB) |
| 727 | for (BasicBlock::const_iterator I = (*BB)->begin(), Ie = (*BB)->end(); |
| 728 | I != Ie; ++I) |
| 729 | if (isa<AllocaInst>(*I)) |
| 730 | return false; |
Chris Lattner | 3b2917b | 2004-05-12 06:01:40 +0000 | [diff] [blame] | 731 | else if (const CallInst *CI = dyn_cast<CallInst>(I)) |
| 732 | if (const Function *F = CI->getCalledFunction()) |
| 733 | if (F->getIntrinsicID() == Intrinsic::vastart) |
| 734 | return false; |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 735 | return true; |
| 736 | } |
| 737 | |
| 738 | |
Misha Brukman | f44acae | 2004-03-02 00:20:57 +0000 | [diff] [blame] | 739 | /// ExtractCodeRegion - slurp a sequence of basic blocks into a brand new |
| 740 | /// function |
| 741 | /// |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 742 | Function* llvm::ExtractCodeRegion(DominatorTree &DT, |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 743 | const std::vector<BasicBlock*> &code, |
| 744 | bool AggregateArgs) { |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 745 | return CodeExtractor(&DT, AggregateArgs).ExtractCodeRegion(code); |
Misha Brukman | f44acae | 2004-03-02 00:20:57 +0000 | [diff] [blame] | 746 | } |
| 747 | |
Misha Brukman | 5af2be7 | 2004-03-01 18:28:34 +0000 | [diff] [blame] | 748 | /// ExtractBasicBlock - slurp a natural loop into a brand new function |
| 749 | /// |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 750 | Function* llvm::ExtractLoop(DominatorTree &DT, Loop *L, bool AggregateArgs) { |
| 751 | return CodeExtractor(&DT, AggregateArgs).ExtractCodeRegion(L->getBlocks()); |
Misha Brukman | caa1a5a | 2004-02-28 03:26:20 +0000 | [diff] [blame] | 752 | } |
| 753 | |
Misha Brukman | 5af2be7 | 2004-03-01 18:28:34 +0000 | [diff] [blame] | 754 | /// ExtractBasicBlock - slurp a basic block into a brand new function |
| 755 | /// |
Misha Brukman | 3596f0a | 2004-04-23 23:54:17 +0000 | [diff] [blame] | 756 | Function* llvm::ExtractBasicBlock(BasicBlock *BB, bool AggregateArgs) { |
Misha Brukman | 5af2be7 | 2004-03-01 18:28:34 +0000 | [diff] [blame] | 757 | std::vector<BasicBlock*> Blocks; |
| 758 | Blocks.push_back(BB); |
Devang Patel | cf470e5 | 2007-06-07 22:17:16 +0000 | [diff] [blame] | 759 | return CodeExtractor(0, AggregateArgs).ExtractCodeRegion(Blocks); |
Misha Brukman | 5af2be7 | 2004-03-01 18:28:34 +0000 | [diff] [blame] | 760 | } |