Merge 85fbfd1 into de1c041

.travis.yml

@@ -6,11 +6,13 @@ compiler:
 
 os:
   - linux
+  - osx
 
 sudo: false
 cache:
-  - apt
-  - pip
+  apt: true
+  directories:
+    - $HOME/.cache/pip
 addons:
   apt:
     packages:
@@ -41,7 +43,7 @@ env:
     - USE_LLVM=Off
       BUILD_TYPE=Coverage
 
-install:
+before_install:
   - pip install --user cpp-coveralls
 
 before_script:
@@ -50,8 +52,8 @@ before_script:
   - cmake .. -DUSE_LLVM=$USE_LLVM -DBUILD_TESTS=On -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DSITE="${TRAVIS_OS_NAME}@Travis" -DBUILDNAME="${TRAVIS_BRANCH}_${CXX}_LLVM_${USE_LLVM}_${BUILD_TYPE}"
 
 script:
-  - ctest -M Experimental -T Start -T Build -T Test -T Submit
-  - cmake --build . -- all --keep-going && cmake --build . --target check # If ctest built the project unsuccessfully, `make all && make check` will report errors to Travis
+  - cmake --build . -- all --keep-going
+  - cmake --build . --target check
 
 after_success:
   - if [ ${CXX} == g++ ] && [ ${BUILD_TYPE} == Coverage ]; then ~/.local/bin/coveralls --repo_token "INxVunXhVXbQWjVbwoIisKeXSJqCRGnI2" --exclude build/tests/gtest -E ".*CMake.*CompilerId.c" --gcov-options "\-lp" -r ../; fi

include/analysis.h

@@ -341,6 +341,11 @@ class ControlGraph {
     nodes_iterator nodes_end() { return m_nodes.end(); }
 
     ControlNode* newNode(ControlNode::TNodeType type) {
+        assert(type == ControlNode::ntInstruction
+            || type == ControlNode::ntPhi
+            || type == ControlNode::ntTau
+        );
+
         ControlNode* node = 0;
 
         switch (type) {
@@ -355,9 +360,6 @@ class ControlGraph {
             case ControlNode::ntTau:
                 node = new TauNode(m_lastNodeIndex);
                 break;
-
-            default:
-                assert(false);
         }
 
         m_lastNodeIndex++;