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

Unified Diff: runtime/vm/code_generator.cc

Issue 8240005: Handle bug 5442338: PCDescriptors generated wrongly, disallowing optimizations, causing assert fa... (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/vm/code_generator_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/code_generator.cc
===================================================================
--- runtime/vm/code_generator.cc (revision 359)
+++ runtime/vm/code_generator.cc (working copy)
@@ -815,15 +815,19 @@
ASSERT(arguments.Count() ==
kOptimizeInvokedFunctionRuntimeEntry.argument_count());
const Function& function = Function::CheckedHandle(arguments.At(0));
- ASSERT(function.is_optimizable());
- ASSERT(!Code::Handle(function.code()).is_optimized());
- const Code& unoptimized_code = Code::Handle(function.code());
- // Compilation patches the entry of unoptimized code.
- Compiler::CompileOptimizedFunction(function);
- const Code& optimized_code = Code::Handle(function.code());
- ASSERT(!optimized_code.IsNull());
- ASSERT(!unoptimized_code.IsNull());
- DisableOldCode(function, unoptimized_code, optimized_code);
+ if (function.is_optimizable()) {
+ ASSERT(!Code::Handle(function.code()).is_optimized());
+ const Code& unoptimized_code = Code::Handle(function.code());
+ // Compilation patches the entry of unoptimized code.
+ Compiler::CompileOptimizedFunction(function);
+ const Code& optimized_code = Code::Handle(function.code());
+ ASSERT(!optimized_code.IsNull());
+ ASSERT(!unoptimized_code.IsNull());
+ DisableOldCode(function, unoptimized_code, optimized_code);
+ } else {
+ // TODO(5442338): Abort as this should not happen.
+ function.set_invocation_counter(0);
+ }
}
« no previous file with comments | « no previous file | runtime/vm/code_generator_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698