efcs · EricWF · Oct 9, 2024 · Oct 11, 2024 · Oct 30, 2024 · Oct 31, 2024
diff --git a/clang-tools-extra/clang-doc/Representation.cpp b/clang-tools-extra/clang-doc/Representation.cpp
@@ -179,15 +179,15 @@ bool Reference::mergeable(const Reference &Other) {
 }
 
 void Reference::merge(Reference &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (Name.empty())
     Name = Other.Name;
   if (Path.empty())
     Path = Other.Path;
 }
 
 void Info::mergeBase(Info &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (USR == EmptySID)
     USR = Other.USR;
   if (Name == "")
@@ -209,7 +209,7 @@ bool Info::mergeable(const Info &Other) {
 }
 
 void SymbolInfo::merge(SymbolInfo &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (!DefLoc)
     DefLoc = std::move(Other.DefLoc);
   // Unconditionally extend the list of locations, since we want all of them.
@@ -224,7 +224,7 @@ NamespaceInfo::NamespaceInfo(SymbolID USR, StringRef Name, StringRef Path)
     : Info(InfoType::IT_namespace, USR, Name, Path) {}
 
 void NamespaceInfo::merge(NamespaceInfo &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   // Reduce children if necessary.
   reduceChildren(Children.Namespaces, std::move(Other.Children.Namespaces));
   reduceChildren(Children.Records, std::move(Other.Children.Records));
@@ -238,7 +238,7 @@ RecordInfo::RecordInfo(SymbolID USR, StringRef Name, StringRef Path)
     : SymbolInfo(InfoType::IT_record, USR, Name, Path) {}
 
 void RecordInfo::merge(RecordInfo &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (!llvm::to_underlying(TagType))
     TagType = Other.TagType;
   IsTypeDef = IsTypeDef || Other.IsTypeDef;
@@ -261,7 +261,7 @@ void RecordInfo::merge(RecordInfo &&Other) {
 }
 
 void EnumInfo::merge(EnumInfo &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (!Scoped)
     Scoped = Other.Scoped;
   if (Members.empty())
@@ -270,7 +270,7 @@ void EnumInfo::merge(EnumInfo &&Other) {
 }
 
 void FunctionInfo::merge(FunctionInfo &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (!IsMethod)
     IsMethod = Other.IsMethod;
   if (!Access)
@@ -287,7 +287,7 @@ void FunctionInfo::merge(FunctionInfo &&Other) {
 }
 
 void TypedefInfo::merge(TypedefInfo &&Other) {
-  assert(mergeable(Other));
+  assert_DISABLED(mergeable(Other));
   if (!IsUsing)
     IsUsing = Other.IsUsing;
   if (Underlying.Type.Name == "")

diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/HeaderMapCollector.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/HeaderMapCollector.cpp
@@ -32,7 +32,7 @@ HeaderMapCollector::getMappedHeader(llvm::StringRef Header) const {
   for (auto &Entry : RegexHeaderMappingTable) {
 #ifndef NDEBUG
     std::string Dummy;
-    assert(Entry.first.isValid(Dummy) && "Regex should never be invalid!");
+    assert_DISABLED(Entry.first.isValid(Dummy) && "Regex should never be invalid!");
 #endif
     if (Entry.first.match(Header))
       return Entry.second;

diff --git a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
@@ -756,7 +756,7 @@ static bool retrieveConstExprFromBothSides(const BinaryOperator *&BinOp,
                                            const Expr *&LhsConst,
                                            const Expr *&RhsConst,
                                            const ASTContext *AstCtx) {
-  assert(areSidesBinaryConstExpressions(BinOp, AstCtx) &&
+  assert_DISABLED(areSidesBinaryConstExpressions(BinOp, AstCtx) &&
          "Both sides of binary operator must be constant expressions!");
 
   MainOpcode = BinOp->getOpcode();

diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
@@ -5008,8 +5008,8 @@ void Redeclarable<decl_type>::setPreviousDecl(decl_type *PrevDecl) {
   // First one will point to this one as latest.
   First->RedeclLink.setLatest(static_cast<decl_type*>(this));
 
-  assert(!isa<NamedDecl>(static_cast<decl_type*>(this)) ||
-         cast<NamedDecl>(static_cast<decl_type*>(this))->isLinkageValid());
+  assert(!isa<NamedDecl>(static_cast<const decl_type*>(this)) ||
+         cast<NamedDecl>(static_cast<const decl_type*>(this))->isLinkageValid());
 }
 
 // Inline function definitions.

diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h
@@ -233,8 +233,12 @@ class FixedSizeTemplateParameterListStorage
                                         SourceLocation RAngleLoc,
                                         Expr *RequiresClause)
       : FixedSizeStorageOwner(
-            (assert(N == Params.size()),
-             assert(HasRequiresClause == (RequiresClause != nullptr)),
+            ([&]() {
+               ((void)Params);
+               ((void)RequiresClause);
+               assert(N == Params.size());
+               assert(HasRequiresClause == (RequiresClause != nullptr));
+             }(),
              new (static_cast<void *>(&storage)) TemplateParameterList(C,
                  TemplateLoc, LAngleLoc, Params, RAngleLoc, RequiresClause))) {}
 };

diff --git a/clang/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h b/clang/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
@@ -144,7 +144,7 @@ class LexicallyOrderedRecursiveASTVisitor
     // but right now we only care about getting the correct lexical parent, so
     // we can traverse the gathered nested declarations after the declarations
     // in the decl context.
-    assert(!BaseType::getDerived().shouldTraversePostOrder() &&
+    assert_DISABLED(!BaseType::getDerived().shouldTraversePostOrder() &&
            "post-order traversal is not supported for lexically ordered "
            "recursive ast visitor");
     for (Decl *D : LexicallyNestedDeclarations) {

diff --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h
@@ -1717,7 +1717,7 @@ class Preprocessor {
   void EnableBacktrackAtThisPos(bool Unannotated = false);
 
 private:
-  std::pair<CachedTokensTy::size_type, bool> LastBacktrackPos();
+  std::pair<CachedTokensTy::size_type, bool> LastBacktrackPos() const;
 
   CachedTokensTy PopUnannotatedBacktrackTokens();
 

diff --git a/clang/include/clang/Sema/DelayedDiagnostic.h b/clang/include/clang/Sema/DelayedDiagnostic.h
@@ -325,7 +325,7 @@ class DelayedDiagnosticPool {
 
 /// Add a diagnostic to the current delay pool.
 inline void Sema::DelayedDiagnostics::add(const sema::DelayedDiagnostic &diag) {
-  assert(shouldDelayDiagnostics() && "trying to delay without pool");
+  assert_DISABLED(shouldDelayDiagnostics() && "trying to delay without pool");
   CurPool->add(diag);
 }
 

diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
@@ -276,7 +276,7 @@ class NodeBuilder {
               const NodeBuilderContext &Ctx, bool F = true)
       : C(Ctx), Finalized(F), Frontier(DstSet) {
     Frontier.insert(SrcSet);
-    assert(hasNoSinksInFrontier());
+    assert_DISABLED(hasNoSinksInFrontier());
   }
 
   virtual ~NodeBuilder() = default;
@@ -303,7 +303,7 @@ class NodeBuilder {
 
   const ExplodedNodeSet &getResults() {
     finalizeResults();
-    assert(checkResults());
+    assert_DISABLED(checkResults());
     return Frontier;
   }
 
@@ -312,7 +312,7 @@ class NodeBuilder {
   /// Iterators through the results frontier.
   iterator begin() {
     finalizeResults();
-    assert(checkResults());
+    assert_DISABLED(checkResults());
     return Frontier.begin();
   }
 

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
@@ -1536,7 +1536,7 @@ ASTContext::setInstantiatedFromStaticDataMember(VarDecl *Inst, VarDecl *Tmpl,
 void
 ASTContext::setTemplateOrSpecializationInfo(VarDecl *Inst,
                                             TemplateOrSpecializationInfo TSI) {
-  assert(!TemplateOrInstantiation[Inst] &&
+  assert_DISABLED(!TemplateOrInstantiation[Inst] &&
          "Already noted what the variable was instantiated from");
   TemplateOrInstantiation[Inst] = TSI;
 }
@@ -1556,7 +1556,7 @@ ASTContext::setInstantiatedFromUsingDecl(NamedDecl *Inst, NamedDecl *Pattern) {
           isa<UnresolvedUsingValueDecl>(Inst) ||
           isa<UnresolvedUsingTypenameDecl>(Inst)) &&
          "instantiation did not produce a using decl");
-  assert(!InstantiatedFromUsingDecl[Inst] && "pattern already exists");
+  assert_DISABLED(!InstantiatedFromUsingDecl[Inst] && "pattern already exists");
   InstantiatedFromUsingDecl[Inst] = Pattern;
 }
 
@@ -1567,7 +1567,7 @@ ASTContext::getInstantiatedFromUsingEnumDecl(UsingEnumDecl *UUD) {
 
 void ASTContext::setInstantiatedFromUsingEnumDecl(UsingEnumDecl *Inst,
                                                   UsingEnumDecl *Pattern) {
-  assert(!InstantiatedFromUsingEnumDecl[Inst] && "pattern already exists");
+  assert_DISABLED(!InstantiatedFromUsingEnumDecl[Inst] && "pattern already exists");
   InstantiatedFromUsingEnumDecl[Inst] = Pattern;
 }
 
@@ -1579,7 +1579,7 @@ ASTContext::getInstantiatedFromUsingShadowDecl(UsingShadowDecl *Inst) {
 void
 ASTContext::setInstantiatedFromUsingShadowDecl(UsingShadowDecl *Inst,
                                                UsingShadowDecl *Pattern) {
-  assert(!InstantiatedFromUsingShadowDecl[Inst] && "pattern already exists");
+  assert_DISABLED(!InstantiatedFromUsingShadowDecl[Inst] && "pattern already exists");
   InstantiatedFromUsingShadowDecl[Inst] = Pattern;
 }
 
@@ -1591,7 +1591,7 @@ void ASTContext::setInstantiatedFromUnnamedFieldDecl(FieldDecl *Inst,
                                                      FieldDecl *Tmpl) {
   assert(!Inst->getDeclName() && "Instantiated field decl is not unnamed");
   assert(!Tmpl->getDeclName() && "Template field decl is not unnamed");
-  assert(!InstantiatedFromUnnamedFieldDecl[Inst] &&
+  assert_DISABLED(!InstantiatedFromUnnamedFieldDecl[Inst] &&
          "Already noted what unnamed field was instantiated from");
 
   InstantiatedFromUnnamedFieldDecl[Inst] = Tmpl;

diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp
@@ -3454,7 +3454,7 @@ bool Compiler<Emitter>::VisitCXXUuidofExpr(const CXXUuidofExpr *E) {
   if (!this->emitGetPtrGlobal(*GlobalIndex, E))
     return false;
 
-  assert(this->getRecord(E->getType()));
+  assert_DISABLED(this->getRecord(E->getType()));
 
   const APValue &V = GuidDecl->getAsAPValue();
   if (V.getKind() == APValue::None)

diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
@@ -5014,7 +5014,7 @@ RecordDecl::RecordDecl(Kind DK, TagKind TK, const ASTContext &C,
                        SourceLocation IdLoc, IdentifierInfo *Id,
                        RecordDecl *PrevDecl)
     : TagDecl(DK, TK, C, DC, IdLoc, Id, PrevDecl, StartLoc) {
-  assert(classof(static_cast<Decl *>(this)) && "Invalid Kind!");
+  assert_DISABLED(classof(static_cast<Decl *>(this)) && "Invalid Kind!");
   setHasFlexibleArrayMember(false);
   setAnonymousStructOrUnion(false);
   setHasObjectMember(false);

diff --git a/clang/lib/AST/DeclTemplate.cpp b/clang/lib/AST/DeclTemplate.cpp
@@ -377,7 +377,7 @@ void RedeclarableTemplateDecl::addSpecializationImpl(
   if (InsertPos) {
 #ifndef NDEBUG
     void *CorrectInsertPos;
-    assert(!findSpecializationImpl(Specializations,
+    assert_DISABLED(!findSpecializationImpl(Specializations,
                                    CorrectInsertPos,
                                    SETraits::getTemplateArgs(Entry)) &&
            InsertPos == CorrectInsertPos &&

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
@@ -7212,7 +7212,7 @@ class APValueToBufferConverter {
 
   // Write out Val with type Ty into Buffer starting at Offset.
   bool visit(const APValue &Val, QualType Ty, CharUnits Offset) {
-    assert((size_t)Offset.getQuantity() <= Buffer.size());
+    assert_DISABLED((size_t)Offset.getQuantity() <= Buffer.size());
 
     // As a special case, nullptr_t has an indeterminate value.
     if (Ty->isNullPtrType())
@@ -10860,7 +10860,7 @@ bool RecordExprEvaluator::VisitCXXStdInitializerListExpr(
     Array.moveInto(Result.getStructField(1));
   }
 
-  assert(++Field == Record->field_end() &&
+  assert_DISABLED(++Field == Record->field_end() &&
          "Expected std::initializer_list to only have two fields");
 
   return true;

diff --git a/clang/lib/AST/MicrosoftCXXABI.cpp b/clang/lib/AST/MicrosoftCXXABI.cpp
@@ -155,7 +155,7 @@ class MicrosoftCXXABI : public CXXABI {
   addCopyConstructorForExceptionObject(CXXRecordDecl *RD,
                                        CXXConstructorDecl *CD) override {
     assert(CD != nullptr);
-    assert(RecordToCopyCtor[RD] == nullptr || RecordToCopyCtor[RD] == CD);
+    assert_DISABLED(RecordToCopyCtor[RD] == nullptr || RecordToCopyCtor[RD] == CD);
     RecordToCopyCtor[RD] = CD;
   }
 

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -2006,7 +2006,7 @@ void ItaniumRecordLayoutBuilder::LayoutField(const FieldDecl *D,
     auto performBuiltinTypeAlignmentUpgrade = [&](const BuiltinType *BTy) {
       if (BTy->getKind() == BuiltinType::Double ||
           BTy->getKind() == BuiltinType::LongDouble) {
-        assert(PreferredAlign == CharUnits::fromQuantity(4) &&
+        assert_DISABLED(PreferredAlign == CharUnits::fromQuantity(4) &&
                "No need to upgrade the alignment value.");
         PreferredAlign = CharUnits::fromQuantity(8);
       }

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
@@ -1907,7 +1907,7 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B,
 ///   * ScopeEnd for each scope left
 void CFGBuilder::addScopeExitHandling(LocalScope::const_iterator B,
                                       LocalScope::const_iterator E, Stmt *S) {
-  assert(!B.inSameLocalScope(E));
+  assert_DISABLED(!B.inSameLocalScope(E));
   if (!BuildOpts.AddLifetime && !BuildOpts.AddScopes)
     return;
 

diff --git a/clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp b/clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp
@@ -93,8 +93,8 @@ RecordStorageLocation &DataflowAnalysisContext::createRecordStorageLocation(
     QualType Type, RecordStorageLocation::FieldToLoc FieldLocs,
     RecordStorageLocation::SyntheticFieldMap SyntheticFields) {
   assert(Type->isRecordType());
-  assert(containsSameFields(getModeledFields(Type), FieldLocs));
-  assert(getKeys(getSyntheticFields(Type)) == getKeys(SyntheticFields));
+  assert_DISABLED(containsSameFields(getModeledFields(Type), FieldLocs));
+  assert_DISABLED(getKeys(getSyntheticFields(Type)) == getKeys(SyntheticFields));
 
   RecordStorageLocationCreated = true;
   return arena().create<RecordStorageLocation>(Type, std::move(FieldLocs),

diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -852,7 +852,7 @@ void Environment::setStorageLocation(const ValueDecl &D, StorageLocation &Loc) {
   // are declarations of reference type and `BindingDecl`. For all other
   // declaration, the storage location should be the stable storage location
   // returned by `createStorageLocation()`.
-  assert(D.getType()->isReferenceType() || isa<BindingDecl>(D) ||
+  assert_DISABLED(D.getType()->isReferenceType() || isa<BindingDecl>(D) ||
          &Loc == &createStorageLocation(D));
   DeclToLoc[&D] = &Loc;
 }

diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
@@ -1293,7 +1293,7 @@ static llvm::Constant *buildGlobalBlock(CodeGenModule &CGM,
   // Callers should detect this case on their own: calling this function
   // generally requires computing layout information, which is a waste of time
   // if we've already emitted this block.
-  assert(!CGM.getAddrOfGlobalBlockIfEmitted(blockInfo.BlockExpression) &&
+  assert_DISABLED(!CGM.getAddrOfGlobalBlockIfEmitted(blockInfo.BlockExpression) &&
          "Refusing to re-emit a global block.");
 
   // Generate the constants for the block literal initializer.

diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -4627,7 +4627,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
 
     // Store the stack pointer to the setjmp buffer.
     Value *StackAddr = Builder.CreateStackSave();
-    assert(Buf.emitRawPointer(*this)->getType() == StackAddr->getType());
+    assert_DISABLED(Buf.emitRawPointer(*this)->getType() == StackAddr->getType());
 
     Address StackSaveSlot = Builder.CreateConstInBoundsGEP(Buf, 2);
     Builder.CreateStore(StackAddr, StackSaveSlot);

diff --git a/clang/lib/CodeGen/CGCXXABI.cpp b/clang/lib/CodeGen/CGCXXABI.cpp
@@ -156,7 +156,7 @@ llvm::Value *CGCXXABI::loadIncomingCXXThis(CodeGenFunction &CGF) {
 
 void CGCXXABI::setCXXABIThisValue(CodeGenFunction &CGF, llvm::Value *ThisPtr) {
   /// Initialize the 'this' slot.
-  assert(getThisDecl(CGF) && "no 'this' variable for function");
+  assert_DISABLED(getThisDecl(CGF) && "no 'this' variable for function");
   CGF.CXXABIThisValue = ThisPtr;
 }
 

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
@@ -225,7 +225,7 @@ CodeGenFunction::GetAddressOfDirectBaseInCompleteClass(Address This,
                                                    const CXXRecordDecl *Base,
                                                    bool BaseIsVirtual) {
   // 'this' must be a pointer (in some address space) to Derived.
-  assert(This.getElementType() == ConvertType(Derived));
+  assert_DISABLED(This.getElementType() == ConvertType(Derived));
 
   // Compute the offset of the virtual base.
   CharUnits Offset;

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
@@ -2178,7 +2178,7 @@ CodeGenFunction::getDestroyer(QualType::DestructionKind kind) {
 void CodeGenFunction::pushEHDestroy(QualType::DestructionKind dtorKind,
                                     Address addr, QualType type) {
   assert(dtorKind && "cannot push destructor for trivial type");
-  assert(needsEHCleanup(dtorKind));
+  assert_DISABLED(needsEHCleanup(dtorKind));
 
   pushDestroy(EHCleanup, addr, type, getDestroyer(dtorKind), true);
 }

diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp
@@ -736,7 +736,7 @@ void CodeGenModule::EmitCXXModuleInitFunc(Module *Primary) {
       cast<ItaniumMangleContext>(getCXXABI().getMangleContext())
           .mangleModuleInitializer(M, Out);
     }
-    assert(!GetGlobalValue(FnName.str()) &&
+    assert_DISABLED(!GetGlobalValue(FnName.str()) &&
            "We should only have one use of the initializer call");
     llvm::Function *Fn = llvm::Function::Create(
         FTy, llvm::Function::ExternalLinkage, FnName.str(), &getModule());
@@ -879,7 +879,7 @@ CodeGenModule::EmitCXXGlobalInitFunc() {
         cast<ItaniumMangleContext>(getCXXABI().getMangleContext())
             .mangleModuleInitializer(M, Out);
       }
-      assert(!GetGlobalValue(FnName.str()) &&
+      assert_DISABLED(!GetGlobalValue(FnName.str()) &&
              "We should only have one use of the initializer call");
       llvm::Function *Fn = llvm::Function::Create(
           FTy, llvm::Function::ExternalLinkage, FnName.str(), &getModule());

diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp
@@ -876,7 +876,7 @@ llvm::BasicBlock *CodeGenFunction::EmitLandingPad() {
       continue;
 
     case EHScope::Filter: {
-      assert(I.next() == EHStack.end() && "EH filter is not end of EH stack");
+      assert_DISABLED(I.next() == EHStack.end() && "EH filter is not end of EH stack");
       assert(!hasCatchAll && "EH filter reached after catch-all");
 
       // Filter scopes get added to the landingpad in weird ways.
@@ -1440,9 +1440,9 @@ void CodeGenFunction::FinallyInfo::enter(CodeGenFunction &CGF, const Stmt *body,
                                          llvm::FunctionCallee beginCatchFn,
                                          llvm::FunctionCallee endCatchFn,
                                          llvm::FunctionCallee rethrowFn) {
-  assert((!!beginCatchFn) == (!!endCatchFn) &&
+  assert_DISABLED((!!beginCatchFn) == (!!endCatchFn) &&
          "begin/end catch functions not paired");
-  assert(rethrowFn && "rethrow function is required");
+  assert_DISABLED(rethrowFn && "rethrow function is required");
 
   BeginCatchFn = beginCatchFn;
 
@@ -1589,7 +1589,7 @@ llvm::BasicBlock *CodeGenFunction::getTerminateHandler() {
 }
 
 llvm::BasicBlock *CodeGenFunction::getTerminateFunclet() {
-  assert(EHPersonality::get(*this).usesFuncletPads() &&
+  assert_DISABLED(EHPersonality::get(*this).usesFuncletPads() &&
          "use getTerminateLandingPad for non-funclet EH");
 
   llvm::BasicBlock *&TerminateFunclet = TerminateFunclets[CurrentFuncletPad];