[profiler] Log both code and bytecode in heap SFI traversal

src/log.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/log.h"
 
 #include <cstdarg>
 #include <memory>
 #include <sstream>
 
@@ skipping 1359 matching lines @@
   int compiled_funcs_count = 0;
 
   // Iterate the heap to find shared function info objects and record
   // the unoptimized code for them.
   for (HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next()) {
     if (!obj->IsSharedFunctionInfo()) continue;
     SharedFunctionInfo* sfi = SharedFunctionInfo::cast(obj);
     if (sfi->is_compiled()
         && (!sfi->script()->IsScript()
             || Script::cast(sfi->script())->HasValidSource())) {
-      if (sfis != NULL) {
-        sfis[compiled_funcs_count] = Handle<SharedFunctionInfo>(sfi);
+      // In some cases, an SFI might have (and have executing!) both bytecode
+      // and baseline code, so check for both and add them both if needed.
+

[rmcilroy, 2017/01/03 12:05:30]

nit - drop the newline

[Leszek Swirski, 2017/01/03 12:22:45]

Done.

+      if (sfi->HasBytecodeArray()) {
+        if (sfis != NULL) {
+          sfis[compiled_funcs_count] = Handle<SharedFunctionInfo>(sfi);
+        }
+        if (code_objects != NULL) {
+          code_objects[compiled_funcs_count] =
+              Handle<AbstractCode>(AbstractCode::cast(sfi->bytecode_array()));
+        }
+        ++compiled_funcs_count;
       }
-      if (code_objects != NULL) {
-        code_objects[compiled_funcs_count] =
-            Handle<AbstractCode>(sfi->abstract_code());
+
+      if (!sfi->IsInterpreted()) {

[rmcilroy, 2017/01/03 12:05:30]

This should be HasBaselineCode instead

[Leszek Swirski, 2017/01/03 12:22:45]

This would change previous behaviour, which also included native functions. I'm
not sure if this would be correct or not though...

+        if (sfis != NULL) {
+          sfis[compiled_funcs_count] = Handle<SharedFunctionInfo>(sfi);
+        }
+        if (code_objects != NULL) {
+          code_objects[compiled_funcs_count] =
+              Handle<AbstractCode>(AbstractCode::cast(sfi->code()));
+        }
+        ++compiled_funcs_count;

[rmcilroy, 2017/01/03 12:05:30]

nit - could you pull the duplicate code out into a helper function which adds
the sfi / abstract code object to sfis / code_objects.

[Leszek Swirski, 2017/01/03 12:22:45]

Done.

       }
-      ++compiled_funcs_count;
     }
   }
 
   // Iterate all optimized functions in all contexts.
   EnumerateOptimizedFunctionsVisitor visitor(sfis,
                                              code_objects,
                                              &compiled_funcs_count);
   Deoptimizer::VisitAllOptimizedFunctions(heap->isolate(), &visitor);
 
   return compiled_funcs_count;
@@ skipping 382 matching lines @@
 
   if (profiler_listener_.get() != nullptr) {
     removeCodeEventListener(profiler_listener_.get());
   }
 
   return log_->Close();
 }
 
 }  // namespace internal
 }  // namespace v8