Minor cleanup.

runtime/vm/isolate_reload.cc

 // Copyright (c) 2016, 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 "vm/isolate_reload.h"
 
 #include "vm/become.h"
 #include "vm/bit_vector.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 211 matching lines @@
   jsobj.AddProperty("type", "ReasonForCancelling");
   jsobj.AddProperty("class", from_);
   const String& message = String::Handle(ToString());
   jsobj.AddProperty("message", message.ToCString());
 }
 
 
 RawError* IsolateReloadContext::error() const {
   ASSERT(reload_aborted());
   // Report the first error to the surroundings.
-  const Error& error =
-      Error::Handle(reasons_to_cancel_reload_.At(0)->ToError());
-  return error.raw();
+  return reasons_to_cancel_reload_.At(0)->ToError();
 }
 
 
 class ScriptUrlSetTraits {
  public:
   static bool ReportStats() { return false; }
   static const char* Name() { return "ScriptUrlSetTraits"; }
 
   static bool IsMatch(const Object& a, const Object& b) {
     if (!a.IsString() || !b.IsString()) {
@@ skipping 93 matching lines @@
 
 bool IsolateReloadContext::IsSameClass(const Class& a, const Class& b) {
   if (a.is_patch() != b.is_patch()) {
     // TODO(johnmccutchan): Should we just check the class kind bits?
     return false;
   }
 
   // TODO(turnidge): We need to look at generic type arguments for
   // synthetic mixin classes.  Their names are not necessarily unique
   // currently.
-  const String& a_name = String::Handle(Class::Cast(a).Name());
-  const String& b_name = String::Handle(Class::Cast(b).Name());
+  const String& a_name = String::Handle(a.Name());
+  const String& b_name = String::Handle(b.Name());
 
   if (!a_name.Equals(b_name)) {
     return false;
   }
 
-  const Library& a_lib = Library::Handle(Class::Cast(a).library());
-  const Library& b_lib = Library::Handle(Class::Cast(b).library());
+  const Library& a_lib = Library::Handle(a.library());
+  const Library& b_lib = Library::Handle(b.library());
   return IsSameLibrary(a_lib, b_lib);
 }
 
 
 bool IsolateReloadContext::IsSameLibrary(
     const Library& a_lib, const Library& b_lib) {
   const String& a_lib_url =
       String::Handle(a_lib.IsNull() ? String::null() : a_lib.url());
   const String& b_lib_url =
       String::Handle(b_lib.IsNull() ? String::null() : b_lib.url());
@@ skipping 1312 matching lines @@
         ASSERT(!super_cls.IsNull());
         super_cls.AddDirectSubclass(cls);
       }
     }
   }
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart