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

Unified Diff: runtime/vm/flow_graph_type_propagator.cc

Issue 12288030: Fix compilation error: enumeral and non-enumeral type in conditional expression. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 10 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_type_propagator.cc
diff --git a/runtime/vm/flow_graph_type_propagator.cc b/runtime/vm/flow_graph_type_propagator.cc
index 688c4bc54df99602152b8216ba11a24fe5422a53..595a94e785322b192848918fdf7c41182e245b26 100644
--- a/runtime/vm/flow_graph_type_propagator.cc
+++ b/runtime/vm/flow_graph_type_propagator.cc
@@ -288,7 +288,11 @@ intptr_t CompileType::ToNullableCid() {
cid_ = kNullCid;
} else if (FLAG_use_cha && type_->HasResolvedTypeClass()) {
const intptr_t cid = Class::Handle(type_->type_class()).id();
- cid_ = !CHA::HasSubclasses(cid) ? cid : kDynamicCid;
+ if (!CHA::HasSubclasses(cid)) {
+ cid_ = cid;
+ } else {
+ cid_ = kDynamicCid;
+ }
} else {
cid_ = kDynamicCid;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698