mirror of
https://github.com/dart-lang/sdk
synced 2024-10-04 17:04:56 +00:00
Fix invalid cast
R=scheglov@google.com Review-Url: https://codereview.chromium.org/2626463003 .
This commit is contained in:
parent
7b68f5a2ee
commit
59b025adfb
|
@ -8,6 +8,7 @@ import 'dart:collection';
|
|||
|
||||
import 'package:analyzer/context/declared_variables.dart';
|
||||
import 'package:analyzer/dart/ast/ast.dart';
|
||||
import 'package:analyzer/dart/ast/standard_ast_factory.dart';
|
||||
import 'package:analyzer/dart/ast/token.dart';
|
||||
import 'package:analyzer/dart/ast/visitor.dart';
|
||||
import 'package:analyzer/dart/constant/value.dart';
|
||||
|
@ -29,7 +30,6 @@ import 'package:analyzer/src/generated/type_system.dart'
|
|||
import 'package:analyzer/src/generated/utilities_collection.dart';
|
||||
import 'package:analyzer/src/generated/utilities_dart.dart' show ParameterKind;
|
||||
import 'package:analyzer/src/task/dart.dart';
|
||||
import 'package:analyzer/dart/ast/standard_ast_factory.dart';
|
||||
|
||||
/**
|
||||
* Helper class encapsulating the methods for evaluating constants and
|
||||
|
@ -1292,8 +1292,8 @@ class ConstantVisitor extends UnifyingAstVisitor<DartObjectImpl> {
|
|||
}
|
||||
ParameterizedType thenType = thenResult.type;
|
||||
ParameterizedType elseType = elseResult.type;
|
||||
return new DartObjectImpl.validWithUnknownValue(
|
||||
_typeSystem.getLeastUpperBound(thenType, elseType) as InterfaceType);
|
||||
return new DartObjectImpl.validWithUnknownValue(_typeSystem
|
||||
.getLeastUpperBound(thenType, elseType) as ParameterizedType);
|
||||
}
|
||||
|
||||
@override
|
||||
|
|
|
@ -144,9 +144,6 @@ class DartObjectImpl implements DartObject {
|
|||
*/
|
||||
static const List<DartObjectImpl> EMPTY_LIST = const <DartObjectImpl>[];
|
||||
|
||||
/**
|
||||
* The run-time type of this object.
|
||||
*/
|
||||
@override
|
||||
final ParameterizedType type;
|
||||
|
||||
|
@ -163,7 +160,7 @@ class DartObjectImpl implements DartObject {
|
|||
/**
|
||||
* Create an object to represent an unknown value.
|
||||
*/
|
||||
factory DartObjectImpl.validWithUnknownValue(InterfaceType type) {
|
||||
factory DartObjectImpl.validWithUnknownValue(ParameterizedType type) {
|
||||
if (type.element.library.isDartCore) {
|
||||
String typeName = type.name;
|
||||
if (typeName == "bool") {
|
||||
|
|
Loading…
Reference in a new issue