From 6dc9aeb104b58c43325ef52d92cda9df56425ce4 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Tue, 18 Feb 2025 09:51:16 -0800 Subject: [PATCH] More BF_RUNTIME_DISABLE fixes --- BeefLibs/corlib/src/Diagnostics/Debug.bf | 12 ++++++------ BeefLibs/corlib/src/Internal.bf | 2 +- BeefLibs/corlib/src/Type.bf | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BeefLibs/corlib/src/Diagnostics/Debug.bf b/BeefLibs/corlib/src/Diagnostics/Debug.bf index 66d8537a..81e86c18 100644 --- a/BeefLibs/corlib/src/Diagnostics/Debug.bf +++ b/BeefLibs/corlib/src/Diagnostics/Debug.bf @@ -44,18 +44,18 @@ namespace System.Diagnostics #endif } -#if BF_ENABLE_OBJECT_DEBUG_FLAGS +#if !BF_RUNTIME_DISABLE + [CallingConvention(.Cdecl)] + static extern void Write(char8* str, int strLen); + [CallingConvention(.Cdecl)] + static extern void Write(int val); +#else static void Write(char8* str, int strLen) { } static void Write(int val) { } -#else - [CallingConvention(.Cdecl)] - static extern void Write(char8* str, int strLen); - [CallingConvention(.Cdecl)] - static extern void Write(int val); #endif public static void Write(String line) diff --git a/BeefLibs/corlib/src/Internal.bf b/BeefLibs/corlib/src/Internal.bf index efbad488..1a6c00ad 100644 --- a/BeefLibs/corlib/src/Internal.bf +++ b/BeefLibs/corlib/src/Internal.bf @@ -669,7 +669,7 @@ namespace System return null; } - public static Object Dbg_ObjectAlloc(ClassVData* classVData, int size, int align, int maxStackTraceDepth) + public static Object Dbg_ObjectAlloc(ClassVData* classVData, int size, int align, int maxStackTraceDepth, uint8 flags) { return null; } diff --git a/BeefLibs/corlib/src/Type.bf b/BeefLibs/corlib/src/Type.bf index 888e0184..5bb91e66 100644 --- a/BeefLibs/corlib/src/Type.bf +++ b/BeefLibs/corlib/src/Type.bf @@ -1714,7 +1714,7 @@ namespace System.Reflection int32 stackCount = Compiler.Options.AllocStackCount; if (mAllocStackCountOverride != 0) stackCount = mAllocStackCountOverride; - obj = Internal.Dbg_ObjectAlloc([Friend]mTypeClassVData, arraySize, [Friend]mInstAlign, stackCount); + obj = Internal.Dbg_ObjectAlloc([Friend]mTypeClassVData, arraySize, [Friend]mInstAlign, stackCount, 0); #else void* mem = new [Align(16)] uint8[arraySize]* (?); obj = Internal.UnsafeCastToObject(mem);