refactor: replace the use of our own roundtrip StrType::getValue method with the simpler JS_EncodeStringToUTF8 SpiderMonkey API

Author: Xmader

include/StrType.hh

@@ -36,8 +36,6 @@ public:
    */
   static PyObject *getPyObject(JSContext *cx, JS::HandleValue str);
 
-  static const char *getValue(JSContext *cx, JS::HandleValue str);
-
   static PyObject *proxifyString(JSContext *cx, JS::HandleValue str);
 };
 

src/ExceptionType.cc

@@ -107,8 +107,8 @@ JSObject *ExceptionType::toJsError(JSContext *cx, PyObject *exceptionValue, PyOb
   if (stackObj.get()) {
     JS::RootedString stackStr(cx);
     JS::BuildStackString(cx, nullptr, stackObj, &stackStr, 2, js::StackFormat::SpiderMonkey);
-    JS::RootedValue stackStrVal(cx, JS::StringValue(stackStr));
-    stackStream << "\nJS Stack Trace:\n" << StrType::getValue(cx, stackStrVal);
+    JS::UniqueChars stackStrUtf8 = JS_EncodeStringToUTF8(cx, stackStr);
+    stackStream << "\nJS Stack Trace:\n" << stackStrUtf8.get();
   }
 
 

src/StrType.cc

@@ -212,10 +212,3 @@ PyObject *StrType::getPyObject(JSContext *cx, JS::HandleValue str) {
 
   return proxifyString(cx, str);
 }
-
-const char *StrType::getValue(JSContext *cx, JS::HandleValue str) {
-  PyObject *pyString = proxifyString(cx, str);
-  const char *value = PyUnicode_AsUTF8(PyUnicode_FromObject(pyString));
-  Py_DECREF(pyString);
-  return value;
-}

src/setSpiderMonkeyException.cc

@@ -66,8 +66,8 @@ PyObject *getExceptionString(JSContext *cx, const JS::ExceptionStack &exceptionS
     if (stackObj.get()) {
       JS::RootedString stackStr(cx);
       BuildStackString(cx, nullptr, stackObj, &stackStr, 2, js::StackFormat::SpiderMonkey);
-      JS::RootedValue stackStrVal(cx, JS::StringValue(stackStr));
-      outStrStream << "Stack Trace:\n" << StrType::getValue(cx, stackStrVal);
+      JS::UniqueChars stackStrUtf8 = JS_EncodeStringToUTF8(cx, stackStr);
+      outStrStream << "Stack Trace:\n" << stackStrUtf8.get();
     }
   }