Index: runtime/vm/object.cc |
=================================================================== |
--- runtime/vm/object.cc (revision 16802) |
+++ runtime/vm/object.cc (working copy) |
@@ -5785,7 +5785,7 @@ |
RawClass* Library::LookupClass(const String& name) const { |
Object& obj = Object::Handle(LookupObject(name)); |
if (!obj.IsNull() && obj.IsClass()) { |
- return Class::CheckedHandle(obj.raw()).raw(); |
+ return Class::Cast(obj).raw(); |
} |
return Class::null(); |
} |
@@ -5794,7 +5794,7 @@ |
RawClass* Library::LookupLocalClass(const String& name) const { |
Object& obj = Object::Handle(LookupLocalObject(name)); |
if (!obj.IsNull() && obj.IsClass()) { |
- return Class::CheckedHandle(obj.raw()).raw(); |
+ return Class::Cast(obj).raw(); |
} |
return Class::null(); |
} |
@@ -6246,7 +6246,8 @@ |
RawLibrary* LibraryPrefix::GetLibrary(int index) const { |
if ((index >= 0) || (index < num_imports())) { |
const Array& imports = Array::Handle(this->imports()); |
- const Namespace& import = Namespace::CheckedHandle(imports.At(index)); |
+ Namespace& import = Namespace::Handle(); |
+ import ^= imports.At(index); |
return import.library(); |
} |
return Library::null(); |
@@ -6778,7 +6779,8 @@ |
ASSERT(var_index < Length()); |
const Array& names = Array::Handle(raw_ptr()->names_); |
ASSERT(Length() == names.Length()); |
- const String& name = String::CheckedHandle(names.At(var_index)); |
+ String& name = String::Handle(); |
+ name ^= names.At(var_index); |
return name.raw(); |
} |
@@ -7055,8 +7057,9 @@ |
intptr_t Code::Comments::PCOffsetAt(intptr_t idx) const { |
- return Smi::CheckedHandle( |
- comments_.At(idx * kNumberOfEntries + kPCOffsetEntry)).Value(); |
+ Smi& result = Smi::Handle(); |
+ result ^= comments_.At(idx * kNumberOfEntries + kPCOffsetEntry); |
+ return result.Value(); |
} |
@@ -7066,9 +7069,10 @@ |
} |
-const String& Code::Comments::CommentAt(intptr_t idx) const { |
- return String::CheckedHandle( |
- comments_.At(idx * kNumberOfEntries + kCommentEntry)); |
+RawString* Code::Comments::CommentAt(intptr_t idx) const { |
+ String& result = String::Handle(); |
+ result ^= comments_.At(idx * kNumberOfEntries + kCommentEntry); |
+ return result.raw(); |
} |