Commit 0fe9bd9e authored by John Criswell's avatar John Criswell
Browse files

Merged from mainline. 

llvm-svn: 15686
parent 322e1317

llvm/lib/Transforms/Hello/Hello.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "llvm/Pass.h"

#include "llvm/Function.h"

#include <iostream>

using namespace llvm;



namespace {

llvm/lib/Transforms/Utils/CodeExtractor.cpp

+12 −9
Original line number Diff line number Diff line
@@ -513,21 +513,24 @@ emitCallAndSwitchStatement(Function *newFunction, BasicBlock *codeReplacer, 
  }



  // Now that we've done the deed, simplify the switch instruction.

  const Type *OldFnRetTy = TheSwitch->getParent()->getParent()->getReturnType();

  switch (NumExitBlocks) {

  case 0:

    // There is only 1 successor (the block containing the switch itself), which

    // There are no successors (the block containing the switch itself), which

    // means that previously this was the last part of the function, and hence

    // this should be rewritten as a `ret'

    

    // Check if the function should return a value

    if (TheSwitch->getParent()->getParent()->getReturnType() != Type::VoidTy &&

        TheSwitch->getParent()->getParent()->getReturnType() ==

        TheSwitch->getCondition()->getType())

    if (OldFnRetTy == Type::VoidTy) {

      new ReturnInst(0, TheSwitch);  // Return void

    } else if (OldFnRetTy == TheSwitch->getCondition()->getType()) {

      // return what we have

      new ReturnInst(TheSwitch->getCondition(), TheSwitch);

    else

      // just return

      new ReturnInst(0, TheSwitch);

    } else {

      // Otherwise we must have code extracted an unwind or something, just

      // return whatever we want.

      new ReturnInst(Constant::getNullValue(OldFnRetTy), TheSwitch);

    }



    TheSwitch->getParent()->getInstList().erase(TheSwitch);

    break;
@@ -583,8 +586,8 @@ void CodeExtractor::moveCodeToFunction(Function *newFunction) { 
/// for each scalar output in the function: at every exit, store intermediate 

/// computed result back into memory.

///

Function *CodeExtractor::ExtractCodeRegion(const std::vector<BasicBlock*> &code)

{

Function *CodeExtractor::

ExtractCodeRegion(const std::vector<BasicBlock*> &code) {

  if (!isEligible(code))

    return 0;