fix bug when merging Classifications that was clobbering IsAsync

kavon · kavon · commit 0c352beb868f · 2020-11-03T16:57:10.000-08:00
diff --git a/lib/Sema/TypeCheckEffects.cpp b/lib/Sema/TypeCheckEffects.cpp
@@ -404,9 +404,12 @@ class Classification {
   }
 
   void merge(Classification other) {
+    bool oldAsync = IsAsync;
+    
     if (other.getResult() > getResult())
       *this = other;
-    IsAsync |= other.IsAsync;
+
+    IsAsync = oldAsync | other.IsAsync;
   }
 
   bool isInvalid() const { return IsInvalid; }

Original file line number	Diff line number	Diff line change
`@@ -404,9 +404,12 @@ class Classification {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`void merge(Classification other) {`
	`407`	`+ bool oldAsync = IsAsync;`
	`408`	`+`
`407`	`409`	`if (other.getResult() > getResult())`
`408`	`410`	`*this = other;`
`409`		`- IsAsync \|= other.IsAsync;`
	`411`	`+`
	`412`	`+ IsAsync = oldAsync \| other.IsAsync;`
`410`	`413`	`}`
`411`	`414`
`412`	`415`	`bool isInvalid() const { return IsInvalid; }`