Apply suggestions from code review

Co-authored-by: Jameson Nash <[email protected]>

base/compiler/typeinfer.jl

@@ -137,7 +137,7 @@ already_inferred_quick_test(interp::AbstractInterpreter, mi::MethodInstance) =
  false
 
 # inference completed on `me`
-# update the MethodInstance and notify the edges
+# update the MethodInstance
 function cache_result!(interp::AbstractInterpreter, result::InferenceResult, min_valid::UInt, max_valid::UInt)
  # check if the existing linfo metadata is also sufficient to describe the current inference result
  # to decide if it is worth caching this

base/compiler/types.jl

@@ -181,15 +181,7 @@ code_cache(ni::NativeInterpreter) = WorldView(GLOBAL_CI_CACHE, ni.world)
 """
  lock_mi_inference(ni::NativeInterpreter, mi::MethodInstance)
 
-Locks `mi`'s inference flag to prevent infinite recursion inside inference.
-While running inference, we must occaisionally compile additional code, which
-may in turn request additional code to be inferred. This can happen during
-bootstrap (for part of inference itself), but also during regular execution (e.g.
-to expand generated functions). The inference flag lets the runtime know that
-it should not attempt to re-infer the requested functions as it is being worked
-on higher in the stack. Not that inference itself does not look at this flag,
-instead checking its own working caches - it is only used for locking the C
-runtime.
+Hint that `mi` is in inference to help accelerate bootstrapping. This helps limit the amount of wasted work we might do when inference is working on initially inferring itself by letting us detect when inference is already in progress and not running a second copy on it. This creates a data-race, but the entry point into this code from C (jl_type_infer) already includes detection and restriction on recursion, so it is hopefully mostly a benign problem (since it should really only happen during the first phase of bootstrapping that we encounter this flag).
 """
 lock_mi_inference(ni::NativeInterpreter, mi::MethodInstance) = (mi.inInference = true; nothing)
 

src/aotcompile.cpp

@@ -265,7 +265,8 @@ static void jl_ci_cache_lookup(const jl_cgparams_t &cgparams, jl_method_instance
  if (*src_out == NULL || !jl_is_code_info(*src_out)) {
  if (cgparams.lookup != jl_rettype_inferred) {
  jl_error("Refusing to automatically run type inference with custom cache lookup.");
- } else {
+ }
+ else {
  *src_out = jl_type_infer(mi, world, 0);
  codeinst = jl_get_method_inferred(mi, (*src_out)->rettype, (*src_out)->min_world, (*src_out)->max_world);
  if ((*src_out)->inferred && !codeinst->inferred)