src: improve CompileFunctionAndCacheResult error handling

PR-URL: #58434 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: Darshan Sen <[email protected]>

Author: legendecas

src/node_contextify.cc

@@ -1501,24 +1501,22 @@ void ContextifyContext::CompileFunction(
  }
 
  TryCatchScope try_catch(env);
- Local<Object> result = CompileFunctionAndCacheResult(env,
- parsing_context,
- &source,
- params,
- context_extensions,
- options,
- produce_cached_data,
- id_symbol,
- try_catch);
-
-if (try_catch.HasCaught() && !try_catch.HasTerminated()){
+ MaybeLocal<Object> maybe_result =
+CompileFunctionAndCacheResult(env,
+ parsing_context,
+ &source,
+ params,
+ context_extensions,
+ options,
+ produce_cached_data,
+ id_symbol,
+ try_catch);
+ Local<Object> result;
+if (!maybe_result.ToLocal(&result)){
+CHECK(try_catch.HasCaught());
  try_catch.ReThrow();
 return;
  }
-
-if (result.IsEmpty()){
-return;
- }
  args.GetReturnValue().Set(result);
 }
 
@@ -1534,7 +1532,7 @@ static LocalVector<String> GetCJSParameters(IsolateData* data){
 return result;
 }
 
-Local<Object> ContextifyContext::CompileFunctionAndCacheResult(
+MaybeLocal<Object> ContextifyContext::CompileFunctionAndCacheResult(
  Environment* env,
  Local<Context> parsing_context,
  ScriptCompiler::Source* source,
@@ -1556,28 +1554,29 @@ Local<Object> ContextifyContext::CompileFunctionAndCacheResult(
 
  Local<Function> fn;
 if (!maybe_fn.ToLocal(&fn)){
-if (try_catch.HasCaught() && !try_catch.HasTerminated()){
+CHECK(try_catch.HasCaught());
+if (!try_catch.HasTerminated()){
 errors::DecorateErrorStack(env, try_catch);
-returnObject::New(env->isolate());
  }
+return{};
  }
 
  Local<Context> context = env->context();
 if (fn->SetPrivate(context, env->host_defined_option_symbol(), id_symbol)
  .IsNothing()){
-returnObject::New(env->isolate());
+return{};
  }
 
  Isolate* isolate = env->isolate();
  Local<Object> result = Object::New(isolate);
 if (result->Set(parsing_context, env->function_string(), fn).IsNothing())
-returnObject::New(env->isolate());
+return{};
 if (result
  ->Set(parsing_context,
  env->source_map_url_string(),
  fn->GetScriptOrigin().SourceMapUrl())
  .IsNothing())
-returnObject::New(env->isolate());
+return{};
 
  std::unique_ptr<ScriptCompiler::CachedData> new_cached_data;
 if (produce_cached_data){
@@ -1590,7 +1589,7 @@ Local<Object> ContextifyContext::CompileFunctionAndCacheResult(
  produce_cached_data,
 std::move(new_cached_data))
  .IsNothing()){
-returnObject::New(env->isolate());
+return{};
  }
 
 return result;

src/node_contextify.h

@@ -88,7 +88,7 @@ class ContextifyContext : public BaseObject{
 staticvoidIsContext(const v8::FunctionCallbackInfo<v8::Value>& args);
 staticvoidCompileFunction(
 const v8::FunctionCallbackInfo<v8::Value>& args);
-static v8::Local<v8::Object> CompileFunctionAndCacheResult(
+static v8::MaybeLocal<v8::Object> CompileFunctionAndCacheResult(
  Environment* env,
  v8::Local<v8::Context> parsing_context,
  v8::ScriptCompiler::Source* source,