Merge pull request #3329 from tautschnig/vs-shadow-8

tautschnig · web-flow · commit bafbb514403a · 2018-11-10T14:24:05.000Z
Do not shadow symbol with writable copy of it [blocks: #2310]
diff --git a/src/linking/static_lifetime_init.cpp b/src/linking/static_lifetime_init.cpp
@@ -99,9 +99,9 @@ void static_lifetime_init(
     {
       // C standard 6.9.2, paragraph 5
       // adjust the type to an array of size 1
-      symbolt &symbol=*symbol_table.get_writeable(identifier);
-      symbol.type=type;
-      symbol.type.set(ID_size, from_integer(1, size_type()));
+      symbolt &writable_symbol = *symbol_table.get_writeable(identifier);
+      writable_symbol.type = type;
+      writable_symbol.type.set(ID_size, from_integer(1, size_type()));
     }
 
     if(type.id()==ID_incomplete_struct ||

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,9 @@ void static_lifetime_init(`
`99`	`99`	`{`
`100`	`100`	`// C standard 6.9.2, paragraph 5`
`101`	`101`	`// adjust the type to an array of size 1`
`102`		`- symbolt &symbol=*symbol_table.get_writeable(identifier);`
`103`		`- symbol.type=type;`
`104`		`- symbol.type.set(ID_size, from_integer(1, size_type()));`
	`102`	`+ symbolt &writable_symbol = *symbol_table.get_writeable(identifier);`
	`103`	`+ writable_symbol.type = type;`
	`104`	`+ writable_symbol.type.set(ID_size, from_integer(1, size_type()));`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`if(type.id()==ID_incomplete_struct \|\|`