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

Unified Diff: runtime/vm/object.cc

Issue 1663163003: Initial split of precompilation code from compiler.cc (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 11 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
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 340735fd95a9ef2c78f56c677e0707da75423b09..3ba7c7a735917deb52ed664978719e540e48b596 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -29,6 +29,7 @@
#include "vm/intrinsifier.h"
#include "vm/object_store.h"
#include "vm/parser.h"
+#include "vm/precompiler.h"
#include "vm/profiler.h"
#include "vm/report.h"
#include "vm/reusable_handles.h"
@@ -5131,7 +5132,7 @@ bool Function::HasBreakpoint() const {
void Function::InstallOptimizedCode(const Code& code, bool is_osr) const {
DEBUG_ASSERT(IsMutatorOrAtSafepoint());
- // We may not have previous code if 'always_optimize' is set.
+ // We may not have previous code if FLAG_precompile is set.
if (!is_osr && HasCode()) {
Code::Handle(CurrentCode()).DisableDartCode();
}
@@ -7704,7 +7705,8 @@ void Field::EvaluateInitializer() const {
ASSERT(is_static());
if (StaticValue() == Object::sentinel().raw()) {
SetStaticValue(Object::transition_sentinel());
- Object& value = Object::Handle(Compiler::EvaluateStaticInitializer(*this));
+ const Object& value =
+ Object::Handle(Compiler::EvaluateStaticInitializer(*this));
if (value.IsError()) {
SetStaticValue(Object::null_instance());
Exceptions::PropagateError(Error::Cast(value));

Powered by Google App Engine
This is Rietveld 408576698