Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit 0ca210816f93 · 2024-10-21T09:34:10.000-07:00
diff --git a/lib/Basic/Mangler.cpp b/lib/Basic/Mangler.cpp
@@ -159,7 +159,6 @@ static bool treeContains(Demangle::NodePointer Nd, Demangle::Node::Kind Kind) {
 }
 
 void Mangler::verify(StringRef nameStr) {
-#ifndef NDEBUG
   SmallString<128> buffer;
   if (!nameStr.starts_with(MANGLING_PREFIX_STR) &&
       !nameStr.starts_with("_Tt") &&
@@ -191,7 +190,6 @@ void Mangler::verify(StringRef nameStr) {
                   "original     = " << nameStr << "\n"
                   "remangled    = " << Remangled << "\n";
   abort();
-#endif
 }
 
 void Mangler::appendIdentifier(StringRef ident) {

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,6 @@ static bool treeContains(Demangle::NodePointer Nd, Demangle::Node::Kind Kind) {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`void Mangler::verify(StringRef nameStr) {`
`162`		`-#ifndef NDEBUG`
`163`	`162`	`SmallString<128> buffer;`
`164`	`163`	`if (!nameStr.starts_with(MANGLING_PREFIX_STR) &&`
`165`	`164`	`!nameStr.starts_with("_Tt") &&`
`@@ -191,7 +190,6 @@ void Mangler::verify(StringRef nameStr) {`
`191`	`190`	`"original = " << nameStr << "\n"`
`192`	`191`	`"remangled = " << Remangled << "\n";`
`193`	`192`	`abort();`
`194`		`-#endif`
`195`	`193`	`}`
`196`	`194`
`197`	`195`	`void Mangler::appendIdentifier(StringRef ident) {`