Call std::terminate on pure or deleted virtual functions

matthijskooijman · matthijskooijman · commit 66d06b033c3f · 2020-09-17T20:01:29.000+02:00
These are special functions that are presumably put into vtables for
deleted or pure virtual functions. Previously, this would call `abort()`
directly, but calling `std::terminate()` achieves the same effect, but
allows user code to change the behavior (e.g. to print to serial, blink
leds or whatever makes sense).
diff --git a/cores/arduino/abi.cpp b/cores/arduino/abi.cpp
@@ -28,14 +28,9 @@ namespace std {
 }
 
 void __cxa_pure_virtual(void) {
-  // We might want to write some diagnostics to uart in this case
-  //std::terminate();
-  abort();
+  std::terminate();
 }
 
 void __cxa_deleted_virtual(void) {
-  // We might want to write some diagnostics to uart in this case
-  //std::terminate();
-  abort();
+  std::terminate();
 }
-

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,9 @@ namespace std {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`void __cxa_pure_virtual(void) {`
`31`		`- // We might want to write some diagnostics to uart in this case`
`32`		`- //std::terminate();`
`33`		`- abort();`
	`31`	`+ std::terminate();`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`void __cxa_deleted_virtual(void) {`
`37`		`- // We might want to write some diagnostics to uart in this case`
`38`		`- //std::terminate();`
`39`		`- abort();`
	`35`	`+ std::terminate();`
`40`	`36`	`}`
`41`		`-`