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

Unified Diff: dart/pkg/compiler/lib/src/compile_time_constants.dart

Issue 840723003: Recover from crash in xcodebuild/ReleaseIA32/generated_tests/language/async_test_constructor4.dart. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Merged with r42903. Created 5 years, 11 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 | dart/pkg/compiler/lib/src/elements/modelx.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/pkg/compiler/lib/src/compile_time_constants.dart
diff --git a/dart/pkg/compiler/lib/src/compile_time_constants.dart b/dart/pkg/compiler/lib/src/compile_time_constants.dart
index 24bacbee599ac77e42007a69215e351278bfa496..271ff8da1f47b25e9845f9f29f518e3dbfed3d47 100644
--- a/dart/pkg/compiler/lib/src/compile_time_constants.dart
+++ b/dart/pkg/compiler/lib/src/compile_time_constants.dart
@@ -954,6 +954,7 @@ class ConstructorEvaluator extends CompileTimeConstantEvaluator {
* parameters (like [:this.x:]), also updates the [fieldValues] map.
*/
void assignArgumentsToParameters(List<AstConstant> arguments) {
+ if (constructor.isErroneous) return;
// Assign arguments to parameters.
FunctionSignature signature = constructor.functionSignature;
int index = 0;
@@ -1065,6 +1066,7 @@ class ConstructorEvaluator extends CompileTimeConstantEvaluator {
* native JavaScript constructor.
*/
void evaluateConstructorFieldValues(List<AstConstant> arguments) {
+ if (constructor.isErroneous) return;
compiler.withCurrentElement(constructor, () {
assignArgumentsToParameters(arguments);
evaluateConstructorInitializers();
« no previous file with comments | « no previous file | dart/pkg/compiler/lib/src/elements/modelx.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698