From 98d19fa6244384f7e17998b5420d724481ed3835 Mon Sep 17 00:00:00 2001 From: dave caruso Date: Mon, 16 Oct 2023 21:22:43 -0700 Subject: fix(runtime): make some things more stable (partial jsc debug build) (#5881) * make our debug assertions work * install bun-webkit-debug * more progress * ok * progress... * more debug build stuff * ok * a * asdfghjkl * fix(runtime): fix bad assertion failure in JSBufferList * ok * stuff * upgrade webkit * Update src/bun.js/bindings/JSDOMWrapperCache.h Co-authored-by: Jarred Sumner * fix message for colin's changes * okay * fix cjs prototype * implement mainModule * i think this fixes it all --------- Co-authored-by: Jarred Sumner --- src/bun.js/modules/_NativeModule.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/bun.js/modules/_NativeModule.h') diff --git a/src/bun.js/modules/_NativeModule.h b/src/bun.js/modules/_NativeModule.h index b23906ad0..6d3d76176 100644 --- a/src/bun.js/modules/_NativeModule.h +++ b/src/bun.js/modules/_NativeModule.h @@ -40,18 +40,19 @@ // that what you passed to INIT_NATIVE_MODULE is indeed correct. #define RETURN_NATIVE_MODULE() \ ASSERT_WITH_MESSAGE(numberOfActualExportNames == passedNumberOfExportNames, \ - "NATIVE_MODULE_START() was given the incorrect value."); + "NATIVE_MODULE_START() was should be given %d", numberOfActualExportNames); -#define __NATIVE_MODULE_ASSERT_DECL \ +#define __NATIVE_MODULE_ASSERT_DECL(numberOfExportNames) \ int numberOfActualExportNames = 0; \ int passedNumberOfExportNames = numberOfExportNames; \ + #define __NATIVE_MODULE_ASSERT_INCR numberOfActualExportNames++; #else #define RETURN_NATIVE_MODULE() ; #define __NATIVE_MODULE_ASSERT_INCR ; -#define __NATIVE_MODULE_ASSERT_DECL ; +#define __NATIVE_MODULE_ASSERT_DECL(numberOfExportNames) ; #endif @@ -67,7 +68,7 @@ JSC::VM &vm = globalObject->vm(); \ JSC::JSObject *defaultObject = JSC::constructEmptyObject( \ globalObject, globalObject->objectPrototype(), numberOfExportNames); \ - __NATIVE_MODULE_ASSERT_DECL \ + __NATIVE_MODULE_ASSERT_DECL(numberOfExportNames); \ auto put = [&](JSC::Identifier name, JSC::JSValue value) { \ defaultObject->putDirect(vm, name, value); \ exportNames.append(name); \ -- cgit v1.2.3