| Index: pkg/analyzer/lib/src/generated/constant.dart | 
| diff --git a/pkg/analyzer/lib/src/generated/constant.dart b/pkg/analyzer/lib/src/generated/constant.dart | 
| index ce6ed09477528f9feb0257ddebcb9a17a5f13394..b5ccca6d4af3762333a38ae231a5c1ee7d3a2d11 100644 | 
| --- a/pkg/analyzer/lib/src/generated/constant.dart | 
| +++ b/pkg/analyzer/lib/src/generated/constant.dart | 
| @@ -6,11 +6,13 @@ library analyzer.src.generated.constant; | 
|  | 
| import 'dart:collection'; | 
|  | 
| +import 'package:analyzer/dart/ast/ast.dart'; | 
| +import 'package:analyzer/dart/ast/visitor.dart'; | 
| import 'package:analyzer/dart/element/element.dart'; | 
| import 'package:analyzer/dart/element/type.dart'; | 
| +import 'package:analyzer/src/dart/ast/utilities.dart'; | 
| import 'package:analyzer/src/dart/element/element.dart'; | 
| import 'package:analyzer/src/dart/element/member.dart'; | 
| -import 'package:analyzer/src/generated/ast.dart'; | 
| import 'package:analyzer/src/generated/engine.dart'; | 
| import 'package:analyzer/src/generated/engine.dart' | 
| show AnalysisEngine, RecordingErrorListener; | 
| @@ -2312,17 +2314,6 @@ class DartObjectComputer { | 
| return null; | 
| } | 
|  | 
| -  DartObjectImpl questionQuestion(Expression node, DartObjectImpl leftOperand, | 
| -      DartObjectImpl rightOperand) { | 
| -    if (leftOperand != null && rightOperand != null) { | 
| -      if (leftOperand.isNull) { | 
| -        return rightOperand; | 
| -      } | 
| -      return leftOperand; | 
| -    } | 
| -    return null; | 
| -  } | 
| - | 
| DartObjectImpl greaterThan(BinaryExpression node, DartObjectImpl leftOperand, | 
| DartObjectImpl rightOperand) { | 
| if (leftOperand != null && rightOperand != null) { | 
| @@ -2477,6 +2468,17 @@ class DartObjectComputer { | 
| return null; | 
| } | 
|  | 
| +  DartObjectImpl questionQuestion(Expression node, DartObjectImpl leftOperand, | 
| +      DartObjectImpl rightOperand) { | 
| +    if (leftOperand != null && rightOperand != null) { | 
| +      if (leftOperand.isNull) { | 
| +        return rightOperand; | 
| +      } | 
| +      return leftOperand; | 
| +    } | 
| +    return null; | 
| +  } | 
| + | 
| DartObjectImpl remainder(BinaryExpression node, DartObjectImpl leftOperand, | 
| DartObjectImpl rightOperand) { | 
| if (leftOperand != null && rightOperand != null) { | 
|  |