Accessing after move is useless.

dok-net · dok-net · commit 8d880b17c95f · 2020-10-22T19:12:19.000+02:00
diff --git a/cores/esp8266/core_esp8266_wiring_digital.cpp b/cores/esp8266/core_esp8266_wiring_digital.cpp
@@ -121,11 +121,11 @@ namespace
 
     void ICACHE_RAM_ATTR set_interrupt_handlers(uint8_t pin, voidFuncPtr userFunc, uint8_t mode)
     {
-        interrupt_handler_t* handler = &interrupt_handlers[pin];
-        handler->fn = userFunc;
-        handler->functional = nullptr;
-        if (userFunc)
-            handler->mode = mode;
+        interrupt_handler_t& handler = interrupt_handlers[pin];
+        handler.fn = userFunc;
+        handler.functional = nullptr;
+        if (handler.fn)
+            handler.mode = mode;
     }
 
     void ICACHE_RAM_ATTR interrupt_handler(void *arg, void *frame)
@@ -251,11 +251,11 @@ namespace
 {
     void set_interrupt_handlers(uint8_t pin, std::function<void()>&& userFunc, uint8_t mode)
     {
-        interrupt_handler_t* handler = &interrupt_handlers[pin];
-        handler->fn = nullptr;
-        handler->functional = std::move(userFunc);
-        if (userFunc)
-            handler->mode = mode;
+        interrupt_handler_t& handler = interrupt_handlers[pin];
+        handler.fn = nullptr;
+        handler.functional = std::move(userFunc);
+        if (handler.functional)
+            handler.mode = mode;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,11 @@ namespace`
`121`	`121`
`122`	`122`	`void ICACHE_RAM_ATTR set_interrupt_handlers(uint8_t pin, voidFuncPtr userFunc, uint8_t mode)`
`123`	`123`	`{`
`124`		`- interrupt_handler_t* handler = &interrupt_handlers[pin];`
`125`		`- handler->fn = userFunc;`
`126`		`- handler->functional = nullptr;`
`127`		`- if (userFunc)`
`128`		`- handler->mode = mode;`
	`124`	`+ interrupt_handler_t& handler = interrupt_handlers[pin];`
	`125`	`+ handler.fn = userFunc;`
	`126`	`+ handler.functional = nullptr;`
	`127`	`+ if (handler.fn)`
	`128`	`+ handler.mode = mode;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`void ICACHE_RAM_ATTR interrupt_handler(void arg, void frame)`
`@@ -251,11 +251,11 @@ namespace`
`251`	`251`	`{`
`252`	`252`	`void set_interrupt_handlers(uint8_t pin, std::function<void()>&& userFunc, uint8_t mode)`
`253`	`253`	`{`
`254`		`- interrupt_handler_t* handler = &interrupt_handlers[pin];`
`255`		`- handler->fn = nullptr;`
`256`		`- handler->functional = std::move(userFunc);`
`257`		`- if (userFunc)`
`258`		`- handler->mode = mode;`
	`254`	`+ interrupt_handler_t& handler = interrupt_handlers[pin];`
	`255`	`+ handler.fn = nullptr;`
	`256`	`+ handler.functional = std::move(userFunc);`
	`257`	`+ if (handler.functional)`
	`258`	`+ handler.mode = mode;`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`