Skip to content

operator new: no exception without need for std::nothrow #6309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

operator new: no exception without need for std::nothrow #6309

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a2d5d0
operator new: overload operator new so it can return nullptr instead …
d-a-v Jul 17, 2019
29b49cd
update umm helpers for stack trace
d-a-v Jul 18, 2019
eee43ff
reorder include files so Arduino.h is included before c++ <new>
d-a-v Jul 18, 2019
da5f8cd
(no need to be rude)
d-a-v Jul 18, 2019
319c789
more Arduino.h
d-a-v Jul 18, 2019
b7f641b
more Arduino.h
d-a-v Jul 18, 2019
a65862c
more Arduino.h
d-a-v Jul 18, 2019
ed2d005
more Arduino.h
d-a-v Jul 18, 2019
fb6ffad
allow external build scripts to permanently hide the warning
d-a-v Jul 18, 2019
00c8242
more reordering
d-a-v Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions cores/esp8266/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,25 @@ extern "C" {
#include <string.h>
#include <math.h>

#if defined(__cplusplus) && !defined(__cpp_exceptions)
// this is a hack working with gcc4.8
// Overload operator new so it can return nullptr instead of throwing an
// exception without (std::nothrow)`
// Requirement (or the constructor is called even on nullptr)
// - "noexcept" is needed
// - "#include <new>" must not be done *before* these definitions
#include <bits/c++config.h>
extern "C++" inline void* operator new (std::size_t size) noexcept
{
return malloc(size);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check out the old new() and new override, it sets the last-failed-alloc address which this needs to do as well:

Arduino/cores/esp8266/abi.cpp

Lines 31 to 49 in bb28d4a

void *operator new(size_t size)
{
void *ret = malloc(size);
if (0 != size && 0 == ret) {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = size;
}
return ret;
}
void *operator new[](size_t size)
{
void *ret = malloc(size);
if (0 != size && 0 == ret) {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = size;
}
return ret;
}

}
extern "C++" inline void* operator new [] (std::size_t size) noexcept
{
return malloc(size);
}
#include <new>
#endif // new nothrow nullptr hack

#include "stdlib_noniso.h"
#include "binary.h"
#include "esp8266_peri.h"
Expand Down