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
diff --git a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
index 1eb582e..396b503 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 cfaeecc..ee83002 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 @@
//
vector<Value *> 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 @@
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;