Skip to content

Commit 7199398

Browse files
kunzhao77kevmoo
authored andcommitted
Fix unhandle exception when access ElementAnnotationImpl.constantValue
BUG= [email protected] Review URL: https://codereview.chromium.org/1693223002 . Patch from Kun Zhao <[email protected]>.
1 parent c3d98ac commit 7199398

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkg/analyzer/lib/src/dart/element/element.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ class ConstFieldElementImpl extends FieldElementImpl with ConstVariableElement {
12211221
ConstFieldElementImpl.forNode(Identifier name) : super.forNode(name);
12221222

12231223
@override
1224-
DartObject get constantValue => _result.value;
1224+
DartObject get constantValue => _result?.value;
12251225

12261226
@override
12271227
EvaluationResultImpl get evaluationResult => _result;
@@ -1255,7 +1255,7 @@ class ConstLocalVariableElementImpl extends LocalVariableElementImpl
12551255
ConstLocalVariableElementImpl.forNode(Identifier name) : super.forNode(name);
12561256

12571257
@override
1258-
DartObject get constantValue => _result.value;
1258+
DartObject get constantValue => _result?.value;
12591259

12601260
@override
12611261
EvaluationResultImpl get evaluationResult => _result;
@@ -1414,7 +1414,7 @@ class ConstTopLevelVariableElementImpl extends TopLevelVariableElementImpl
14141414
: super.forNode(name);
14151415

14161416
@override
1417-
DartObject get constantValue => _result.value;
1417+
DartObject get constantValue => _result?.value;
14181418

14191419
@override
14201420
EvaluationResultImpl get evaluationResult => _result;
@@ -1473,7 +1473,7 @@ class DefaultFieldFormalParameterElementImpl
14731473
: super.forNode(name);
14741474

14751475
@override
1476-
DartObject get constantValue => _result.value;
1476+
DartObject get constantValue => _result?.value;
14771477

14781478
@override
14791479
EvaluationResultImpl get evaluationResult => _result;
@@ -1507,7 +1507,7 @@ class DefaultParameterElementImpl extends ParameterElementImpl
15071507
DefaultParameterElementImpl.forNode(Identifier name) : super.forNode(name);
15081508

15091509
@override
1510-
DartObject get constantValue => _result.value;
1510+
DartObject get constantValue => _result?.value;
15111511

15121512
@override
15131513
EvaluationResultImpl get evaluationResult => _result;
@@ -1610,7 +1610,7 @@ class ElementAnnotationImpl implements ElementAnnotation {
16101610
ElementAnnotationImpl(this.compilationUnit);
16111611

16121612
@override
1613-
DartObject get constantValue => evaluationResult.value;
1613+
DartObject get constantValue => evaluationResult?.value;
16141614

16151615
@override
16161616
AnalysisContext get context => compilationUnit.library.context;

0 commit comments

Comments
 (0)