{getCTy -> containedType} + osx_image downgrade

.travis.yml

@@ -4,7 +4,7 @@ compiler:
 - clang
 os:
 - osx
-osx_image: xcode7.3
+# osx_image: xcode7.3
 before_install:
 - ./scripts/install-git-lfs.sh # linux-only
 - ./scripts/install-cmake-ninja-flex.sh # .tar.bz2 on linux, brew on mac

CMakeLists.txt

@@ -33,8 +33,7 @@ add_custom_target(valgrind
   DEPENDS CLI
   DEPENDS UnitTest)
 
-add_custom_target(valgrind-all
-  COMMAND "${VALGRIND_EXE}" "${UNITTEST_EXE}"
+add_custom_target(valgrind-all "${VALGRIND_EXE}" "${UNITTEST_EXE}"
   COMMENT "Running valgrind comprehensive tests ..."
   DEPENDS CLI
   DEPENDS UnitTest)

include/rhine/IR/Type.hpp

@@ -224,7 +224,7 @@ class PointerType : public Type {
   static bool classof(const Type *T);
   static inline void Profile(FoldingSetNodeID &ID, const Type *CTy);
   void Profile(FoldingSetNodeID &ID) const;
-  Type *getCTy();
+  Type *containedType();
   size_t getSize();
   virtual llvm::Type *toLL(llvm::Module *M) override;
 

scripts/install-cmake-ninja-flex.sh

@@ -6,6 +6,7 @@ if [ $TRAVIS_OS_NAME == linux ] || [ "$(expr substr $(uname -s) 1 5)" == "Linux"
   export PATH=$TOOLS_ROOT:$PATH
 elif [ $TRAVIS_OS_NAME == osx ] || [ "$(uname)" == "Darwin" ]; then
   brew update &&
+  brew unlink cmake &&
   brew install cmake ninja flex &&
   brew link --force flex
 fi

src/CodeGen/InstLowering.cpp

@@ -11,7 +11,7 @@ namespace rhine {
 llvm::Value *CallInst::toLL(llvm::Module *M) {
   CHECK_LoweredValue;
   auto K = context();
-  auto RTy = cast<FunctionType>(cast<PointerType>(VTy)->getCTy())->returnType();
+  auto RTy = cast<FunctionType>(cast<PointerType>(VTy)->containedType())->returnType();
   auto CalleeFn = getCallee()->toLL(M);
 
   // Prepare arguments to call

src/CodeGen/TensorLowering.cpp

@@ -7,7 +7,7 @@
 namespace rhine {
 llvm::Value *Tensor::toLL(llvm::Module *M) {
   auto K = context();
-  auto ElTy = type()->getCTy()->toLL(M);
+  auto ElTy = type()->containedType()->toLL(M);
   auto PElTy = llvm::PointerType::get(ElTy, 0);
   auto Dims = type()->getDims();
   auto NElements = 1;

src/CodeGen/TypeLowering.cpp

@@ -46,6 +46,6 @@ llvm::Type *FunctionType::toLL(llvm::Module *M) {
 }
 
 llvm::Type *PointerType::toLL(llvm::Module *M) {
-  return llvm::PointerType::get(getCTy()->toLL(M), 0);
+  return llvm::PointerType::get(containedType()->toLL(M), 0);
 }
 }

src/IR/Instruction.cpp

@@ -79,7 +79,7 @@ bool CallInst::classof(const Value *V) { return V->op() == RT_CallInst; }
 FunctionType *CallInst::getFTy() const {
   auto PTy = cast<PointerType>(type());
   assert(PTy && "Illegal call to getFTy() before type inference");
-  return cast<FunctionType>(PTy->getCTy());
+  return cast<FunctionType>(PTy->containedType());
 }
 
 std::vector<Type *> CallInst::getATys() const { return getFTy()->getATys(); }

src/IR/Type.cpp

@@ -204,7 +204,7 @@ void PointerType::Profile(FoldingSetNodeID &ID) const {
   Profile(ID, ContainedType);
 }
 
-Type *PointerType::getCTy() { return ContainedType; }
+Type *PointerType::containedType() { return ContainedType; }
 
 size_t PointerType::getSize() { return 8; }
 

src/Transform/TypeInfer.cpp

@@ -104,7 +104,7 @@ Type *TypeInfer::visit(Argument *V) {
 
 FunctionType *TypeInfer::followFcnPointer(Type *CalleeTy) {
   if (auto PointerTy = dyn_cast<PointerType>(CalleeTy))
-    return dyn_cast<FunctionType>(PointerTy->getCTy());
+    return dyn_cast<FunctionType>(PointerTy->containedType());
   return nullptr;
 }
 
@@ -178,8 +178,8 @@ Type *TypeInfer::visit(TerminatorInst *V) {
 Type *TypeInfer::visit(IndexingInst *V) {
   auto Ty = cast<TensorType>(visit(V->val()));
   assert(!isa<UnType>(Ty) && "unable to infer type of Tensor");
-  V->setType(Ty->getCTy());
-  return Ty->getCTy();
+  V->setType(Ty->containedType());
+  return Ty->containedType();
 }
 
 Type *TypeInfer::visit(BindInst *V) {

src/UI/CLI/CMakeLists.txt

@@ -3,6 +3,10 @@ find_package(LLVM REQUIRED)
 add_executable(CLI
   "${CMAKE_CURRENT_SOURCE_DIR}/Rhine.cpp")
 
+add_custom_command(TARGET CLI
+  PRE_BUILD COMMAND "find" "${PROJECT_BINARY_DIR}" "-name"
+  "*.gcda" "-exec" "rm" "{}" "\;")
+
 set_target_properties(CLI PROPERTIES
   OUTPUT_NAME "rhine"
   RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"