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

Unified Diff: runtime/vm/ast.cc

Issue 1180903002: null-aware operators in the VM (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: updating test and status files Created 5 years, 6 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 | « runtime/vm/ast.h ('k') | runtime/vm/ast_transformer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/ast.cc
diff --git a/runtime/vm/ast.cc b/runtime/vm/ast.cc
index fdd39e4d503965b425ee8f1fefdf6c6e8a311e9f..ef224e29aa84a4f1802839e064628e8d73ca5c9a 100644
--- a/runtime/vm/ast.cc
+++ b/runtime/vm/ast.cc
@@ -262,6 +262,7 @@ bool BinaryOpNode::IsKindValid() const {
case Token::kMOD:
case Token::kOR:
case Token::kAND:
+ case Token::kIFNULL:
case Token::kBIT_OR:
case Token::kBIT_XOR:
case Token::kBIT_AND:
@@ -529,18 +530,23 @@ AstNode* LoadStaticFieldNode::MakeAssignmentNode(AstNode* rhs) {
AstNode* InstanceGetterNode::MakeAssignmentNode(AstNode* rhs) {
- return new InstanceSetterNode(token_pos(), receiver(), field_name(), rhs);
+ return new InstanceSetterNode(token_pos(),
+ receiver(),
+ field_name(),
+ rhs,
+ is_conditional());
}
bool InstanceGetterNode::IsPotentiallyConst() const {
return field_name().Equals(Symbols::Length()) &&
+ !is_conditional() &&
receiver()->IsPotentiallyConst();
}
const Instance* InstanceGetterNode::EvalConstExpr() const {
- if (field_name().Equals(Symbols::Length())) {
+ if (field_name().Equals(Symbols::Length()) && !is_conditional()) {
const Instance* receiver_val = receiver()->EvalConstExpr();
if ((receiver_val != NULL) && receiver_val->IsString()) {
return &Instance::ZoneHandle(Smi::New(1));
« no previous file with comments | « runtime/vm/ast.h ('k') | runtime/vm/ast_transformer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698