Fix memory leak in rr::Optimizer

Leak was introduced in 5ba2a5b9. There are calls to setUses(operand, nullptr) in the algorithm, that, with the latest changes, would simply replace the existing allocated Uses object with a new one. Fix it so that setUses(operand, nullptr) deletes an existing Uses object on the Operand before allocating and assigning a new one. Bug: b/145754674 Change-Id: Ie1438378595401619831a2da81d4d0d54a606f80 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40628Reviewed-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Antonio Maiorano <amaiorano@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Fix memory leak in rr::Optimizer
614a4d47 · Antonio Maiorano · 89e30f0c · 614a4d47
Commit 614a4d47 authored Jan 29, 2020 by Antonio Maiorano
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

Optimizer.cpp src/Reactor/Optimizer.cpp +7 -3

No files found.
--- a/src/Reactor/Optimizer.cpp
+++ b/src/Reactor/Optimizer.cpp
@@ -106,9 +106,8 @@ void Optimizer::run(Ice::Cfg *function)
 	for(auto operand : operandsWithUses)
 	{
-		auto uses = reinterpret_cast<Uses *>(operand->getExternalData());
+		// Deletes the Uses instance on the operand
-		delete uses;
+		setUses(operand, nullptr);
-		operand->setExternalData(nullptr);
 	}
 	operandsWithUses.clear();
 }
@@ -722,6 +721,11 @@ Optimizer::Uses *Optimizer::getUses(Ice::Operand *operand)
 void Optimizer::setUses(Ice::Operand *operand, Optimizer::Uses *uses)
 {
+	if(auto *oldUses = reinterpret_cast<Optimizer::Uses *>(operand->Ice::Operand::getExternalData()))
+	{
+		delete oldUses;
+	}
 	operand->Ice::Operand::setExternalData(uses);
 }