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

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

Issue 2631453004: Fix assertion failure in the background compiler. (Closed)
Patch Set: Created 3 years, 11 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) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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/object.h" 5 #include "vm/object.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/assembler.h" 9 #include "vm/assembler.h"
10 #include "vm/become.h" 10 #include "vm/become.h"
(...skipping 5204 matching lines...) Expand 10 before | Expand all | Expand 10 after
5215 return false; 5215 return false;
5216 } 5216 }
5217 Thread* thread = Thread::Current(); 5217 Thread* thread = Thread::Current();
5218 return thread->isolate()->debugger()->HasBreakpoint(*this, thread->zone()); 5218 return thread->isolate()->debugger()->HasBreakpoint(*this, thread->zone());
5219 } 5219 }
5220 5220
5221 5221
5222 void Function::InstallOptimizedCode(const Code& code, bool is_osr) const { 5222 void Function::InstallOptimizedCode(const Code& code, bool is_osr) const {
5223 DEBUG_ASSERT(IsMutatorOrAtSafepoint()); 5223 DEBUG_ASSERT(IsMutatorOrAtSafepoint());
5224 // We may not have previous code if FLAG_precompile is set. 5224 // We may not have previous code if FLAG_precompile is set.
5225 if (!is_osr && HasCode()) { 5225 // Hot-reload may have already disabled the current code.
5226 if (!is_osr && HasCode() && !Code::Handle(CurrentCode()).IsDisabled()) {
5226 Code::Handle(CurrentCode()).DisableDartCode(); 5227 Code::Handle(CurrentCode()).DisableDartCode();
5227 } 5228 }
5228 AttachCode(code); 5229 AttachCode(code);
5229 } 5230 }
5230 5231
5231 5232
5232 void Function::SetInstructions(const Code& value) const { 5233 void Function::SetInstructions(const Code& value) const {
5233 DEBUG_ASSERT(IsMutatorOrAtSafepoint()); 5234 DEBUG_ASSERT(IsMutatorOrAtSafepoint());
5234 SetInstructionsSafe(value); 5235 SetInstructionsSafe(value);
5235 } 5236 }
(...skipping 17746 matching lines...) Expand 10 before | Expand all | Expand 10 after
22982 return UserTag::null(); 22983 return UserTag::null();
22983 } 22984 }
22984 22985
22985 22986
22986 const char* UserTag::ToCString() const { 22987 const char* UserTag::ToCString() const {
22987 const String& tag_label = String::Handle(label()); 22988 const String& tag_label = String::Handle(label());
22988 return tag_label.ToCString(); 22989 return tag_label.ToCString();
22989 } 22990 }
22990 22991
22991 } // namespace dart 22992 } // 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