[poolalloc] r189045 - Updated DSA and Poolalloc to compile with LLVM 3.3.
John Criswell
criswell at uiuc.edu
Thu Aug 22 12:25:50 PDT 2013
Author: criswell
Date: Thu Aug 22 14:25:49 2013
New Revision: 189045
URL: http://llvm.org/viewvc/llvm-project?rev=189045&view=rev
Log:
Updated DSA and Poolalloc to compile with LLVM 3.3.
Patch submitted by Joshua Cranmer.
Patch reviewed by John Criswell.
Modified:
poolalloc/trunk/include/assistDS/ArgCast.h
poolalloc/trunk/include/assistDS/DataStructureCallGraph.h
poolalloc/trunk/include/assistDS/Devirt.h
poolalloc/trunk/include/assistDS/FuncSimplify.h
poolalloc/trunk/include/assistDS/FuncSpec.h
poolalloc/trunk/include/assistDS/GEPExprArgs.h
poolalloc/trunk/include/assistDS/IndCloner.h
poolalloc/trunk/include/assistDS/Int2PtrCmp.h
poolalloc/trunk/include/assistDS/LoadArgs.h
poolalloc/trunk/include/assistDS/MergeGEP.h
poolalloc/trunk/include/assistDS/SimplifyExtractValue.h
poolalloc/trunk/include/assistDS/SimplifyGEP.h
poolalloc/trunk/include/assistDS/SimplifyInsertValue.h
poolalloc/trunk/include/assistDS/SimplifyLoad.h
poolalloc/trunk/include/assistDS/StructReturnToPointer.h
poolalloc/trunk/include/assistDS/TypeChecks.h
poolalloc/trunk/include/assistDS/TypeChecksOpt.h
poolalloc/trunk/include/dsa/AllocatorIdentification.h
poolalloc/trunk/include/dsa/DSGraph.h
poolalloc/trunk/include/dsa/DSNode.h
poolalloc/trunk/include/dsa/DataStructure.h
poolalloc/trunk/include/poolalloc/PoolAllocate.h
poolalloc/trunk/include/poolalloc/RunTimeAssociate.h
poolalloc/trunk/lib/AssistDS/ArgCast.cpp
poolalloc/trunk/lib/AssistDS/ArgSimplify.cpp
poolalloc/trunk/lib/AssistDS/DSNodeEquivs.cpp
poolalloc/trunk/lib/AssistDS/DataStructureCallGraph.cpp
poolalloc/trunk/lib/AssistDS/DynCount.cpp
poolalloc/trunk/lib/AssistDS/FuncSimplify.cpp
poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp
poolalloc/trunk/lib/AssistDS/LoadArgs.cpp
poolalloc/trunk/lib/AssistDS/MergeGEP.cpp
poolalloc/trunk/lib/AssistDS/SVADevirt.cpp
poolalloc/trunk/lib/AssistDS/SimplifyExtractValue.cpp
poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp
poolalloc/trunk/lib/AssistDS/SimplifyInsertValue.cpp
poolalloc/trunk/lib/AssistDS/SimplifyLoad.cpp
poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp
poolalloc/trunk/lib/AssistDS/TypeChecks.cpp
poolalloc/trunk/lib/AssistDS/TypeChecksOpt.cpp
poolalloc/trunk/lib/DSA/AddressTakenAnalysis.cpp
poolalloc/trunk/lib/DSA/AllocatorIdentification.cpp
poolalloc/trunk/lib/DSA/Basic.cpp
poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
poolalloc/trunk/lib/DSA/CallTargets.cpp
poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp
poolalloc/trunk/lib/DSA/DSCallGraph.cpp
poolalloc/trunk/lib/DSA/DSGraph.cpp
poolalloc/trunk/lib/DSA/DSTest.cpp
poolalloc/trunk/lib/DSA/DataStructure.cpp
poolalloc/trunk/lib/DSA/DataStructureStats.cpp
poolalloc/trunk/lib/DSA/EntryPointAnalysis.cpp
poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp
poolalloc/trunk/lib/DSA/GraphChecker.cpp
poolalloc/trunk/lib/DSA/Local.cpp
poolalloc/trunk/lib/DSA/Printer.cpp
poolalloc/trunk/lib/DSA/SanityCheck.cpp
poolalloc/trunk/lib/DSA/StdLibPass.cpp
poolalloc/trunk/lib/DSA/TopDownClosure.cpp
poolalloc/trunk/lib/DSA/TypeSafety.cpp
poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp
poolalloc/trunk/lib/PoolAllocate/AllHeapNodesHeuristic.cpp
poolalloc/trunk/lib/PoolAllocate/AllNodesHeuristic.cpp
poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp
poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp
poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp
poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp
poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp
poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp
Modified: poolalloc/trunk/include/assistDS/ArgCast.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/ArgCast.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/ArgCast.h (original)
+++ poolalloc/trunk/include/assistDS/ArgCast.h Thu Aug 22 14:25:49 2013
@@ -13,9 +13,9 @@
// call F (..., T1 val1, ...)
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Constants.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/DataStructureCallGraph.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/DataStructureCallGraph.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/DataStructureCallGraph.h (original)
+++ poolalloc/trunk/include/assistDS/DataStructureCallGraph.h Thu Aug 22 14:25:49 2013
@@ -18,7 +18,7 @@
#include "dsa/CallTargets.h"
#include "dsa/DataStructure.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
#include "llvm/Analysis/CallGraph.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
Modified: poolalloc/trunk/include/assistDS/Devirt.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/Devirt.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/Devirt.h (original)
+++ poolalloc/trunk/include/assistDS/Devirt.h Thu Aug 22 14:25:49 2013
@@ -14,15 +14,15 @@
#include "dsa/CallTargets.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/Pass.h"
-#include "llvm/Module.h"
-#include "llvm/Function.h"
-#include "llvm/Instructions.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Support/InstVisitor.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/InstVisitor.h"
+#include "llvm/IR/DataLayout.h"
using namespace llvm;
Modified: poolalloc/trunk/include/assistDS/FuncSimplify.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/FuncSimplify.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/FuncSimplify.h (original)
+++ poolalloc/trunk/include/assistDS/FuncSimplify.h Thu Aug 22 14:25:49 2013
@@ -8,8 +8,8 @@
//===----------------------------------------------------------------------===//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/FuncSpec.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/FuncSpec.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/FuncSpec.h (original)
+++ poolalloc/trunk/include/assistDS/FuncSpec.h Thu Aug 22 14:25:49 2013
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/GEPExprArgs.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/GEPExprArgs.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/GEPExprArgs.h (original)
+++ poolalloc/trunk/include/assistDS/GEPExprArgs.h Thu Aug 22 14:25:49 2013
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/IndCloner.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/IndCloner.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/IndCloner.h (original)
+++ poolalloc/trunk/include/assistDS/IndCloner.h Thu Aug 22 14:25:49 2013
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/Int2PtrCmp.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/Int2PtrCmp.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/Int2PtrCmp.h (original)
+++ poolalloc/trunk/include/assistDS/Int2PtrCmp.h Thu Aug 22 14:25:49 2013
@@ -13,10 +13,10 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
-#include "llvm/DataLayout.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/LoadArgs.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/LoadArgs.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/LoadArgs.h (original)
+++ poolalloc/trunk/include/assistDS/LoadArgs.h Thu Aug 22 14:25:49 2013
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/MergeGEP.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/MergeGEP.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/MergeGEP.h (original)
+++ poolalloc/trunk/include/assistDS/MergeGEP.h Thu Aug 22 14:25:49 2013
@@ -11,9 +11,9 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DataLayout.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/SimplifyExtractValue.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/SimplifyExtractValue.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/SimplifyExtractValue.h (original)
+++ poolalloc/trunk/include/assistDS/SimplifyExtractValue.h Thu Aug 22 14:25:49 2013
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/SimplifyGEP.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/SimplifyGEP.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/SimplifyGEP.h (original)
+++ poolalloc/trunk/include/assistDS/SimplifyGEP.h Thu Aug 22 14:25:49 2013
@@ -11,9 +11,9 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/DataLayout.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/SimplifyInsertValue.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/SimplifyInsertValue.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/SimplifyInsertValue.h (original)
+++ poolalloc/trunk/include/assistDS/SimplifyInsertValue.h Thu Aug 22 14:25:49 2013
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/SimplifyLoad.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/SimplifyLoad.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/SimplifyLoad.h (original)
+++ poolalloc/trunk/include/assistDS/SimplifyLoad.h Thu Aug 22 14:25:49 2013
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/StructReturnToPointer.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/StructReturnToPointer.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/StructReturnToPointer.h (original)
+++ poolalloc/trunk/include/assistDS/StructReturnToPointer.h Thu Aug 22 14:25:49 2013
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
namespace llvm {
Modified: poolalloc/trunk/include/assistDS/TypeChecks.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/TypeChecks.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/TypeChecks.h (original)
+++ poolalloc/trunk/include/assistDS/TypeChecks.h Thu Aug 22 14:25:49 2013
@@ -16,10 +16,10 @@
#include "dsa/AddressTakenAnalysis.h"
-#include "llvm/Instructions.h"
-#include "llvm/Function.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Function.h"
#include "llvm/Pass.h"
-#include "llvm/DataLayout.h"
#include "llvm/Support/CallSite.h"
#include "llvm/Analysis/Dominators.h"
#include "llvm/Analysis/LoopInfo.h"
Modified: poolalloc/trunk/include/assistDS/TypeChecksOpt.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/assistDS/TypeChecksOpt.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/assistDS/TypeChecksOpt.h (original)
+++ poolalloc/trunk/include/assistDS/TypeChecksOpt.h Thu Aug 22 14:25:49 2013
@@ -16,9 +16,9 @@
#include "dsa/TypeSafety.h"
-#include "llvm/Instructions.h"
#include "llvm/Pass.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/Instructions.h"
#include "llvm/Support/CallSite.h"
#include <list>
Modified: poolalloc/trunk/include/dsa/AllocatorIdentification.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/AllocatorIdentification.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/AllocatorIdentification.h (original)
+++ poolalloc/trunk/include/dsa/AllocatorIdentification.h Thu Aug 22 14:25:49 2013
@@ -14,7 +14,7 @@
#include <string>
#include "llvm/Pass.h"
-#include "llvm/Value.h"
+#include "llvm/IR/Value.h"
namespace llvm {
class Function;
Modified: poolalloc/trunk/include/dsa/DSGraph.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSGraph.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/DSGraph.h (original)
+++ poolalloc/trunk/include/dsa/DSGraph.h Thu Aug 22 14:25:49 2013
@@ -18,7 +18,7 @@
#include "dsa/DSNode.h"
#include "dsa/DSCallGraph.h"
#include "llvm/ADT/EquivalenceClasses.h"
-#include "llvm/Function.h"
+#include "llvm/IR/Function.h"
#include <list>
#include <map>
Modified: poolalloc/trunk/include/dsa/DSNode.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSNode.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/DSNode.h (original)
+++ poolalloc/trunk/include/dsa/DSNode.h Thu Aug 22 14:25:49 2013
@@ -16,6 +16,7 @@
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/ilist_node.h"
+#include "llvm/ADT/ilist.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
#include "dsa/svset.h"
Modified: poolalloc/trunk/include/dsa/DataStructure.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DataStructure.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/DataStructure.h (original)
+++ poolalloc/trunk/include/dsa/DataStructure.h Thu Aug 22 14:25:49 2013
@@ -21,7 +21,7 @@
#include "dsa/AllocatorIdentification.h"
#include "llvm/Pass.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include "llvm/Support/CallSite.h"
#include "llvm/ADT/EquivalenceClasses.h"
#include "llvm/ADT/DenseSet.h"
Modified: poolalloc/trunk/include/poolalloc/PoolAllocate.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/PoolAllocate.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/poolalloc/PoolAllocate.h (original)
+++ poolalloc/trunk/include/poolalloc/PoolAllocate.h Thu Aug 22 14:25:49 2013
@@ -17,11 +17,11 @@
#ifndef POOLALLOCATE_H
#define POOLALLOCATE_H
-#include "llvm/Argument.h"
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Argument.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
#include "llvm/Pass.h"
-#include "llvm/DerivedTypes.h"
#include "llvm/Support/CallSite.h"
#include "llvm/ADT/EquivalenceClasses.h"
#include "llvm/ADT/DenseMap.h"
Modified: poolalloc/trunk/include/poolalloc/RunTimeAssociate.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/RunTimeAssociate.h?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/include/poolalloc/RunTimeAssociate.h (original)
+++ poolalloc/trunk/include/poolalloc/RunTimeAssociate.h Thu Aug 22 14:25:49 2013
@@ -16,11 +16,11 @@
#ifndef _RUNTIMEASSOCIATE_H
#define _RUNTIMEASSOCIATE_H
-#include "llvm/Argument.h"
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Argument.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
#include "llvm/Pass.h"
-#include "llvm/DerivedTypes.h"
#include "llvm/Support/CallSite.h"
#include "llvm/ADT/EquivalenceClasses.h"
#include "llvm/ADT/DenseMap.h"
Modified: poolalloc/trunk/lib/AssistDS/ArgCast.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/ArgCast.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/ArgCast.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/ArgCast.cpp Thu Aug 22 14:25:49 2013
@@ -15,7 +15,7 @@
#define DEBUG_TYPE "argcast"
#include "assistDS/ArgCast.h"
-#include "llvm/Attributes.h"
+#include "llvm/IR/Attributes.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/FormattedStream.h"
@@ -132,11 +132,11 @@ bool ArgCast::runOnModule(Module& M) {
FormalType, true, "", CI);
Args.push_back(CastI);
} else {
- if(F->getParamAttributes(i+1).SExt) {
+ if (F->getAttributes().hasAttribute(i+1, Attribute::SExt)) {
CastInst *CastI = CastInst::CreateIntegerCast(CI->getOperand(i+1),
FormalType, true, "", CI);
Args.push_back(CastI);
- } else if(F->getParamAttributes(i+1).ZExt) {
+ } else if (F->getAttributes().hasAttribute(i+1, Attribute::ZExt)) {
CastInst *CastI = CastInst::CreateIntegerCast(CI->getOperand(i+1),
FormalType, false, "", CI);
Args.push_back(CastI);
Modified: poolalloc/trunk/lib/AssistDS/ArgSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/ArgSimplify.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/ArgSimplify.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/ArgSimplify.cpp Thu Aug 22 14:25:49 2013
@@ -8,9 +8,9 @@
//===----------------------------------------------------------------------===//
#define DEBUG_TYPE "argsimpl"
-#include "llvm/Instructions.h"
-#include "llvm/Constants.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
Modified: poolalloc/trunk/lib/AssistDS/DSNodeEquivs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/DSNodeEquivs.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/DSNodeEquivs.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/DSNodeEquivs.cpp Thu Aug 22 14:25:49 2013
@@ -14,8 +14,8 @@
#include "assistDS/DSNodeEquivs.h"
-#include "llvm/Constants.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/InstIterator.h"
#include "llvm/ADT/SmallSet.h"
Modified: poolalloc/trunk/lib/AssistDS/DataStructureCallGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/DataStructureCallGraph.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/DataStructureCallGraph.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/DataStructureCallGraph.cpp Thu Aug 22 14:25:49 2013
@@ -17,8 +17,8 @@
#include "dsa/DSNode.h"
#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Instructions.h"
-#include "llvm/IntrinsicInst.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicInst.h"
#include "llvm/Support/CallSite.h"
#include "llvm/Support/InstIterator.h"
Modified: poolalloc/trunk/lib/AssistDS/DynCount.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/DynCount.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/DynCount.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/DynCount.cpp Thu Aug 22 14:25:49 2013
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "llvm/Pass.h"
-#include "llvm/Module.h"
-#include "llvm/Instructions.h"
-#include "llvm/Constants.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DataLayout.h"
#include "dsa/TypeSafety.h"
using namespace llvm;
Modified: poolalloc/trunk/lib/AssistDS/FuncSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/FuncSimplify.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/FuncSimplify.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/FuncSimplify.cpp Thu Aug 22 14:25:49 2013
@@ -10,7 +10,7 @@
#define DEBUG_TYPE "func-simplify"
#include "assistDS/FuncSimplify.h"
-#include "llvm/Attributes.h"
+#include "llvm/IR/Attributes.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/FormattedStream.h"
Modified: poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp Thu Aug 22 14:25:49 2013
@@ -13,15 +13,15 @@
#define DEBUG_TYPE "gepexprargs"
#include "assistDS/GEPExprArgs.h"
-#include "llvm/Constants.h"
-#include "llvm/Operator.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Operator.h"
+#include "llvm/IR/Use.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/ValueMap.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Use.h"
#include <vector>
#include <map>
@@ -120,7 +120,7 @@ bool GEPExprArgs::runOnModule(Module& M)
NI->setName(II->getName());
NI->addAttr(F->getAttributes().getParamAttributes(II->getArgNo() + 1));
}
- NewF->setAttributes(NewF->getAttributes().addAttr(
+ NewF->setAttributes(NewF->getAttributes().addAttributes(
F->getContext(), 0, F->getAttributes().getRetAttributes()));
// Perform the cloning.
SmallVector<ReturnInst*,100> Returns;
@@ -131,7 +131,7 @@ bool GEPExprArgs::runOnModule(Module& M)
fargs.push_back(ai);
}
- NewF->setAttributes(NewF->getAttributes().addAttr(
+ NewF->setAttributes(NewF->getAttributes().addAttributes(
F->getContext(), ~0, F->getAttributes().getFnAttributes()));
//Get the point to insert the GEP instr.
SmallVector<Value*, 8> Ops(CI->op_begin()+1, CI->op_end());
@@ -152,30 +152,28 @@ bool GEPExprArgs::runOnModule(Module& M)
fargs.at(j)->replaceAllUsesWith(GEP_new);
}
- SmallVector<AttributeWithIndex, 8> AttributesVec;
-
+ // TODO: Should we use attrbuilder?
+ AttributeSet NewCallPAL=AttributeSet();
+
// Get the initial attributes of the call
- AttrListPtr CallPAL = CI->getAttributes();
- Attributes RAttrs = CallPAL.getRetAttributes();
- Attributes FnAttrs = CallPAL.getFnAttributes();
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
+ AttributeSet CallPAL = CI->getAttributes();
+ AttributeSet RAttrs = CallPAL.getRetAttributes();
+ AttributeSet FnAttrs = CallPAL.getFnAttributes();
+ if (!RAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),0,RAttrs);
SmallVector<Value*, 8> Args;
Args.push_back(GEP->getPointerOperand());
for(unsigned j =1;j<CI->getNumOperands();j++) {
Args.push_back(CI->getOperand(j));
- // position in the AttributesVec
- Attributes Attrs = CallPAL.getParamAttributes(j);
- if (Attrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
+ // position in the AttributesBuilder
+ AttributeSet Attrs = CallPAL.getParamAttributes(j);
+ if (!Attrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),Args.size(),Attrs);
}
// Create the new attributes vec.
- if (FnAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
-
- AttrListPtr NewCallPAL = AttrListPtr::get(F->getContext(),
- AttributesVec);
+ if (!FnAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),~0, FnAttrs);
CallInst *CallI = CallInst::Create(NewF,Args,"", CI);
CallI->setCallingConv(CI->getCallingConv());
Modified: poolalloc/trunk/lib/AssistDS/LoadArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/LoadArgs.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/LoadArgs.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/LoadArgs.cpp Thu Aug 22 14:25:49 2013
@@ -15,14 +15,14 @@
#define DEBUG_TYPE "ld-args"
#include "assistDS/LoadArgs.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Use.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/ValueMap.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Use.h"
#include <vector>
#include <set>
#include <map>
@@ -80,8 +80,8 @@ bool LoadArgs::runOnModule(Module& M) {
// do not care about dead arguments
if(ai->use_empty())
continue;
- if(F->getParamAttributes(argNum).SExt ||
- F->getParamAttributes(argNum).ZExt)
+ if(F->getAttributes().getParamAttributes(argNum).hasAttrSomewhere(Attribute::SExt) ||
+ F->getAttributes().getParamAttributes(argNum).hasAttrSomewhere(Attribute::ZExt))
continue;
if (isa<LoadInst>(CI->getArgOperand(argNum)))
break;
@@ -168,9 +168,9 @@ bool LoadArgs::runOnModule(Module& M) {
fargs.push_back(ai);
}
- NewF->setAttributes(NewF->getAttributes().addAttr(
+ NewF->setAttributes(NewF->getAttributes().addAttributes(
F->getContext(), 0, F->getAttributes().getRetAttributes()));
- NewF->setAttributes(NewF->getAttributes().addAttr(
+ NewF->setAttributes(NewF->getAttributes().addAttributes(
F->getContext(), ~0, F->getAttributes().getFnAttributes()));
//Get the point to insert the GEP instr.
Instruction *InsertPoint;
@@ -178,13 +178,16 @@ bool LoadArgs::runOnModule(Module& M) {
LoadInst *LI_new = new LoadInst(fargs.at(argNum), "", InsertPoint);
fargs.at(argNum+1)->replaceAllUsesWith(LI_new);
}
- SmallVector<AttributeWithIndex, 8> AttributesVec;
+
+ //this does not seem to be a good idea
+ AttributeSet NewCallPAL=AttributeSet();
+
// Get the initial attributes of the call
- AttrListPtr CallPAL = CI->getAttributes();
- Attributes RAttrs = CallPAL.getRetAttributes();
- Attributes FnAttrs = CallPAL.getFnAttributes();
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
+ AttributeSet CallPAL = CI->getAttributes();
+ AttributeSet RAttrs = CallPAL.getRetAttributes();
+ AttributeSet FnAttrs = CallPAL.getFnAttributes();
+ if (!RAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),0, RAttrs);
SmallVector<Value*, 8> Args;
for(unsigned j =0;j<CI->getNumArgOperands();j++) {
@@ -192,17 +195,14 @@ bool LoadArgs::runOnModule(Module& M) {
Args.push_back(NewVal);
}
Args.push_back(CI->getArgOperand(j));
- // position in the AttributesVec
- Attributes Attrs = CallPAL.getParamAttributes(j+1);
- if (Attrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
+ // position in the NewCallPAL
+ AttributeSet Attrs = CallPAL.getParamAttributes(j+1);
+ if (!Attrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),Args.size(), Attrs);
}
// Create the new attributes vec.
- if (FnAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
-
- AttrListPtr NewCallPAL = AttrListPtr::get(F->getContext(),
- AttributesVec);
+ if (!FnAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),~0, FnAttrs);
CallInst *CallI = CallInst::Create(NewF,Args,"", CI);
CallI->setCallingConv(CI->getCallingConv());
Modified: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/MergeGEP.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/MergeGEP.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Thu Aug 22 14:25:49 2013
@@ -13,12 +13,11 @@
#define DEBUG_TYPE "merge-gep"
#include "assistDS/MergeGEP.h"
-#include "llvm/Instructions.h"
-#include "llvm/Operator.h"
-#include "llvm/Module.h"
#include "llvm/Pass.h"
-#include "llvm/Instructions.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Operator.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
Modified: poolalloc/trunk/lib/AssistDS/SVADevirt.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/SVADevirt.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/SVADevirt.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/SVADevirt.cpp Thu Aug 22 14:25:49 2013
@@ -7,14 +7,14 @@
//
//===----------------------------------------------------------------------===//
#define DEBUG_TYPE "devirt"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
#include "llvm/Transforms/IPO.h"
#include "dsa/CallTargets.h"
#include "llvm/Pass.h"
-#include "llvm/Module.h"
-#include "llvm/Function.h"
-#include "llvm/Instructions.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/DerivedTypes.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/ADT/Statistic.h"
Modified: poolalloc/trunk/lib/AssistDS/SimplifyExtractValue.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/SimplifyExtractValue.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/SimplifyExtractValue.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/SimplifyExtractValue.cpp Thu Aug 22 14:25:49 2013
@@ -21,7 +21,7 @@
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/PatternMatch.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include <set>
#include <map>
Modified: poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp Thu Aug 22 14:25:49 2013
@@ -15,12 +15,12 @@
#define DEBUG_TYPE "simplify-gep"
#include "assistDS/SimplifyGEP.h"
-#include "llvm/Constants.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Operator.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/Operator.h"
#include <vector>
Modified: poolalloc/trunk/lib/AssistDS/SimplifyInsertValue.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/SimplifyInsertValue.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/SimplifyInsertValue.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/SimplifyInsertValue.cpp Thu Aug 22 14:25:49 2013
@@ -19,7 +19,7 @@
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/PatternMatch.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include <set>
#include <map>
Modified: poolalloc/trunk/lib/AssistDS/SimplifyLoad.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/SimplifyLoad.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/SimplifyLoad.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/SimplifyLoad.cpp Thu Aug 22 14:25:49 2013
@@ -17,7 +17,7 @@
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/PatternMatch.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include <set>
#include <map>
Modified: poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp Thu Aug 22 14:25:49 2013
@@ -14,7 +14,7 @@
#define DEBUG_TYPE "struct-ret"
#include "assistDS/StructReturnToPointer.h"
-#include "llvm/Attributes.h"
+#include "llvm/IR/Attributes.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/ValueMap.h"
@@ -94,9 +94,9 @@ bool StructRet::runOnModule(Module& M) {
ae= NF->arg_end(); ai != ae; ++ai) {
fargs.push_back(ai);
}
- NF->setAttributes(NF->getAttributes().addAttr(
+ NF->setAttributes(NF->getAttributes().addAttributes(
M.getContext(), 0, F->getAttributes().getRetAttributes()));
- NF->setAttributes(NF->getAttributes().addAttr(
+ NF->setAttributes(NF->getAttributes().addAttributes(
M.getContext(), ~0, F->getAttributes().getFnAttributes()));
for (Function::iterator B = NF->begin(), FE = NF->end(); B != FE; ++B) {
@@ -120,30 +120,29 @@ bool StructRet::runOnModule(Module& M) {
AllocaInst *AllocaNew = new AllocaInst(F->getReturnType(), 0, "", CI);
SmallVector<Value*, 8> Args;
- SmallVector<AttributeWithIndex, 8> AttributesVec;
-
+ //this should probably be done in a different manner
+ AttributeSet NewCallPAL=AttributeSet();
+
// Get the initial attributes of the call
- AttrListPtr CallPAL = CI->getAttributes();
- Attributes RAttrs = CallPAL.getRetAttributes();
- Attributes FnAttrs = CallPAL.getFnAttributes();
+ AttributeSet CallPAL = CI->getAttributes();
+ AttributeSet RAttrs = CallPAL.getRetAttributes();
+ AttributeSet FnAttrs = CallPAL.getFnAttributes();
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
+ if (!RAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),0, RAttrs);
Args.push_back(AllocaNew);
for(unsigned j =1;j<CI->getNumOperands();j++) {
Args.push_back(CI->getOperand(j));
- // position in the AttributesVec
- Attributes Attrs = CallPAL.getParamAttributes(j);
- if (Attrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
+ // position in the NewCallPAL
+ AttributeSet Attrs = CallPAL.getParamAttributes(j);
+ if (!Attrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),Args.size(), Attrs);
}
// Create the new attributes vec.
- if (FnAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
+ if (!FnAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F->getContext(),~0, FnAttrs);
- AttrListPtr NewCallPAL = AttrListPtr::get(F->getContext(),
- AttributesVec);
CallInst *CallI = CallInst::Create(NF, Args, "", CI);
CallI->setCallingConv(CI->getCallingConv());
Modified: poolalloc/trunk/lib/AssistDS/TypeChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/TypeChecks.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/TypeChecks.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/TypeChecks.cpp Thu Aug 22 14:25:49 2013
@@ -12,15 +12,15 @@
//===----------------------------------------------------------------------===//
#include "assistDS/TypeChecks.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
#include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Module.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/InstIterator.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Intrinsics.h"
+#include "llvm/IR/Intrinsics.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/ADT/Statistic.h"
@@ -684,9 +684,9 @@ bool TypeChecks::visitAddressTakenFuncti
// 4. Copy over attributes for the function
NewF->setAttributes(NewF->getAttributes()
- .addAttr(M.getContext(), 0, F.getAttributes().getRetAttributes()));
+ .addAttributes(M.getContext(), 0, F.getAttributes().getRetAttributes()));
NewF->setAttributes(NewF->getAttributes()
- .addAttr(M.getContext(), ~0, F.getAttributes().getFnAttributes()));
+ .addAttributes(M.getContext(), ~0, F.getAttributes().getFnAttributes()));
// 5. Perform the cloning
SmallVector<ReturnInst*, 100>Returns;
@@ -850,9 +850,9 @@ bool TypeChecks::visitInternalVarArgFunc
// 4. Copy over attributes for the function
NewF->setAttributes(NewF->getAttributes()
- .addAttr(M.getContext(), 0, F.getAttributes().getRetAttributes()));
+ .addAttributes(M.getContext(), 0, F.getAttributes().getRetAttributes()));
NewF->setAttributes(NewF->getAttributes()
- .addAttr(M.getContext(), ~0, F.getAttributes().getFnAttributes()));
+ .addAttributes(M.getContext(), ~0, F.getAttributes().getFnAttributes()));
// 5. Perform the cloning
SmallVector<ReturnInst*, 100>Returns;
@@ -1057,37 +1057,36 @@ bool TypeChecks::visitInternalByValFunct
if(InvokeInst *II = dyn_cast<InvokeInst>(*ui)) {
if(II->getCalledFunction() == &F) {
SmallVector<Value*, 8> Args;
- SmallVector<AttributeWithIndex, 8> AttributesVec;
+
+ // TODO: not a good idea:
+ AttributeSet NewCallPAL=AttributeSet();
// Get the initial attributes of the call
- AttrListPtr CallPAL = II->getAttributes();
- Attributes RAttrs = CallPAL.getRetAttributes();
- Attributes FnAttrs = CallPAL.getFnAttributes();
+ AttributeSet CallPAL = II->getAttributes();
+ AttributeSet RAttrs = CallPAL.getRetAttributes();
+ AttributeSet FnAttrs = CallPAL.getFnAttributes();
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
+ if (!RAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F.getContext() ,0, RAttrs);
Function::arg_iterator NI = F.arg_begin();
for(unsigned j =3;j<II->getNumOperands();j++, NI++) {
// Add the original argument
Args.push_back(II->getOperand(j));
// If there are attributes on this argument, copy them to the correct
- // position in the AttributesVec
+ // position in the NewCallPAL
//FIXME: copy the rest of the attributes.
if(NI->hasByValAttr())
continue;
- Attributes Attrs = CallPAL.getParamAttributes(j);
- if (Attrs.hasAttributes()) {
- AttributesVec.push_back(AttributeWithIndex::get(j, Attrs));
+ AttributeSet Attrs = CallPAL.getParamAttributes(j);
+ if (!Attrs.isEmpty()) {
+ NewCallPAL=NewCallPAL.addAttributes(F.getContext(), j, Attrs);
}
}
// Create the new attributes vec.
- if (FnAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
-
- AttrListPtr NewCallPAL = AttrListPtr::get(F.getContext(),
- AttributesVec);
+ if (!FnAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F.getContext(),~0, FnAttrs);
// Create the substitute call
@@ -1106,37 +1105,36 @@ bool TypeChecks::visitInternalByValFunct
} else if(CallInst *CI = dyn_cast<CallInst>(*ui)) {
if(CI->getCalledFunction() == &F) {
SmallVector<Value*, 8> Args;
- SmallVector<AttributeWithIndex, 8> AttributesVec;
+
+ // TODO: not a good idea:
+ AttributeSet NewCallPAL=AttributeSet();
// Get the initial attributes of the call
- AttrListPtr CallPAL = CI->getAttributes();
- Attributes RAttrs = CallPAL.getRetAttributes();
- Attributes FnAttrs = CallPAL.getFnAttributes();
+ AttributeSet CallPAL = CI->getAttributes();
+ AttributeSet RAttrs = CallPAL.getRetAttributes();
+ AttributeSet FnAttrs = CallPAL.getFnAttributes();
- if (RAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(0, RAttrs));
+ if (!RAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F.getContext(),0, RAttrs);
Function::arg_iterator II = F.arg_begin();
for(unsigned j =1;j<CI->getNumOperands();j++, II++) {
// Add the original argument
Args.push_back(CI->getOperand(j));
// If there are attributes on this argument, copy them to the correct
- // position in the AttributesVec
+ // position in the NewCallPAL
//FIXME: copy the rest of the attributes.
if(II->hasByValAttr())
continue;
- Attributes Attrs = CallPAL.getParamAttributes(j);
- if (Attrs.hasAttributes()) {
- AttributesVec.push_back(AttributeWithIndex::get(j, Attrs));
+ AttributeSet Attrs = CallPAL.getParamAttributes(j);
+ if (!Attrs.isEmpty()) {
+ NewCallPAL=NewCallPAL.addAttributes(F.getContext(),j, Attrs);
}
}
// Create the new attributes vec.
- if (FnAttrs.hasAttributes())
- AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
-
- AttrListPtr NewCallPAL = AttrListPtr::get(F.getContext(),
- AttributesVec);
+ if (!FnAttrs.isEmpty())
+ NewCallPAL=NewCallPAL.addAttributes(F.getContext(),~0, FnAttrs);
// Create the substitute call
CallInst *CallI = CallInst::Create(&F,
@@ -1158,11 +1156,11 @@ bool TypeChecks::visitInternalByValFunct
// remove the byval attribute from the function
AttrBuilder B;
- B.addAttribute(Attributes::ByVal);
+ B.addAttribute(Attribute::ByVal);
for (Function::arg_iterator I = F.arg_begin(); I != F.arg_end(); ++I) {
if (!I->hasByValAttr())
continue;
- I->removeAttr(Attributes::get(M.getContext(), B));
+ I->removeAttr(AttributeSet::get(M.getContext(),0, B));
}
return true;
}
Modified: poolalloc/trunk/lib/AssistDS/TypeChecksOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/TypeChecksOpt.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/TypeChecksOpt.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/TypeChecksOpt.cpp Thu Aug 22 14:25:49 2013
@@ -12,15 +12,15 @@
//===----------------------------------------------------------------------===//
#include "assistDS/TypeChecksOpt.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
#include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Module.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/InstIterator.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Intrinsics.h"
+#include "llvm/IR/Intrinsics.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/ADT/Statistic.h"
Modified: poolalloc/trunk/lib/DSA/AddressTakenAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/AddressTakenAnalysis.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/AddressTakenAnalysis.cpp (original)
+++ poolalloc/trunk/lib/DSA/AddressTakenAnalysis.cpp Thu Aug 22 14:25:49 2013
@@ -14,11 +14,11 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Constants.h"
#include "llvm/Pass.h"
-#include "llvm/Module.h"
-#include "llvm/Function.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
Modified: poolalloc/trunk/lib/DSA/AllocatorIdentification.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/AllocatorIdentification.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/AllocatorIdentification.cpp (original)
+++ poolalloc/trunk/lib/DSA/AllocatorIdentification.cpp Thu Aug 22 14:25:49 2013
@@ -12,9 +12,9 @@
#define DEBUG_TYPE "allocator-identify"
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Transforms/Utils/Cloning.h"
Modified: poolalloc/trunk/lib/DSA/Basic.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Basic.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Basic.cpp (original)
+++ poolalloc/trunk/lib/DSA/Basic.cpp Thu Aug 22 14:25:49 2013
@@ -15,14 +15,14 @@
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/Intrinsics.h"
-#include "llvm/Module.h"
-#include "llvm/TypeBuilder.h"
+#include "llvm/InstVisitor.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Intrinsics.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/TypeBuilder.h"
#include "llvm/Support/InstIterator.h"
-#include "llvm/Support/InstVisitor.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original)
+++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Thu Aug 22 14:25:49 2013
@@ -15,10 +15,10 @@
//===----------------------------------------------------------------------===//
#define DEBUG_TYPE "dsa-bu"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
Modified: poolalloc/trunk/lib/DSA/CallTargets.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/CallTargets.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/CallTargets.cpp (original)
+++ poolalloc/trunk/lib/DSA/CallTargets.cpp Thu Aug 22 14:25:49 2013
@@ -17,15 +17,15 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Module.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Instructions.h"
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
#include "dsa/CallTargets.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
#include <ostream>
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp (original)
+++ poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp Thu Aug 22 14:25:49 2013
@@ -16,7 +16,7 @@
#define DEBUG_TYPE "dsa-cbu"
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
Modified: poolalloc/trunk/lib/DSA/DSCallGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSCallGraph.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DSCallGraph.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSCallGraph.cpp Thu Aug 22 14:25:49 2013
@@ -15,8 +15,8 @@
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
-#include "llvm/Function.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/DerivedTypes.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/CommandLine.h"
Modified: poolalloc/trunk/lib/DSA/DSGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSGraph.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DSGraph.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSGraph.cpp Thu Aug 22 14:25:49 2013
@@ -17,12 +17,12 @@
#include "dsa/DSSupport.h"
#include "dsa/DSNode.h"
#include "dsa/stl_util.h"
-#include "llvm/Constants.h"
-#include "llvm/Function.h"
-#include "llvm/GlobalVariable.h"
-#include "llvm/Instructions.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/DataLayout.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
@@ -32,8 +32,8 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Timer.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Type.h"
-#include "llvm/GlobalAlias.h"
+#include "llvm/IR/Type.h"
+#include "llvm/IR/GlobalAlias.h"
#include <iostream>
#include <algorithm>
Modified: poolalloc/trunk/lib/DSA/DSTest.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSTest.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DSTest.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSTest.cpp Thu Aug 22 14:25:49 2013
@@ -40,11 +40,11 @@
#include "dsa/DSGraph.h"
#include "dsa/DSNode.h"
#include "dsa/DSCallGraph.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/ValueSymbolTable.h"
+#include "llvm/IR/ValueSymbolTable.h"
#include "llvm/Assembly/Writer.h"
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Thu Aug 22 14:25:49 2013
@@ -16,12 +16,12 @@
#include "dsa/DSGraph.h"
#include "dsa/DSSupport.h"
#include "dsa/DSNode.h"
-#include "llvm/Constants.h"
-#include "llvm/Function.h"
-#include "llvm/GlobalVariable.h"
-#include "llvm/Instructions.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/DataLayout.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
Modified: poolalloc/trunk/lib/DSA/DataStructureStats.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructureStats.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructureStats.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructureStats.cpp Thu Aug 22 14:25:49 2013
@@ -15,11 +15,11 @@
#include "dsa/DSGraph.h"
#include "dsa/TypeSafety.h"
-#include "llvm/Constants.h"
-#include "llvm/Function.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/InstVisitor.h"
#include "llvm/Pass.h"
-#include "llvm/Support/InstVisitor.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
Modified: poolalloc/trunk/lib/DSA/EntryPointAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/EntryPointAnalysis.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/EntryPointAnalysis.cpp (original)
+++ poolalloc/trunk/lib/DSA/EntryPointAnalysis.cpp Thu Aug 22 14:25:49 2013
@@ -15,8 +15,8 @@
//===----------------------------------------------------------------------===//
#include "llvm/Pass.h"
-#include "llvm/Module.h"
-#include "llvm/Function.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Function.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
Modified: poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp (original)
+++ poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp Thu Aug 22 14:25:49 2013
@@ -16,8 +16,8 @@
#define DEBUG_TYPE "ECGraphs"
#include "dsa/DataStructure.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Module.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
#include "dsa/DSGraph.h"
#include "llvm/Support/CallSite.h"
Modified: poolalloc/trunk/lib/DSA/GraphChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/GraphChecker.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/GraphChecker.cpp (original)
+++ poolalloc/trunk/lib/DSA/GraphChecker.cpp Thu Aug 22 14:25:49 2013
@@ -27,7 +27,7 @@
#include "dsa/DSGraph.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormattedStream.h"
-#include "llvm/Value.h"
+#include "llvm/IR/Value.h"
#include <set>
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Thu Aug 22 14:25:49 2013
@@ -20,27 +20,27 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/Triple.h"
-#include "llvm/Constants.h"
-#include "llvm/DataLayout.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/InlineAsm.h"
-#include "llvm/Intrinsics.h"
-#include "llvm/Instructions.h"
-#include "llvm/IntrinsicInst.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/InlineAsm.h"
+#include "llvm/IR/Intrinsics.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/Use.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "llvm/Support/InstVisitor.h"
+#include "llvm/InstVisitor.h"
#include "llvm/Support/Timer.h"
-#include "llvm/Use.h"
#include <fstream>
// FIXME: This should eventually be a FunctionPass that is automatically
// aggregated into a Pass.
//
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/Printer.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Printer.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Printer.cpp (original)
+++ poolalloc/trunk/lib/DSA/Printer.cpp Thu Aug 22 14:25:49 2013
@@ -16,8 +16,8 @@
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
#include "dsa/DSGraphTraits.h"
-#include "llvm/Module.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Constants.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/GraphWriter.h"
Modified: poolalloc/trunk/lib/DSA/SanityCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/SanityCheck.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/SanityCheck.cpp (original)
+++ poolalloc/trunk/lib/DSA/SanityCheck.cpp Thu Aug 22 14:25:49 2013
@@ -16,8 +16,8 @@
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/StdLibPass.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/StdLibPass.cpp (original)
+++ poolalloc/trunk/lib/DSA/StdLibPass.cpp Thu Aug 22 14:25:49 2013
@@ -14,18 +14,18 @@
#include "dsa/DataStructure.h"
#include "dsa/AllocatorIdentification.h"
#include "dsa/DSGraph.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/Intrinsics.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Intrinsics.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Timer.h"
#include <iostream>
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
using namespace llvm;
Modified: poolalloc/trunk/lib/DSA/TopDownClosure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/TopDownClosure.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/TopDownClosure.cpp (original)
+++ poolalloc/trunk/lib/DSA/TopDownClosure.cpp Thu Aug 22 14:25:49 2013
@@ -16,8 +16,8 @@
#define DEBUG_TYPE "td_dsa"
#include "dsa/DataStructure.h"
-#include "llvm/Module.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/DerivedTypes.h"
#include "dsa/DSGraph.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
Modified: poolalloc/trunk/lib/DSA/TypeSafety.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/TypeSafety.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/TypeSafety.cpp (original)
+++ poolalloc/trunk/lib/DSA/TypeSafety.cpp Thu Aug 22 14:25:49 2013
@@ -17,8 +17,8 @@
#include "dsa/TypeSafety.h"
-#include "llvm/Module.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/DerivedTypes.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/CommandLine.h"
Modified: poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp Thu Aug 22 14:25:49 2013
@@ -16,8 +16,8 @@
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
#include "poolalloc/PoolAllocate.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
using namespace llvm;
namespace {
Modified: poolalloc/trunk/lib/PoolAllocate/AllHeapNodesHeuristic.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/AllHeapNodesHeuristic.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/AllHeapNodesHeuristic.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/AllHeapNodesHeuristic.cpp Thu Aug 22 14:25:49 2013
@@ -20,12 +20,12 @@
#include "dsa/DSGraphTraits.h"
#include "poolalloc/Heuristic.h"
#include "poolalloc/PoolAllocate.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/DepthFirstIterator.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormattedStream.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include <iostream>
using namespace llvm;
Modified: poolalloc/trunk/lib/PoolAllocate/AllNodesHeuristic.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/AllNodesHeuristic.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/AllNodesHeuristic.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/AllNodesHeuristic.cpp Thu Aug 22 14:25:49 2013
@@ -15,7 +15,7 @@
#include "poolalloc/Heuristic.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Module.h"
using namespace llvm;
using namespace PA;
Modified: poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp Thu Aug 22 14:25:49 2013
@@ -19,12 +19,12 @@
#include "dsa/DSGraphTraits.h"
#include "poolalloc/Heuristic.h"
#include "poolalloc/PoolAllocate.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/DepthFirstIterator.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormattedStream.h"
-#include "llvm/DataLayout.h"
+#include "llvm/IR/DataLayout.h"
#include <iostream>
using namespace llvm;
Modified: poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PAMultipleGlobalPool.cpp Thu Aug 22 14:25:49 2013
@@ -20,13 +20,13 @@
#include "dsa/CallTargets.h"
#include "poolalloc/PoolAllocate.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
-#include "llvm/TypeBuilder.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/TypeBuilder.h"
#include "llvm/Support/CFG.h"
-#include "llvm/DataLayout.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/DepthFirstIterator.h"
Modified: poolalloc/trunk/lib/PoolAllocate/PASimple.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PASimple.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PASimple.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PASimple.cpp Thu Aug 22 14:25:49 2013
@@ -18,13 +18,12 @@
#include "dsa/DSGraph.h"
#include "dsa/CallTargets.h"
#include "poolalloc/PoolAllocate.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
-#include "llvm/Constants.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/CFG.h"
-#include "llvm/DataLayout.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/DepthFirstIterator.h"
Modified: poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp Thu Aug 22 14:25:49 2013
@@ -17,15 +17,15 @@
#include "dsa/DSGraph.h"
#include "poolalloc/Heuristic.h"
#include "poolalloc/PoolAllocate.h"
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "llvm/Support/InstVisitor.h"
+#include "llvm/InstVisitor.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Transforms/Utils/Cloning.h"
Modified: poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp Thu Aug 22 14:25:49 2013
@@ -21,14 +21,13 @@
#include "poolalloc/Heuristic.h"
#include "poolalloc/PoolAllocate.h"
#include "poolalloc/RuntimeChecks.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
-#include "llvm/Constants.h"
-#include "llvm/Attributes.h"
+#include "llvm/IR/Attributes.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/CFG.h"
-#include "llvm/DataLayout.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/ADT/DepthFirstIterator.h"
@@ -997,9 +996,9 @@ PoolAllocate::MakeFunctionClone (Functio
Function::ArgumentListType & ArgList = New->getArgumentList ();
Function::ArgumentListType::iterator arg = ArgList.begin();
AttrBuilder B;
- B.addAttribute(Attributes::StructRet);
+ B.addAttribute(Attribute::StructRet);
for (; arg != ArgList.end(); ++arg) {
- arg->removeAttr (Attributes::get(F.getContext(), B));
+ arg->removeAttr(AttributeSet::get(F.getContext(), 0, B));
}
//
Modified: poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolOptimize.cpp Thu Aug 22 14:25:49 2013
@@ -11,11 +11,11 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
#include "llvm/Pass.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/Debug.h"
#include <set>
Modified: poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp Thu Aug 22 14:25:49 2013
@@ -18,12 +18,11 @@
#include "dsa/DataStructure.h"
#include "dsa/DSGraph.h"
#include "poolalloc/RunTimeAssociate.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
-#include "llvm/Constants.h"
-#include "llvm/Attributes.h"
+#include "llvm/IR/Attributes.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/CFG.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/Cloning.h"
@@ -182,23 +181,23 @@ Function* RTAssociate::MakeFunctionClone
// verbatim. This is incorrect; each attribute should be shifted one so
// that the pool descriptor has no attributes.
//
- const AttrListPtr OldAttrs = New->getAttributes();
+ const AttributeSet OldAttrs = New->getAttributes();
if (!OldAttrs.isEmpty()) {
- AttrListPtr NewAttrsVector;
+ AttributeSet NewAttrs;
for (unsigned index = 0; index < OldAttrs.getNumSlots(); ++index) {
- const AttributeWithIndex & PAWI = OldAttrs.getSlot(index);
- unsigned argIndex = PAWI.Index;
+ const AttributeSet & PAWI = OldAttrs.getSlotAttributes(index);
+ unsigned argIndex = OldAttrs.getSlotIndex(index);
// If it's not the return value, move the attribute to the next
// parameter.
if (argIndex) ++argIndex;
// Add the parameter to the new list.
- NewAttrsVector.addAttr(F.getContext(), argIndex, PAWI.Attrs);
+ NewAttrs = NewAttrs.addAttributes(F.getContext(), argIndex, PAWI);
}
// Assign the new attributes to the function clone
- New->setAttributes(NewAttrsVector);
+ New->setAttributes(NewAttrs);
}
for (ValueToValueMapTy::iterator I = ValueMap.begin(),
Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=189045&r1=189044&r2=189045&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Thu Aug 22 14:25:49 2013
@@ -18,12 +18,12 @@
#include "dsa/CallTargets.h"
#include "poolalloc/PoolAllocate.h"
#include "poolalloc/RuntimeChecks.h"
-#include "llvm/Module.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
-#include "llvm/DataLayout.h"
-#include "llvm/Support/InstVisitor.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/InstVisitor.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Debug.h"
#include "llvm/ADT/StringMap.h"
More information about the llvm-commits
mailing list