Index: include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h =================================================================== --- include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h +++ include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h @@ -93,16 +93,8 @@ // If StTrue is infeasible, asserting the falseness of Cond is unnecessary // because the existing constraints already establish this. - if (!StTrue) { -#ifndef __OPTIMIZE__ - // This check is expensive and should be disabled even in Release+Asserts - // builds. - // FIXME: __OPTIMIZE__ is a GNU extension that Clang implements but MSVC - // does not. Is there a good equivalent there? - assert(assume(State, Cond, false) && "System is over constrained."); -#endif + if (!StTrue) return ProgramStatePair((ProgramStateRef)nullptr, State); - } ProgramStateRef StFalse = assume(State, Cond, false); if (!StFalse) {