Handle load errors in deferred code

runtime/vm/object.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2616 matching lines @@
   bool LoadRequested() const {
     return raw_ptr()->load_state_ == RawLibrary::kLoadRequested;
   }
   bool LoadInProgress() const {
     return raw_ptr()->load_state_ == RawLibrary::kLoadInProgress;
   }
   void SetLoadRequested() const;
   void SetLoadInProgress() const;
   bool Loaded() const { return raw_ptr()->load_state_ == RawLibrary::kLoaded; }
   void SetLoaded() const;
-  bool LoadError() const {
+  bool LoadFailed() const {
     return raw_ptr()->load_state_ == RawLibrary::kLoadError;
   }
-  void SetLoadError() const;
+  RawObject* LoadError() const { return raw_ptr()->load_error_; }

[Ivan Posva, 2014/07/31 18:29:05]

RawInstance* here and other related places.

[hausner, 2014/07/31 21:12:45]

Done.

+  void SetLoadError(const Object& error) const;
+  RawObject* TransitiveLoadError() const;
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawLibrary));
   }
 
   static RawLibrary* New(const String& url);
 
   // Evaluate the given expression as if it appeared in an top-level
   // method of this library and return the resulting value, or an
   // error object if evaluating the expression fails. The method has
@@ skipping 1708 matching lines @@
   friend class TypedDataView;
 };
 
 
 class LibraryPrefix : public Instance {
  public:
   RawString* name() const { return raw_ptr()->name_; }
   virtual RawString* DictionaryName() const { return name(); }
 
   RawArray* imports() const { return raw_ptr()->imports_; }
-  intptr_t num_imports() const { return raw_ptr()->num_imports_; }
+  int32_t num_imports() const { return raw_ptr()->num_imports_; }
   RawLibrary* importer() const { return raw_ptr()->importer_; }
 
+  RawObject* LoadError() const;

[Ivan Posva, 2014/07/31 18:29:05]

Thinking about this more as I go through the CL. Can we name this something
different from Error to reduce the potential for confusion?

[hausner, 2014/07/31 21:12:45]

Leaving the name but changing to type Instance, as discussed offline.

+
   bool ContainsLibrary(const Library& library) const;
   RawLibrary* GetLibrary(int index) const;
   void AddImport(const Namespace& import) const;
   RawObject* LookupObject(const String& name) const;
   RawClass* LookupClass(const String& class_name) const;
 
   bool is_deferred_load() const { return raw_ptr()->is_deferred_load_; }
   bool is_loaded() const { return raw_ptr()->is_loaded_; }
   bool LoadLibrary() const;
 
@@ skipping 2901 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_