1. Drop default inline threshold back down to 200.

[oota-llvm.git] / lib / Transforms / IPO / IndMemRemoval.cpp

diff --git a/lib/Transforms/IPO/IndMemRemoval.cpp b/lib/Transforms/IPO/IndMemRemoval.cpp
index 9d3c147a1f6b795a210277aaf4da33113ef645f3..502c293da1d8448ea25e8080de89eaad1439715d 100644 (file)
--- a/lib/Transforms/IPO/IndMemRemoval.cpp
+++ b/lib/Transforms/IPO/IndMemRemoval.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -15,36 +15,33 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "indmemrem"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
-#include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Type.h"
-#include "llvm/Support/Debug.h"
+#include "llvm/DerivedTypes.h"
 #include "llvm/ADT/Statistic.h"
-#include <fstream>
-#include <set>
+#include "llvm/Support/Compiler.h"
 using namespace llvm;
 
-namespace {
-  Statistic NumBounceSites("indmemrem", "Number of sites modified");
-  Statistic NumBounce  ("indmemrem", "Number of bounce functions created");
-
-  class IndMemRemPass : public ModulePass {
+STATISTIC(NumBounceSites, "Number of sites modified");
+STATISTIC(NumBounce     , "Number of bounce functions created");
 
+namespace {
+  class VISIBILITY_HIDDEN IndMemRemPass : public ModulePass {
   public:
-    IndMemRemPass();
+    static char ID; // Pass identification, replacement for typeid
+    IndMemRemPass() : ModulePass((intptr_t)&ID) {}
+
     virtual bool runOnModule(Module &M);
   };
+  char IndMemRemPass::ID = 0;
   RegisterPass<IndMemRemPass> X("indmemrem","Indirect Malloc and Free Removal");
 } // end anonymous namespace
 
 
-IndMemRemPass::IndMemRemPass()
-{
-}
-
 bool IndMemRemPass::runOnModule(Module &M) {
   //in Theory, all direct calls of malloc and free should be promoted
   //to intrinsics.  Therefor, this goes through and finds where the
@@ -52,12 +49,12 @@ bool IndMemRemPass::runOnModule(Module &M) {
   //functions, ensuring that all malloc and free that might happen
   //happen through intrinsics.
   bool changed = false;
-  if (Function* F = M.getNamedFunction("free")) {
-    assert(F->isExternal() && "free not external?");
+  if (Function* F = M.getFunction("free")) {
+    assert(F->isDeclaration() && "free not external?");
     if (!F->use_empty()) {
       Function* FN = new Function(F->getFunctionType(), 
-                                 GlobalValue::LinkOnceLinkage, 
-                                 "free_llvm_bounce", &M);
+                                  GlobalValue::LinkOnceLinkage, 
+                                  "free_llvm_bounce", &M);
       BasicBlock* bb = new BasicBlock("entry",FN);
       Instruction* R = new ReturnInst(bb);
       new FreeInst(FN->arg_begin(), R);
@@ -67,16 +64,16 @@ bool IndMemRemPass::runOnModule(Module &M) {
       changed = true;
     }
   }
-  if (Function* F = M.getNamedFunction("malloc")) {
-    assert(F->isExternal() && "malloc not external?");
+  if (Function* F = M.getFunction("malloc")) {
+    assert(F->isDeclaration() && "malloc not external?");
     if (!F->use_empty()) {
       Function* FN = new Function(F->getFunctionType(), 
-                                 GlobalValue::LinkOnceLinkage, 
-                                 "malloc_llvm_bounce", &M);
+                                  GlobalValue::LinkOnceLinkage, 
+                                  "malloc_llvm_bounce", &M);
       BasicBlock* bb = new BasicBlock("entry",FN);
-      Instruction* c = 
-        CastInst::createInferredCast(FN->arg_begin(), Type::UIntTy, "c", bb);
-      Instruction* a = new MallocInst(Type::SByteTy, c, "m", bb);
+      Instruction* c = CastInst::createIntegerCast(
+          FN->arg_begin(), Type::Int32Ty, false, "c", bb);
+      Instruction* a = new MallocInst(Type::Int8Ty, c, "m", bb);
       new ReturnInst(a, bb);
       ++NumBounce;
       NumBounceSites += F->getNumUses();