Skip to content

Commit

Permalink
Mac: Turn off incremental garbage collector for arm64. It"s not stabl…
Browse files Browse the repository at this point in the history
…e. Turned out that it was nevern enabled since previous versions of bdw-gc (8.2.4) didn"t support incremental mode. 8.2.6 does however, and it doesn"t seem to be stable, at least not in DEBUG mode.
  • Loading branch information
kmatheussen committed Mar 3, 2024
1 parent ece099e commit d4a6a85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Qt/Qt_Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4892,7 +4892,7 @@ int main(int argc, char **argv){
SETTINGS_init();


#if defined(FOR_MACOSX) && (defined (__arm64__) || defined (__aarch64__))
#if 0 // defined(FOR_MACOSX) && (defined (__arm64__) || defined (__aarch64__))

GC_enable_incremental(); // Always incremental under macos(arm)

Expand Down
4 changes: 2 additions & 2 deletions Qt/Qt_preferences_callbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ class Preferences : public RememberGeometryQDialog, public Ui::Preferences {
{
gcOnOff->setChecked(true);

#if defined(FOR_MACOSX) && (defined (__arm64__) || defined (__aarch64__))
#if 0 // defined(FOR_MACOSX) && (defined (__arm64__) || defined (__aarch64__))
bool incremental_gc = true;
#else
bool incremental_gc = SETTINGS_read_bool("incremental_gc",false);
Expand All @@ -578,7 +578,7 @@ class Preferences : public RememberGeometryQDialog, public Ui::Preferences {
if (incremental_gc)
incrementalGcNextTime->setDisabled(true);

#if defined(FOR_MACOSX) && (defined (__arm64__) || defined (__aarch64__))
#if 0 // defined(FOR_MACOSX) && (defined (__arm64__) || defined (__aarch64__))
R_ASSERT(incremental_gc);
gcOnOff->setDisabled(true);
incrementalGcNextTime->setDisabled(true);
Expand Down

0 comments on commit d4a6a85

Please sign in to comment.