Reland More allocation tracing unit tests

runtime/vm/profiler.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/address_sanitizer.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
@@ skipping 947 matching lines @@
 }
 #endif
 
 void Profiler::RecordAllocation(Isolate* isolate, intptr_t cid) {
   if (!CheckIsolate(isolate)) {
     return;
   }
 
   const bool exited_dart_code = ExitedDart(isolate);
 
-  if (!exited_dart_code && !FLAG_profile_vm) {
-    // No Dart frames on stack and we are not profiling the vm.
-    return;
-  }
-
   SampleBuffer* sample_buffer = GetSampleBuffer(isolate);
   if (sample_buffer == NULL) {
     // Profiler not initialized.
     return;
   }
 
   if (FLAG_profile_vm) {
     uintptr_t sp = Isolate::GetCurrentStackPointer();
     uintptr_t fp = 0;
     uintptr_t pc = GetProgramCounter();
@@ skipping 20 matching lines @@
                                  sample_buffer,
                                  OSThread::GetCurrentThreadId());
     sample->SetAllocationCid(cid);
     ProfilerNativeStackWalker native_stack_walker(sample,
                                                   stack_lower,
                                                   stack_upper,
                                                   pc,
                                                   fp,
                                                   sp);
     native_stack_walker.walk();
-  } else {
-    ASSERT(exited_dart_code);
+  } else if (exited_dart_code) {
     Sample* sample = SetupSample(isolate,
                                  sample_buffer,
                                  OSThread::GetCurrentThreadId());
     sample->SetAllocationCid(cid);
     ProfilerDartExitStackWalker dart_exit_stack_walker(isolate, sample);
     dart_exit_stack_walker.walk();
+  } else {
+    // Fall back.
+    uintptr_t pc = GetProgramCounter();
+    Sample* sample = SetupSample(isolate,
+                                 sample_buffer,
+                                 OSThread::GetCurrentThreadId());
+    sample->SetAllocationCid(cid);
+    sample->set_vm_tag(VMTag::kEmbedderTagId);
+    sample->SetAt(0, pc);
   }
 }
 
 
 void Profiler::RecordSampleInterruptCallback(
     const InterruptedThreadState& state,
     void* data) {
   Isolate* isolate = reinterpret_cast<Isolate*>(data);
   if ((isolate == NULL) || (Dart::vm_isolate() == NULL)) {
     // No isolate.
@@ skipping 288 matching lines @@
                                                uword pc) {
   return vm_isolate->heap()->CodeContains(pc)
          || isolate->heap()->CodeContains(pc);
 }
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer() {
 }
 
 }  // namespace dart