Merge pull request #8446 from huonw/no-side-effects-in-asserts

huonw · web-flow · commit a2644a5e8e84 · 2017-03-31T09:53:41.000-07:00
[TBDGen] Side-effects and asserts don't mix.
diff --git a/lib/TBDGen/TBDGen.cpp b/lib/TBDGen/TBDGen.cpp
@@ -37,7 +37,9 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
   StringSet &Symbols;
 
   void addSymbol(StringRef name) {
-    assert(Symbols.insert(name).second && "already inserted");
+    auto isNewValue = Symbols.insert(name).second;
+    (void)isNewValue;
+    assert(isNewValue && "already inserted");
   }
 
   void visitValueTypeDecl(NominalTypeDecl *NTD) {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {`
`37`	`37`	`StringSet &Symbols;`
`38`	`38`
`39`	`39`	`void addSymbol(StringRef name) {`
`40`		`- assert(Symbols.insert(name).second && "already inserted");`
	`40`	`+ auto isNewValue = Symbols.insert(name).second;`
	`41`	`+ (void)isNewValue;`
	`42`	`+ assert(isNewValue && "already inserted");`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`void visitValueTypeDecl(NominalTypeDecl *NTD) {`