mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust lifetimes and fix incorrect use of ParserError::isValid()

Browse Source
This commit is contained in:
Kai Tamkun
2025-04-30 15:29:54 -07:00
parent cbd5e1be5c
commit 66355712eb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bun.js/bindings/NodeVM.cpp
View File

@@ -451,6 +451,7 @@ public:
JSC::JSUint8Array* getBytecodeBuffer();
const JSC::SourceCode& source() const { return m_source; }
std::vector<uint8_t>& cachedData() { return m_options.cachedData; }
RefPtr<JSC::CachedBytecode> cachedBytecode() const { return m_cachedBytecode; }
JSC::ProgramExecutable* cachedExecutable() const { return m_cachedExecutable.get(); }
bool cachedDataProduced() const { return m_cachedDataProduced; }
@@ -768,11 +769,12 @@ constructScript(JSGlobalObject* globalObject, CallFrame* callFrame, JSValue newT
RETURN_IF_EXCEPTION(scope, {});
const bool produceCachedData = options.produceCachedData;
auto cachedData = WTFMove(options.cachedData);
auto filename = options.filename;
NodeVMScript* script = NodeVMScript::create(vm, globalObject, structure, source, WTFMove(options));
std::vector<uint8_t>& cachedData = script->cachedData();
if (!cachedData.empty()) {
JSC::ProgramExecutable* executable = script->cachedExecutable();
if (!executable) {
@@ -782,7 +784,7 @@ constructScript(JSGlobalObject* globalObject, CallFrame* callFrame, JSValue newT
JSC::LexicallyScopedFeatures lexicallyScopedFeatures = globalObject->globalScopeExtension() ? JSC::TaintedByWithScopeLexicallyScopedFeature : JSC::NoLexicallyScopedFeatures;
JSC::SourceCodeKey key(source, {}, JSC::SourceCodeType::ProgramType, lexicallyScopedFeatures, JSC::JSParserScriptMode::Classic, JSC::DerivedContextType::None, JSC::EvalContextType::None, false, {}, std::nullopt);
Ref<JSC::CachedBytecode> cachedBytecode = JSC::CachedBytecode::create(cachedData, nullptr, {});
Ref<JSC::CachedBytecode> cachedBytecode = JSC::CachedBytecode::create(std::span(cachedData), nullptr, {});
JSC::UnlinkedProgramCodeBlock* unlinkedBlock = JSC::decodeCodeBlock<UnlinkedProgramCodeBlock>(vm, key, WTFMove(cachedBytecode));
if (!unlinkedBlock) {
@@ -1776,7 +1778,7 @@ static RefPtr<JSC::CachedBytecode> getBytecode(JSGlobalObject* globalObject, JSC
JSC::CodeCache* cache = vm.codeCache();
JSC::ParserError parserError;
JSC::UnlinkedProgramCodeBlock* unlinked = cache->getUnlinkedProgramCodeBlock(vm, executable, source, {}, parserError);
if (!unlinked || !parserError.isValid()) {
if (!unlinked || parserError.isValid()) {
return nullptr;
}
JSC::LexicallyScopedFeatures lexicallyScopedFeatures = globalObject->globalScopeExtension() ? TaintedByWithScopeLexicallyScopedFeature : NoLexicallyScopedFeatures;