Commit bf9cdfc2 authored by David McFarland's avatar David McFarland
Browse files

dotnetCorePackages.dotnet_8.vmr: fix build on llvm 19 

This is a backport of [1], which fixes:

> comreflectioncache.hpp:40:15: error: no member named 'EnterRead' in 'ReflectionCache<Element, CacheType, CacheSize>'; did you mean 'TryEnterRead'?

[1] https://github.com/dotnet/runtime/commit/043ae8c50dbe1c7377cf5ad436c5ac1c226aef79
parent 8c30dd41

pkgs/development/compilers/dotnet/fix-clang19-build.patch

0 → 100644
+48 −0
Original line number Diff line number Diff line 
From 36354a7aca58753893148d62a889ca9e27381ac0 Mon Sep 17 00:00:00 2001

From: David McFarland <corngood@gmail.com>

Date: Thu, 2 Jan 2025 15:30:16 -0400

Subject: [PATCH] fix clang19 build



---

 src/runtime/src/coreclr/vm/comreflectioncache.hpp | 4 ++++

 1 file changed, 4 insertions(+)



diff --git a/src/runtime/src/coreclr/vm/comreflectioncache.hpp b/src/runtime/src/coreclr/vm/comreflectioncache.hpp

index 08d173e616..12db55251d 100644

--- a/src/runtime/src/coreclr/vm/comreflectioncache.hpp

+++ b/src/runtime/src/coreclr/vm/comreflectioncache.hpp

@@ -26,6 +26,7 @@ public:

 

     void Init();

 

+#ifndef DACCESS_COMPILE

     BOOL GetFromCache(Element *pElement, CacheType& rv)

     {

         CONTRACTL

@@ -102,6 +103,7 @@ public:

         AdjustStamp(TRUE);

         this->LeaveWrite();

     }

+#endif // !DACCESS_COMPILE

 

 private:

     // Lock must have been taken before calling this.

@@ -141,6 +143,7 @@ private:

         return CacheSize;

     }

 

+#ifndef DACCESS_COMPILE

     void AdjustStamp(BOOL hasWriterLock)

     {

         CONTRACTL

@@ -170,6 +173,7 @@ private:

         if (!hasWriterLock)

             this->LeaveWrite();

     }

+#endif // !DACCESS_COMPILE

 

     void UpdateHashTable(SIZE_T hash, int slot)

     {

-- 

2.47.0

pkgs/development/compilers/dotnet/vmr.nix

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ stdenv.mkDerivation rec { 
    ]

    ++ lib.optionals (lib.versionOlder version "9") [

      ./fix-aspnetcore-portable-build.patch

      ./fix-clang19-build.patch

    ];



  postPatch =