When deciding not to walk the native stack, don't overwrite the vm_tag set in SetupSample.

runtime/vm/profiler_test.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/assert.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/globals.h"
 #include "vm/profiler.h"
@@ skipping 134 matching lines @@
   EXPECT(!cls.IsNull());  // No ambiguity error expected.
   return cls.raw();
 }
 
 
 class AllocationFilter : public SampleFilter {
  public:
   explicit AllocationFilter(Isolate* isolate, intptr_t cid)
       : SampleFilter(isolate),
         cid_(cid),
-        enable_embedder_ticks_(false) {
+        enable_vm_ticks_(false) {
   }
 
   bool FilterSample(Sample* sample) {
-    if (!enable_embedder_ticks_ &&
-        (sample->vm_tag() == VMTag::kEmbedderTagId)) {
+    if (!enable_vm_ticks_ &&
+        (sample->vm_tag() == VMTag::kVMTagId)) {
       // We don't want to see embedder ticks in the test.
       return false;
     }
     return sample->is_allocation_sample() &&
            (sample->allocation_cid() == cid_);
   }
 
-  void set_enable_embedder_ticks(bool enable) {
-    enable_embedder_ticks_ = enable;
+  void set_enable_vm_ticks(bool enable) {
+    enable_vm_ticks_ = enable;
   }
 
  private:
   intptr_t cid_;
-  bool enable_embedder_ticks_;
+  bool enable_vm_ticks_;
 };
 
 
 TEST_CASE(Profiler_TrivialRecordAllocation) {
   DisableNativeProfileScope dnps;
   const char* kScript =
       "class A {\n"
       "  var a;\n"
       "  var b;\n"
       "}\n"
@@ skipping 643 matching lines @@
 
   // Invoke "foo" which during compilation, triggers a closure class allocation.
   Dart_Handle result = Dart_Invoke(lib, NewString("foo"), 0, NULL);
   EXPECT_VALID(result);
 
   {
     StackZone zone(thread);
     HANDLESCOPE(thread);
     Profile profile(isolate);
     AllocationFilter filter(isolate, class_class.id());
-    filter.set_enable_embedder_ticks(true);
+    filter.set_enable_vm_ticks(true);
     profile.Build(thread, &filter, Profile::kNoTags);
     // We should have one allocation sample.
     EXPECT_EQ(1, profile.sample_count());
     ProfileTrieWalker walker(&profile);
 
     walker.Reset(Profile::kExclusiveCode);
     EXPECT(walker.Down());
 #if defined(TARGET_OS_WINDOWS)
     // TODO(johnmccutchan): Hookup native symbol resolver on Windows.
     EXPECT_SUBSTRING("[Native]", walker.CurrentName());
 #else
     EXPECT_SUBSTRING("dart::Profiler::SampleAllocation", walker.CurrentName());
 #endif
     EXPECT(!walker.Down());
   }
 
   // Disable allocation tracing for Class.
   class_class.SetTraceAllocation(false);
 
   // Invoke "bar" which during compilation, triggers a closure class allocation.
   result = Dart_Invoke(lib, NewString("bar"), 0, NULL);
   EXPECT_VALID(result);
 
   {
     StackZone zone(thread);
     HANDLESCOPE(thread);
     Profile profile(isolate);
     AllocationFilter filter(isolate, class_class.id());
-    filter.set_enable_embedder_ticks(true);
+    filter.set_enable_vm_ticks(true);
     profile.Build(thread, &filter, Profile::kNoTags);
     // We should still only have one allocation sample.
     EXPECT_EQ(1, profile.sample_count());
   }
 }
 
 
 TEST_CASE(Profiler_TypedArrayAllocation) {
   DisableNativeProfileScope dnps;
   const char* kScript =
@@ skipping 599 matching lines @@
     EXPECT(walker.Down());
     EXPECT_STREQ("go", walker.CurrentName());
     EXPECT(walker.Down());
     EXPECT_STREQ("main", walker.CurrentName());
     EXPECT(!walker.Down());
   }
 }
 
 }  // namespace dart