Merge pull request #3325 from tautschnig/vs-shadow-6

kroening · web-flow · commit 015765250566 · 2018-11-10T13:44:02.000Z
Do not shadow local variable l [blocks: #2310]
diff --git a/src/util/expr.cpp b/src/util/expr.cpp
@@ -283,9 +283,9 @@ const source_locationt &exprt::find_source_location() const
 
   forall_operands(it, (*this))
   {
-    const source_locationt &l=it->find_source_location();
-    if(l.is_not_nil())
-      return l;
+    const source_locationt &op_l = it->find_source_location();
+    if(op_l.is_not_nil())
+      return op_l;
   }
 
   return static_cast<const source_locationt &>(get_nil_irep());

Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,9 @@ const source_locationt &exprt::find_source_location() const`
`283`	`283`
`284`	`284`	`forall_operands(it, (*this))`
`285`	`285`	`{`
`286`		`- const source_locationt &l=it->find_source_location();`
`287`		`- if(l.is_not_nil())`
`288`		`- return l;`
	`286`	`+ const source_locationt &op_l = it->find_source_location();`
	`287`	`+ if(op_l.is_not_nil())`
	`288`	`+ return op_l;`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`return static_cast<const source_locationt &>(get_nil_irep());`