Issue 6526 - Use Maybe<> version of soon to be deprecated API in v8 6.7

src/JsValue.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 120 matching lines @@
 {
   const JsContext context(*jsEngine);
   return Utils::StringBufferFromV8String(jsEngine->GetIsolate(), UnwrapValue());
 }
 
 int64_t AdblockPlus::JsValue::AsInt() const
 {
   const JsContext context(*jsEngine);
   auto currentContext = jsEngine->GetIsolate()->GetCurrentContext();
   auto value = UnwrapValue()->IntegerValue(currentContext);
-  return value.IsJust() ? value.FromJust() : 0;

[hub, 2018/06/22 21:32:39]

The test expect that if accessing value throw a JS exception, it returns 0,
which is the previous behaviour. With this API I get an empty Maybe<> when the
exception is thrown (see test/JsValue.cpp), so I make it return 0.

+  return CHECKED_TO_VALUE(std::move(value));

[sergei, 2018/08/07 16:47:35]

I find the usage of std::move good here too, for the sake of readability.

 }
 
 bool AdblockPlus::JsValue::AsBool() const
 {
   const JsContext context(*jsEngine);
   auto currentContext = jsEngine->GetIsolate()->GetCurrentContext();
   auto value = UnwrapValue()->BooleanValue(currentContext);
-  return value.IsJust() ? value.FromJust() : false;
+  return CHECKED_TO_VALUE(std::move(value));
 }
 
 AdblockPlus::JsValueList AdblockPlus::JsValue::AsList() const
 {
   if (!IsArray())
     throw std::runtime_error("Cannot convert a non-array to list");
 
   const JsContext context(*jsEngine);
   auto isolate = jsEngine->GetIsolate();
   auto currentContext = isolate->GetCurrentContext();
   JsValueList result;
   v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(UnwrapValue());
   uint32_t length = array->Length();
   for (uint32_t i = 0; i < length; i++)
   {
-    v8::Local<v8::Value> item = CHECKED_TO_LOCAL_NOTHROW(
+    v8::Local<v8::Value> item = CHECKED_TO_LOCAL(
       isolate, array->Get(currentContext, i));
     result.push_back(JsValue(jsEngine, item));
   }
   return result;
 }
 
 std::vector<std::string> AdblockPlus::JsValue::GetOwnPropertyNames() const
 {
   if (!IsObject())
     throw std::runtime_error("Attempting to get propert list for a non-object");
 
   const JsContext context(*jsEngine);
   auto isolate = jsEngine->GetIsolate();
   v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(UnwrapValue());
-  auto propertyNames = CHECKED_TO_LOCAL_NOTHROW(isolate,
+  auto propertyNames = CHECKED_TO_LOCAL(isolate,
     object->GetOwnPropertyNames(isolate->GetCurrentContext()));
   JsValueList properties = JsValue(jsEngine, propertyNames).AsList();
   std::vector<std::string> result;
   for (const auto& property : properties)
     result.push_back(property.AsString());
   return result;
 }
 
 
 AdblockPlus::JsValue AdblockPlus::JsValue::GetProperty(const std::string& name) const
 {
   if (!IsObject())
     throw std::runtime_error("Attempting to get property of a non-object");
 
   const JsContext context(*jsEngine);
   auto isolate = jsEngine->GetIsolate();
-  v8::Local<v8::String> property = CHECKED_TO_LOCAL_NOTHROW(
+  v8::Local<v8::String> property = CHECKED_TO_LOCAL(
     isolate, Utils::ToV8String(isolate, name));
   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
-  return JsValue(jsEngine, CHECKED_TO_LOCAL_NOTHROW(
+  return JsValue(jsEngine, CHECKED_TO_LOCAL(
     isolate, obj->Get(isolate->GetCurrentContext(), property)));
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, v8::Local<v8::Value> val)
 {
   if (!IsObject())
     throw std::runtime_error("Attempting to set property on a non-object");
   auto isolate = jsEngine->GetIsolate();
 
-  v8::Local<v8::String> property = CHECKED_TO_LOCAL_NOTHROW(
+  v8::Local<v8::String> property = CHECKED_TO_LOCAL(
     isolate, Utils::ToV8String(isolate, name));
   v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
   CHECKED_TO_VALUE(obj->Set(isolate->GetCurrentContext(), property, val));
 }
 
 v8::Local<v8::Value> AdblockPlus::JsValue::UnwrapValue() const
 {
   return v8::Local<v8::Value>::New(jsEngine->GetIsolate(), *value);
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::string& val)
 {
   const JsContext context(*jsEngine);
   auto isolate = jsEngine->GetIsolate();
 
-  SetProperty(name, CHECKED_TO_LOCAL_NOTHROW(
+  SetProperty(name, CHECKED_TO_LOCAL(
     isolate, Utils::ToV8String(jsEngine->GetIsolate(), val)));
 }
 
 void AdblockPlus::JsValue::SetStringBufferProperty(const std::string& name, const StringBuffer& val)
 {
   const JsContext context(*jsEngine);
   auto isolate = jsEngine->GetIsolate();
 
-  SetProperty(name, CHECKED_TO_LOCAL_NOTHROW(
+  SetProperty(name, CHECKED_TO_LOCAL(
     isolate, Utils::StringBufferToV8String(isolate, val)));
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val)
 {
   const JsContext context(*jsEngine);
   SetProperty(name, v8::Number::New(jsEngine->GetIsolate(), val));
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValue& val)
@@ skipping 55 matching lines @@
   if (!IsFunction())
     throw std::runtime_error("Attempting to call a non-function");
   if (!thisObj->IsObject())
     throw std::runtime_error("`this` pointer has to be an object");
 
   const JsContext context(*jsEngine);
   auto isolate = jsEngine->GetIsolate();
 
   const v8::TryCatch tryCatch(isolate);
   v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue());
-  auto result = CHECKED_TO_LOCAL(
+  auto result = CHECKED_TO_LOCAL_WITH_TRY_CATCH(
     isolate, func->Call(isolate->GetCurrentContext(),
       thisObj, args.size(), args.size() ? &args[0] : nullptr), tryCatch);
 
   return JsValue(jsEngine, result);
 }