From 72a1d4e12657620ea1dd5a2fdb7570da81f5079c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 29 Apr 2002 18:48:30 +0000 Subject: [PATCH] changes because iMemory.h no longer #includes DerivedTypes.h This only requires Type.h anyway git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2405 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp | 1 + lib/Transforms/Utils/PromoteMemoryToRegister.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp index 1eb582ebc4c..396b503ebae 100644 --- a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp +++ b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp @@ -9,6 +9,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Transforms/Scalar/DecomposeMultiDimRefs.h" +#include "llvm/DerivedTypes.h" #include "llvm/Constant.h" #include "llvm/iMemory.h" #include "llvm/iOther.h" diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index cfaeeccdf6e..ee8300215f7 100644 --- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -25,6 +25,7 @@ #include "llvm/Function.h" #include "llvm/BasicBlock.h" #include "llvm/Constant.h" +#include "llvm/Type.h" using std::vector; using std::map; @@ -165,7 +166,7 @@ bool PromotePass::runOnFunction(Function *F) { // vector Values(Allocas.size()); for (unsigned i = 0, e = Allocas.size(); i != e; ++i) - Values[i] = Constant::getNullValue(Allocas[i]->getType()->getElementType()); + Values[i] = Constant::getNullValue(Allocas[i]->getAllocatedType()); // Walks all basic blocks in the function performing the SSA rename algorithm // and inserting the phi nodes we marked as necessary @@ -204,7 +205,7 @@ bool PromotePass::QueuePhiNode(BasicBlock *BB, unsigned AllocaNo) { if (BBPNs[AllocaNo]) return false; // Create a PhiNode using the dereferenced type... - PHINode *PN = new PHINode(Allocas[AllocaNo]->getType()->getElementType(), + PHINode *PN = new PHINode(Allocas[AllocaNo]->getAllocatedType(), Allocas[AllocaNo]->getName()+".mem2reg"); BBPNs[AllocaNo] = PN;