Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(689)

Side by Side Diff: runtime/vm/isolate.cc

Issue 2064003002: Fix for issue 26689 - Scrub the function name before storing it in IsolateSpawnState when spawning … (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/isolate.h" 5 #include "vm/isolate.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "include/dart_native_api.h" 8 #include "include/dart_native_api.h"
9 #include "platform/assert.h" 9 #include "platform/assert.h"
10 #include "platform/text_buffer.h" 10 #include "platform/text_buffer.h"
(...skipping 2611 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 serialized_message_len_(0), 2622 serialized_message_len_(0),
2623 spawn_count_monitor_(spawn_count_monitor), 2623 spawn_count_monitor_(spawn_count_monitor),
2624 spawn_count_(spawn_count), 2624 spawn_count_(spawn_count),
2625 paused_(paused), 2625 paused_(paused),
2626 errors_are_fatal_(errors_are_fatal) { 2626 errors_are_fatal_(errors_are_fatal) {
2627 const Class& cls = Class::Handle(func.Owner()); 2627 const Class& cls = Class::Handle(func.Owner());
2628 const Library& lib = Library::Handle(cls.library()); 2628 const Library& lib = Library::Handle(cls.library());
2629 const String& lib_url = String::Handle(lib.url()); 2629 const String& lib_url = String::Handle(lib.url());
2630 library_url_ = NewConstChar(lib_url.ToCString()); 2630 library_url_ = NewConstChar(lib_url.ToCString());
2631 2631
2632 const String& func_name = String::Handle(func.name()); 2632 String& func_name = String::Handle();
2633 func_name ^= func.name();
2634 func_name ^= String::ScrubName(func_name);
2633 function_name_ = NewConstChar(func_name.ToCString()); 2635 function_name_ = NewConstChar(func_name.ToCString());
2634 if (!cls.IsTopLevel()) { 2636 if (!cls.IsTopLevel()) {
2635 const String& class_name = String::Handle(cls.Name()); 2637 const String& class_name = String::Handle(cls.Name());
2636 class_name_ = NewConstChar(class_name.ToCString()); 2638 class_name_ = NewConstChar(class_name.ToCString());
2637 } 2639 }
2638 bool can_send_any_object = true; 2640 bool can_send_any_object = true;
2639 SerializeObject(message, 2641 SerializeObject(message,
2640 &serialized_message_, 2642 &serialized_message_,
2641 &serialized_message_len_, 2643 &serialized_message_len_,
2642 can_send_any_object); 2644 can_send_any_object);
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
2795 void IsolateSpawnState::DecrementSpawnCount() { 2797 void IsolateSpawnState::DecrementSpawnCount() {
2796 ASSERT(spawn_count_monitor_ != NULL); 2798 ASSERT(spawn_count_monitor_ != NULL);
2797 ASSERT(spawn_count_ != NULL); 2799 ASSERT(spawn_count_ != NULL);
2798 MonitorLocker ml(spawn_count_monitor_); 2800 MonitorLocker ml(spawn_count_monitor_);
2799 ASSERT(*spawn_count_ > 0); 2801 ASSERT(*spawn_count_ > 0);
2800 *spawn_count_ = *spawn_count_ - 1; 2802 *spawn_count_ = *spawn_count_ - 1;
2801 ml.Notify(); 2803 ml.Notify();
2802 } 2804 }
2803 2805
2804 } // namespace dart 2806 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698