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

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

Issue 2860163003: Avoid triggering an assert (Closed)
Patch Set: Created 3 years, 7 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 | « runtime/vm/kernel.h ('k') | 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) 2016, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2016, 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/kernel_reader.h" 5 #include "vm/kernel_reader.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "vm/dart_api_impl.h" 9 #include "vm/dart_api_impl.h"
10 #include "vm/kernel_binary.h" 10 #include "vm/kernel_binary.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 Z, builtin_library.LookupFunctionAllowPrivate( 206 Z, builtin_library.LookupFunctionAllowPrivate(
207 dart::String::Handle(dart::String::New("_getMainClosure")))); 207 dart::String::Handle(dart::String::New("_getMainClosure"))));
208 208
209 Procedure* procedure = 209 Procedure* procedure =
210 reinterpret_cast<Procedure*>(to_patch.kernel_function()); 210 reinterpret_cast<Procedure*>(to_patch.kernel_function());
211 // If dart:_builtin was not compiled from Kernel at all it does not need 211 // If dart:_builtin was not compiled from Kernel at all it does not need
212 // to be patched. 212 // to be patched.
213 if (procedure != NULL) { 213 if (procedure != NULL) {
214 // We will handle the StaticGet specially and will not use the name. 214 // We will handle the StaticGet specially and will not use the name.
215 // 215 //
216 // TODO(kmillikin): we are leaking the function body. Find a way to 216 // TODO(kmillikin): we are leaking the new function body. Find a way to
217 // deallocate it. 217 // deallocate it.
218 delete procedure->function()->body();
zra 2017/05/04 20:51:09 To avoid the hack in set_body, maybe replace these
218 procedure->function()->set_body( 219 procedure->function()->set_body(
219 new ReturnStatement(new StaticGet(NameIndex()))); 220 new ReturnStatement(new StaticGet(NameIndex())));
220 } 221 }
221 return library; 222 return library;
222 } 223 }
223 } 224 }
224 225
225 // Either class finalization failed or we caught a compile error. 226 // Either class finalization failed or we caught a compile error.
226 // In both cases sticky error would be set. 227 // In both cases sticky error would be set.
227 Error& error = Error::Handle(Z); 228 Error& error = Error::Handle(Z);
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 initializer_fun.set_is_debuggable(false); 941 initializer_fun.set_is_debuggable(false);
941 initializer_fun.set_is_reflectable(false); 942 initializer_fun.set_is_reflectable(false);
942 initializer_fun.set_is_inlinable(false); 943 initializer_fun.set_is_inlinable(false);
943 return new (zone) ParsedFunction(thread, initializer_fun); 944 return new (zone) ParsedFunction(thread, initializer_fun);
944 } 945 }
945 946
946 947
947 } // namespace kernel 948 } // namespace kernel
948 } // namespace dart 949 } // namespace dart
949 #endif // !defined(DART_PRECOMPILED_RUNTIME) 950 #endif // !defined(DART_PRECOMPILED_RUNTIME)
OLDNEW
« no previous file with comments | « runtime/vm/kernel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698