Skip to content

Fix two crash bugs on Apple Silicon #6008

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

Merged
ssheorey merged 2 commits into from
Mar 18, 2023
Merged

Fix two crash bugs on Apple Silicon #6008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8be73a8
Remove -nocompact_unwind and suppress warnings instead
errissa Mar 17, 2023
40fedc5
Fix crash bug on Apple Silicon (might be Ventura-only)
errissa Mar 18, 2023
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
7 changes: 6 additions & 1 deletion 3rdparty/find_dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,12 @@ else() # if(OPEN3D_USE_ONEAPI_PACKAGES)
target_link_libraries(3rdparty_blas INTERFACE
${quadmath_lib})
# Suppress Apple compiler warnigns.
target_link_options(3rdparty_blas INTERFACE "-Wl,-no_compact_unwind")
if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
message(WARNING "All link warnings have been disabled on Apple Silicon builds "
"due to the large number of spurious warnings that are generated. If you "
"need to see link warnings please build with -DCMAKE_BUILD_TYPE=Debug.")
target_link_options(3rdparty_blas INTERFACE "-Wl,-w")
endif()
endif()
elseif(UNIX AND NOT APPLE)
# On Ubuntu 20.04 x86-64, libgfortran.a is not compiled with `-fPIC`.
Expand Down
13 changes: 8 additions & 5 deletions cpp/open3d/visualization/gui/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,18 +454,21 @@ void Application::AddWindow(std::shared_ptr<Window> window) {
}

void Application::RemoveWindow(Window *window) {
if (impl_->should_quit_) {
return;
}

for (auto it = impl_->windows_.begin(); it != impl_->windows_.end(); ++it) {
if (it->get() == window) {
window->Show(false);
impl_->windows_to_be_destroyed_.insert(*it);
impl_->windows_.erase(it);
if (impl_->windows_.empty()) {
impl_->should_quit_ = true;
}
break;
}
}

if (impl_->windows_.empty()) {
impl_->should_quit_ = true;
}
window->Show(false);
}

void Application::Quit() {
Expand Down