Merge pull request #498 from vprover/michael-no-rtti

turn off run-time type information
vprover · Oct 30, 2023 · d06e09b · d06e09b
2 parents 61ac540 + 2b244c5
commit d06e09b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang$)
   add_compile_options(-Wall)
   # we don't use multithreading in (mainline!) Vampire
   add_compile_options(-fno-threadsafe-statics)
+  # ...or RTTI
+  add_compile_options(-fno-rtti)
   # enable standards-compliant standard library with sized operator delete
   add_compile_options(-fsized-deallocation)
 endif()

diff --git a/Indexing/RequestedIndex.hpp b/Indexing/RequestedIndex.hpp
@@ -58,8 +58,7 @@ class RequestedIndex final
       ASS(!_indexManager);
       _indexManager = indexManager;
       _type = type;
-      _index = dynamic_cast<Index*>(_indexManager->request(type));
-      ASS(_index != nullptr);  // if this fails, the wrong index type was requested
+      _index = static_cast<Index*>(_indexManager->request(type));
     }
 
     // NOTE: release() might be called multiple times (manually and by destructor)

diff --git a/Makefile b/Makefile
@@ -138,7 +138,7 @@ endif
 ################################################################
 
 CXX = g++
-CXXFLAGS = $(XFLAGS) -Wall -fno-threadsafe-statics -std=c++14  $(INCLUDES) # -Wno-unknown-warning-option for clang
+CXXFLAGS = $(XFLAGS) -Wall -fno-threadsafe-statics -fno-rtti -std=c++14  $(INCLUDES) # -Wno-unknown-warning-option for clang
 
 CC = gcc 
 CCFLAGS = -Wall -O3 -DNDBLSCR -DNLGLOG -DNDEBUG -DNCHKSOL -DNLGLPICOSAT