fix bugs

Summary:
We saw some crashes in Jumpstart from a couple different reasons:
1. Race condition in accessing the autoload map from different threads. More details from patzar in D95252496. The fix for this is stolen from that diff just to roll both fixes at once
2. Hitting the max translation limit in HHVM from jumpstart translations. We didn't dedupe the jumpstart translations, so there was a greater chance it could hit the limit.

Reviewed By: jaewie

Differential Revision: D95271543

fbshipit-source-id: 623e17b7e8acdcaefbc2efa863706eaafd55769c

Author: Andy Li

hphp/runtime/vm/jit/mcgen-async.cpp

@@ -28,6 +28,7 @@
 #include "hphp/runtime/vm/jit/tc-region.h"
 #include "hphp/runtime/vm/jit/tc-internal.h"
 #include "hphp/runtime/vm/type-profile.h"
+#include "hphp/runtime/vm/jit/mcgen-async.h"
 
 #include "hphp/util/alloc.h"
 #include "hphp/util/build-info.h"
@@ -414,9 +415,9 @@ struct AsyncTranslationWorker
     SCOPE_EXIT {
       if (!Cfg::Repo::Authoritative) {
         assertx(Cfg::Eval::EnableAsyncJIT);
-        if (rctx.currNumTranslations != kIgnoreNumTrans) {
-          enqueuedSKs().dequeue(ctx.sk);
-        }
+        // Dequeue for both normal and jumpstart requests so the SrcKey can be
+        // re-enqueued if a future retranslation is needed.
+        enqueuedSKs().dequeue(ctx.sk);
       } else {
         assertx(Cfg::Eval::EnableAsyncJITLive ||
                 Cfg::Eval::EnableAsyncJITProfile);
@@ -633,10 +634,18 @@ void joinAsyncTranslationWorkerThreads() {
 }
 
 void enqueueAsyncTranslateRequestForJumpstart(RegionContext&& ctx) {
+  // Use the SrcKeySet to deduplicate jumpstart requests for the same SrcKey.
+  // The serialized SBProf data may contain multiple entries for the same
+  // SrcKey (e.g. with different live types).  Without dedup, multiple workers
+  // can concurrently translate and publish for the same SrcKey, pushing
+  // numTrans past MaxTranslations and violating the translation limit
+  // invariant.
+ if (detail::mayEnqueueAsyncTranslateRequest(ctx.sk)) {
   dispatcher().enqueue(AsyncRegionTranslationContext {
     TransKind::Live, std::move(ctx), kIgnoreNumTrans
   });
   FTRACE(2, "Enqueued sk {} for jitting in jumpstart\n", show(ctx.sk));
+ }
 }
 
 namespace {

hphp/runtime/vm/jit/prof-data-serialize.cpp

@@ -1163,6 +1163,11 @@ void merge_and_enqueue_for_jit(const std::string& root, int numWorkers) {
 
   auto const& pds = getSBDeserProfData();
 
+  auto const opts = RepoOptions::forFile(root + '/');
+  g_context->onLoadWithOptions("", opts);
+  auto const map = AutoloadHandler::s_instance->getAutoloadMap();
+  always_assert(map);
+
   std::vector<VMWorker> workers;
   // numBatches is taken from merge_loaded_units. See the comment there.
   // TODO: tune numBatches.