Use the correct style casts

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@546 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 0b0cf0a4106961d77750342c12cab43c7963a8fd..0b017ad574af0e77e4fed7b97dfe3ecf896ef22a 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -351,7 +351,7 @@ void Interpreter::executeAllocInst(AllocationInst *I, ExecutionContext &SF) {
   unsigned NumElements = 1;
 
   if (I->getNumOperands()) {   // Allocating a unsized array type?
-    assert(Ty->isArrayType() && Ty->isArrayType()->isUnsized() && 
+    assert(Ty->isArrayType() && Ty->castArrayType()->isUnsized() && 
           "Allocation inst with size operand for !unsized array type???");
     Ty = ((const ArrayType*)Ty)->getElementType();  // Get the actual type...
 

diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 11b2038a0dbf4548144e7b0701f395e4cfc1014f..8b2db6f73c05d8b5d92fdd9ee9494517554bf2b7 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -45,7 +45,7 @@ static ExFunc lookupMethod(const Method *M) {
   // Function not found, look it up... start by figuring out what the
   // composite function name should be.
   string ExtName = "lle_";
-  const MethodType *MT = M->getType()->isMethodType();
+  const MethodType *MT = M->getType();
   for (unsigned i = 0; const Type *Ty = MT->getContainedType(i); ++i)
     ExtName += getTypeID(Ty);
   ExtName += "_" + M->getName();
@@ -72,7 +72,7 @@ void Interpreter::callExternalMethod(Method *M,
   }
 
   // TODO: FIXME when types are not const!
-  GenericValue Result = Fn(const_cast<MethodType*>(M->getType()->isMethodType()), ArgVals);
+  GenericValue Result = Fn(const_cast<MethodType*>(M->getType()), ArgVals);
   
   // Copy the result back into the result variable if we are not returning void.
   if (M->getReturnType() != Type::VoidTy) {