X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=examples%2FModuleMaker%2FModuleMaker.cpp;h=c931972f5b60d337974b505675296a50b9b4b1af;hb=71857ccdb83b6374f7a791c2dae45ce9934a85af;hp=1076446369742067b244a5c5c14144309a4fc218;hpb=7db7fa0828bc4ac375032a847b3fd530cef131e2;p=oota-llvm.git

diff --git a/examples/ModuleMaker/ModuleMaker.cpp b/examples/ModuleMaker/ModuleMaker.cpp
index 10764463697..c931972f5b6 100644
--- a/examples/ModuleMaker/ModuleMaker.cpp
+++ b/examples/ModuleMaker/ModuleMaker.cpp
@@ -1,61 +1,63 @@
 //===- examples/ModuleMaker/ModuleMaker.cpp - Example project ---*- C++ -*-===//
-// 
+//
 //                     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.
+//
 //===----------------------------------------------------------------------===//
 //
 // This programs is a simple example that creates an LLVM module "from scratch",
-// emitting it as a bytecode file to standard out.  This is just to show how
+// emitting it as a bitcode file to standard out.  This is just to show how
 // LLVM projects work and to demonstrate some of the LLVM APIs.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Module.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
-#include "llvm/Bytecode/Writer.h"
-#include <iostream>
-
+#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
 int main() {
+  LLVMContext Context;
+
   // Create the "module" or "program" or "translation unit" to hold the
   // function
-  Module *M = new Module("test");
-  
+  Module *M = new Module("test", Context);
+
   // Create the main function: first create the type 'int ()'
-  FunctionType *FT = FunctionType::get(Type::IntTy, std::vector<const Type*>(),
-                                       /*not vararg*/false);
-  
+  FunctionType *FT =
+    FunctionType::get(Type::getInt32Ty(Context), /*not vararg*/false);
+
   // By passing a module as the last parameter to the Function constructor,
   // it automatically gets appended to the Module.
-  Function *F = new Function(FT, Function::ExternalLinkage, "main", M);
-  
+  Function *F = Function::Create(FT, Function::ExternalLinkage, "main", M);
+
   // Add a basic block to the function... again, it automatically inserts
   // because of the last argument.
-  BasicBlock *BB = new BasicBlock("EntryBlock", F);
-  
+  BasicBlock *BB = BasicBlock::Create(Context, "EntryBlock", F);
+
   // Get pointers to the constant integers...
-  Value *Two = ConstantSInt::get(Type::IntTy, 2);
-  Value *Three = ConstantSInt::get(Type::IntTy, 3);
-  
+  Value *Two = ConstantInt::get(Type::getInt32Ty(Context), 2);
+  Value *Three = ConstantInt::get(Type::getInt32Ty(Context), 3);
+
   // Create the add instruction... does not insert...
-  Instruction *Add = BinaryOperator::create(Instruction::Add, Two, Three,
+  Instruction *Add = BinaryOperator::Create(Instruction::Add, Two, Three,
                                             "addresult");
-  
+
   // explicitly insert it into the basic block...
   BB->getInstList().push_back(Add);
-  
+
   // Create the return instruction and add it to the basic block
-  BB->getInstList().push_back(new ReturnInst(Add));
-  
-  // Output the bytecode file to stdout
-  WriteBytecodeToFile(M, std::cout);
-  
+  BB->getInstList().push_back(ReturnInst::Create(Context, Add));
+
+  // Output the bitcode file to stdout
+  WriteBitcodeToFile(M, outs());
+
   // Delete the module and all of its contents.
   delete M;
   return 0;