Skip to content

Commit 12355e7

Browse files
authored
Merge pull request #10880 from hercules-ci/bdwgc-8.2.6-has-sp-corrector
bdw-gc 8.2.6 has sp corrector
2 parents 0ab9369 + f91f34a commit 12355e7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/libexpr/eval-cache.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct CachedEvalError : EvalError
3131
class EvalCache : public std::enable_shared_from_this<EvalCache>
3232
{
3333
friend class AttrCursor;
34-
friend class CachedEvalError;
34+
friend struct CachedEvalError;
3535

3636
std::shared_ptr<AttrDb> db;
3737
EvalState & state;
@@ -87,7 +87,7 @@ typedef std::variant<
8787
class AttrCursor : public std::enable_shared_from_this<AttrCursor>
8888
{
8989
friend class EvalCache;
90-
friend class CachedEvalError;
90+
friend struct CachedEvalError;
9191

9292
ref<EvalCache> root;
9393
typedef std::optional<std::pair<std::shared_ptr<AttrCursor>, Symbol>> Parent;

src/libexpr/eval.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ void initGC()
354354
// TODO: Remove __APPLE__ condition.
355355
// Comment suggests an implementation that works on darwin and windows
356356
// https://github.com/ivmai/bdwgc/issues/362#issuecomment-1936672196
357-
#if GC_VERSION_MAJOR >= 8 && GC_VERSION_MINOR >= 4 && !defined(__APPLE__)
357+
#if GC_VERSION_MAJOR >= 8 && GC_VERSION_MINOR >= 2 && GC_VERSION_MICRO >= 4 && !defined(__APPLE__)
358358
GC_set_sp_corrector(&fixupBoehmStackPointer);
359359

360360
if (!GC_get_sp_corrector()) {
@@ -365,7 +365,7 @@ void initGC()
365365
};
366366
}
367367
#else
368-
#warning "BoehmGC version does not support GC while coroutine exists. GC will be disabled inside coroutines. Consider updating bwd-gc to 8.4 or later."
368+
#warning "BoehmGC version does not support GC while coroutine exists. GC will be disabled inside coroutines. Consider updating bdw-gc to 8.2.4 or later."
369369
#endif
370370

371371

0 commit comments

Comments
 (0)