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

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

Issue 369573006: Fix assertion in Dartium loading (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« 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/cpu.h" 10 #include "vm/cpu.h"
(...skipping 8395 matching lines...) Expand 10 before | Expand all | Expand 10 after
8406 8406
8407 8407
8408 void Library::SetLoaded() const { 8408 void Library::SetLoaded() const {
8409 // Should not be already loaded or just allocated. 8409 // Should not be already loaded or just allocated.
8410 ASSERT(LoadInProgress() || LoadRequested()); 8410 ASSERT(LoadInProgress() || LoadRequested());
8411 raw_ptr()->load_state_ = RawLibrary::kLoaded; 8411 raw_ptr()->load_state_ = RawLibrary::kLoaded;
8412 } 8412 }
8413 8413
8414 8414
8415 void Library::SetLoadError() const { 8415 void Library::SetLoadError() const {
8416 // Should not be already loaded or just allocated. 8416 // Should not be already successfully loaded or just allocated.
8417 ASSERT(LoadInProgress() || LoadRequested()); 8417 ASSERT(LoadInProgress() || LoadRequested() || LoadError());
8418 raw_ptr()->load_state_ = RawLibrary::kLoadError; 8418 raw_ptr()->load_state_ = RawLibrary::kLoadError;
8419 } 8419 }
8420 8420
8421 8421
8422 static RawString* MakeClassMetaName(const Class& cls) { 8422 static RawString* MakeClassMetaName(const Class& cls) {
8423 String& cname = String::Handle(cls.Name()); 8423 String& cname = String::Handle(cls.Name());
8424 return String::Concat(Symbols::At(), cname); 8424 return String::Concat(Symbols::At(), cname);
8425 } 8425 }
8426 8426
8427 8427
(...skipping 10580 matching lines...) Expand 10 before | Expand all | Expand 10 after
19008 return tag_label.ToCString(); 19008 return tag_label.ToCString();
19009 } 19009 }
19010 19010
19011 19011
19012 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const { 19012 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
19013 Instance::PrintJSONImpl(stream, ref); 19013 Instance::PrintJSONImpl(stream, ref);
19014 } 19014 }
19015 19015
19016 19016
19017 } // namespace dart 19017 } // 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