Skip to content
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

Don't throw exceptions from operator new by default #6312

Merged
merged 3 commits into from
Jul 23, 2019
Merged

Don't throw exceptions from operator new by default #6312

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fba3f5c
Don't throw exceptions from operator new by default
earlephilhower Jul 18, 2019
9f7cfbf
Merge branch 'master' into nonewsgnus
earlephilhower Jul 18, 2019
02858bf
Merge branch 'master' into nonewsgnus
d-a-v Jul 23, 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
23 changes: 23 additions & 0 deletions cores/esp8266/abi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,29 @@ extern int umm_last_fail_alloc_size;
extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));


#ifndef __cpp_exceptions
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;
}
#endif

void __cxa_pure_virtual(void)
{
panic();
Expand Down