Move methods from IHermesExtra to IHermes

Summary:
X-link: react/react-native#53473

This is a cleanup of IHermesExtra:
1. Move dumpSampledTraceToProfile() and debugJavasScript() to IHermes.
I'm still keeping the empty DebugFlags, since changing that requires
more changes. It's also possible that we may need it in the future.
2. Remove `dumpBasicBlockProfileTrace`. Use
writeBasicBlockProfileTraceToFile` if users need to dump the profile.

Changelog: [Internal]

Reviewed By: tsaichien

Differential Revision: D81075460

fbshipit-source-id: b81005e531809cfd870fd9bdb5c0e17864ed92fb

Author: lavenzg

API/hermes/TraceInterpreter.cpp

@@ -639,12 +639,6 @@ std::string TraceInterpreter::executeRecordsWithMarkerOptions() {
   }
   executeRecords();
 
-#ifdef HERMESVM_PROFILER_BB
-  if (auto *hermesRuntime = dynamic_cast<HermesRuntime *>(&rt_)) {
-    hermesRuntime->dumpBasicBlockProfileTrace(std::cerr);
-  }
-#endif
-
   checkMarker(std::string("end"));
   if (!markerFound_) {
     // An action was requested at a marker but that marker wasn't found.

API/hermes/hermes.cpp

@@ -1139,19 +1139,14 @@ class HermesRuntimeImpl final : public HermesRuntime,
   jsi::Value getObjectForID(uint64_t id) override;
   const ::hermes::vm::GCExecTrace &getGCExecTrace() const override;
   std::string getIOTrackingInfoJSON() override;
-#ifdef HERMESVM_PROFILER_BB
-  void dumpBasicBlockProfileTrace(std::ostream &os) const override;
-#endif
 #ifdef HERMESVM_PROFILER_OPCODE
   void dumpOpcodeStats(std::ostream &os) const override;
 #endif
   debugger::Debugger &getDebugger() override;
-#ifdef HERMES_ENABLE_DEBUGGER
   void debugJavaScript(
       const std::string &src,
       const std::string &sourceURL,
       const DebugFlags &debugFlags) override;
-#endif
   void registerForProfiling() override;
   void unregisterForProfiling() override;
   void asyncTriggerTimeout() override;
@@ -1476,14 +1471,6 @@ std::string HermesRuntimeImpl::getIOTrackingInfoJSON() {
   return buf;
 }
 
-#ifdef HERMESVM_PROFILER_BB
-void HermesRuntimeImpl::dumpBasicBlockProfileTrace(std::ostream &stream) const {
-  llvh::raw_os_ostream os(stream);
-  static_cast<const HermesRuntimeImpl *>(this)
-      ->runtime_.dumpBasicBlockProfileTrace(os);
-}
-#endif
-
 #ifdef HERMESVM_PROFILER_OPCODE
 void HermesRuntimeImpl::dumpOpcodeStats(std::ostream &stream) const {
   llvh::raw_os_ostream os(stream);
@@ -1495,20 +1482,18 @@ debugger::Debugger &HermesRuntimeImpl::getDebugger() {
   return *(debugger_);
 }
 
-#ifdef HERMES_ENABLE_DEBUGGER
-
 void HermesRuntimeImpl::debugJavaScript(
     const std::string &src,
     const std::string &sourceURL,
     const DebugFlags &debugFlags) {
+#ifdef HERMES_ENABLE_DEBUGGER
   vm::Runtime &runtime = runtime_;
   vm::GCScope gcScope(runtime);
   vm::ExecutionStatus res =
       runtime.run(src, sourceURL, compileFlags_).getStatus();
   checkStatus(res);
-}
-
 #endif
+}
 
 void HermesRuntimeImpl::registerForProfiling() {
 #if HERMESVM_SAMPLING_PROFILER_AVAILABLE

API/hermes/hermes.h

@@ -158,36 +158,11 @@ class HERMES_EXPORT ISetFatalHandler : public jsi::ICast {
 
 class IHermesExtra : public IHermes {
  public:
-  /// Dump sampled stack trace for a given runtime to a data structure that can
-  /// be used by third parties.
-  virtual sampling_profiler::Profile dumpSampledTraceToProfile() = 0;
-
-#ifdef HERMESVM_PROFILER_BB
-  /// Write the trace to the given stream.
-  virtual void dumpBasicBlockProfileTrace(std::ostream &os) const = 0;
-#endif
-
 #ifdef HERMESVM_PROFILER_OPCODE
   /// Write the opcode stats to the given stream.
   virtual void dumpOpcodeStats(std::ostream &os) const = 0;
 #endif
 
-#ifdef HERMES_ENABLE_DEBUGGER
-
-  struct DebugFlags {
-    // Looking for the .lazy flag? It's no longer necessary.
-    // Source is evaluated lazily by default. See
-    // RuntimeConfig::CompilationMode.
-  };
-
-  /// Evaluate the given code in an unoptimized form,
-  /// used for debugging.
-  virtual void debugJavaScript(
-      const std::string &src,
-      const std::string &sourceURL,
-      const DebugFlags &debugFlags) = 0;
-#endif
-
  protected:
   ~IHermesExtra() = default;
 };

API/jsi/jsi/hermes.h

@@ -18,6 +18,10 @@ class GCExecTrace;
 
 namespace facebook::hermes {
 
+namespace sampling_profiler {
+class Profile;
+}
+
 namespace debugger {
 class Debugger;
 }
@@ -33,10 +37,27 @@ class JSI_EXPORT IHermes : public jsi::ICast {
       0xa6f7,
       0x325096b39f47};
 
+  struct DebugFlags {
+    // Looking for the .lazy flag? It's no longer necessary.
+    // Source is evaluated lazily by default. See
+    // RuntimeConfig::CompilationMode.
+  };
+
+  /// Evaluate the given code in an unoptimized form, used for debugging.
+  /// This will be no-op if the implementation does not have debugger enabled.
+  virtual void debugJavaScript(
+      const std::string& src,
+      const std::string& sourceURL,
+      const DebugFlags& debugFlags) = 0;
+
   /// Return a ICast pointer to an object that be cast into the interface
   /// IHermesRootAPI. This root API object has static lifetime.
   virtual ICast* getHermesRootAPI() = 0;
 
+  /// Dump sampled stack trace for a given runtime to a data structure that can
+  /// be used by third parties.
+  virtual sampling_profiler::Profile dumpSampledTraceToProfile() = 0;
+
   /// Serialize the sampled stack to the format expected by DevTools'
   /// Profiler.stop return type.
   virtual void sampledTraceToStreamInDevToolsFormat(std::ostream& stream) = 0;