Merge pull request #18712 from xedin/fix-asan-failure-in-cs

xedin · web-flow · commit bc3189a2d265 · 2018-08-14T20:47:13.000-07:00
[ConstraintSystem] Don't try to eagerly deallocate fixes
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -4930,8 +4930,6 @@ bool ConstraintSystem::recordFix(ConstraintFix *fix) {
 
   if (existingFix == Fixes.end())
     Fixes.push_back(fix);
-  else // if fix couldn't be recorded, it means that it's no longer needed.
-    Allocator.Deallocate(fix);
 
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -4930,8 +4930,6 @@ bool ConstraintSystem::recordFix(ConstraintFix *fix) {`
`4930`	`4930`
`4931`	`4931`	`if (existingFix == Fixes.end())`
`4932`	`4932`	`Fixes.push_back(fix);`
`4933`		`- else // if fix couldn't be recorded, it means that it's no longer needed.`
`4934`		`- Allocator.Deallocate(fix);`
`4935`	`4933`
`4936`	`4934`	`return false;`
`4937`	`4935`	`}`