Support debugging non-private builtin functions

oven-sh · Nov 6, 2024 · 737c1a9 · 737c1a9
1 parent 8ac9b8c
commit 737c1a9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -441,6 +441,9 @@ BytecodeGenerator::BytecodeGenerator(VM& vm, FunctionNode* functionNode, Unlinke
     , m_ecmaMode(ECMAMode::fromBool(functionNode->isStrictMode()))
     , m_derivedContextType(codeBlock->derivedContextType())
 {
+#if USE(BUN_JSC_ADDITIONS)
+    m_isPrivateBuiltinFunction = m_isBuiltinFunction && (!m_scopeNode->source().provider() || !m_scopeNode->source().provider()->sourceURL());
+#endif
     ECMAMode ecmaMode = m_ecmaMode;
     pushPrivateAccessNames(parentPrivateNameEnvironment);
 

diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
@@ -606,7 +606,7 @@ namespace JSC {
             if (!divot || !divotStart || !divotEnd)
                 return;
 
-            if (m_isBuiltinFunction)
+            if (isPrivateBuiltinFunction())
                 return;
 
             unsigned sourceOffset = m_scopeNode->source().startOffset();
@@ -1072,7 +1072,7 @@ namespace JSC {
 
         bool shouldBeConcernedWithCompletionValue() const { return !m_defaultAllowCallIgnoreResultOptimization; }
 
-        bool shouldEmitDebugHooks() const { return m_codeGenerationMode.contains(CodeGenerationMode::Debugger) && !m_isBuiltinFunction; }
+        bool shouldEmitDebugHooks() const { return m_codeGenerationMode.contains(CodeGenerationMode::Debugger) && !isPrivateBuiltinFunction(); }
         bool shouldEmitTypeProfilerHooks() const { return m_codeGenerationMode.contains(CodeGenerationMode::TypeProfiler); }
         bool shouldEmitControlFlowProfilerHooks() const { return m_codeGenerationMode.contains(CodeGenerationMode::ControlFlowProfiler); }
 
@@ -1082,6 +1082,11 @@ namespace JSC {
         SourceParseMode parseMode() const { return m_codeBlock->parseMode(); }
 
         bool isBuiltinFunction() const { return m_isBuiltinFunction; }
+#if USE(BUN_JSC_ADDITIONS)
+        bool isPrivateBuiltinFunction() const { return m_isPrivateBuiltinFunction; }
+#else
+        bool isPrivateBuiltinFunction() const { return isBuiltinFunction(); }
+#endif
 
         OpcodeID lastOpcodeID() const { return m_lastOpcodeID; }
 
@@ -1397,6 +1402,9 @@ namespace JSC {
         bool m_usesExceptions { false };
         bool m_expressionTooDeep { false };
         bool m_isBuiltinFunction { false };
+#if USE(BUN_JSC_ADDITIONS)
+        bool m_isPrivateBuiltinFunction { false };
+#endif
         bool m_usesSloppyEval { false };
         bool m_allowTailCallOptimization { false };
         bool m_allowCallIgnoreResultOptimization { false };

diff --git a/Source/JavaScriptCore/interpreter/CallFrame.cpp b/Source/JavaScriptCore/interpreter/CallFrame.cpp
@@ -200,7 +200,7 @@ SourceOrigin CallFrame::callerSourceOrigin(VM& vm)
             // In the above case, the eval function will be interpreted as the indirect call to eval inside forEach function.
             // At that time, the generated eval code should have the source origin to the original caller of the forEach function
             // instead of the source origin of the forEach function.
-            if (static_cast<FunctionExecutable*>(visitor->codeBlock()->ownerExecutable())->isBuiltinFunction())
+            if (static_cast<FunctionExecutable*>(visitor->codeBlock()->ownerExecutable())->isPrivateBuiltinFunction())
                 return IterationStatus::Continue;
             FALLTHROUGH;
 

diff --git a/Source/JavaScriptCore/runtime/FunctionExecutable.cpp b/Source/JavaScriptCore/runtime/FunctionExecutable.cpp
@@ -172,7 +172,11 @@ JSString* FunctionExecutable::toStringSlow(JSGlobalObject* globalObject)
         return cache(::JSC::asString(value));
     };
 
+#if USE(BUN_JSC_ADDITIONS)
+    if (isPrivateBuiltinFunction())
+#else
     if (isBuiltinFunction())
+#endif
         return cacheIfNoException(jsMakeNontrivialString(globalObject, "function "_s, name().string(), "() {\n    [native code]\n}"_s));
 
     if (isClass())

diff --git a/Source/JavaScriptCore/runtime/FunctionExecutable.h b/Source/JavaScriptCore/runtime/FunctionExecutable.h
@@ -131,6 +131,7 @@ class FunctionExecutable final : public ScriptExecutable {
     FunctionMode functionMode() { return m_unlinkedExecutable->functionMode(); }
     ImplementationVisibility implementationVisibility() const { return m_unlinkedExecutable->implementationVisibility(); }
     bool isBuiltinFunction() const { return m_unlinkedExecutable->isBuiltinFunction(); }
+    bool isPrivateBuiltinFunction() const { return isBuiltinFunction() && (!m_source.provider() || !m_source.provider()->sourceURL()); }
     ConstructAbility constructAbility() const { return m_unlinkedExecutable->constructAbility(); }
     InlineAttribute inlineAttribute() const { return m_unlinkedExecutable->inlineAttribute(); }
     bool isClass() const { return m_unlinkedExecutable->isClass(); }