Remove code for supporting for generating code with compile time error
We don't support that currently and if we want to at some point in the future,
I'd rather implement it from scratch, and the current implementation tightly
couples various parts of the compiler to the `Compiler` object.
Change-Id: I6934df41bb363ea9a693a8181b5a0355774ba4b9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101286
Reviewed-by: Sigmund Cherem <sigmund@google.com>
diff --git a/pkg/compiler/lib/src/compiler.dart b/pkg/compiler/lib/src/compiler.dart
index 0ea4219..4386138 100644
--- a/pkg/compiler/lib/src/compiler.dart
+++ b/pkg/compiler/lib/src/compiler.dart
@@ -85,12 +85,6 @@
Map<Entity, WorldImpact> get impactCache => _impactCache;
ImpactCacheDeleter get impactCacheDeleter => _impactCacheDeleter;
- // TODO(zarah): Remove this map and incorporate compile-time errors
- // in the model.
- /// Tracks elements with compile-time errors.
- final Map<Entity, List<DiagnosticMessage>> elementsWithCompileTimeErrors =
- new Map<Entity, List<DiagnosticMessage>>();
-
final Environment environment;
// TODO(sigmund): delete once we migrate the rest of the compiler to use
// `environment` directly.
@@ -244,7 +238,7 @@
KernelResult result = await kernelLoader.load(uri);
reporter.log("Kernel load complete");
if (result == null) return;
- if (compilationFailed && !options.generateCodeWithCompileTimeErrors) {
+ if (compilationFailed) {
return;
}
if (options.cfeOnly) return;
@@ -338,13 +332,7 @@
_reporter.reportSuppressedMessagesSummary();
if (compilationFailed) {
- if (!options.generateCodeWithCompileTimeErrors) {
- return null;
- }
- if (mainFunction == null) return null;
- if (!backend.enableCodegenWithErrorsIfSupported(NO_LOCATION_SPANNABLE)) {
- return null;
- }
+ return null;
}
assert(mainFunction != null);
@@ -538,7 +526,6 @@
if (markCompilationAsFailed(message, kind)) {
compilationFailed = true;
}
- registerCompileTimeError(currentElement, message);
}
/// Helper for determining whether the current element is declared within
@@ -603,27 +590,6 @@
}
return null;
}
-
- /// Returns [true] if a compile-time error has been reported for element.
- bool elementHasCompileTimeError(Entity element) {
- return elementsWithCompileTimeErrors.containsKey(element);
- }
-
- /// Associate [element] with a compile-time error [message].
- void registerCompileTimeError(Entity element, DiagnosticMessage message) {
- // The information is only needed if [generateCodeWithCompileTimeErrors].
- if (options.generateCodeWithCompileTimeErrors) {
- if (element == null) {
- // Record as global error.
- // TODO(zarah): Extend element model to represent compile-time
- // errors instead of using a map.
- element = frontendStrategy.elementEnvironment.mainFunction;
- }
- elementsWithCompileTimeErrors
- .putIfAbsent(element, () => <DiagnosticMessage>[])
- .add(message);
- }
- }
}
class _CompilerOutput implements api.CompilerOutput {
@@ -637,14 +603,8 @@
api.OutputSink createOutputSink(
String name, String extension, api.OutputType type) {
if (_compiler.compilationFailed) {
- if (!_compiler.options.generateCodeWithCompileTimeErrors ||
- _compiler.options.testMode) {
- // Disable output in test mode: The build bot currently uses the time
- // stamp of the generated file to determine whether the output is
- // up-to-date.
- return const NullCompilerOutput()
- .createOutputSink(name, extension, type);
- }
+ // Ensure that we don't emit output when the compilation has failed.
+ return const NullCompilerOutput().createOutputSink(name, extension, type);
}
return _userOutput.createOutputSink(name, extension, type);
}
@@ -758,13 +718,6 @@
if (kind == api.Diagnostic.ERROR ||
kind == api.Diagnostic.CRASH ||
(options.fatalWarnings && kind == api.Diagnostic.WARNING)) {
- Entity errorElement;
- if (message.spannable is Entity) {
- errorElement = message.spannable;
- } else {
- errorElement = currentElement;
- }
- compiler.registerCompileTimeError(errorElement, message);
compiler.fatalDiagnosticReported(message, infos, kind);
}
}
diff --git a/pkg/compiler/lib/src/dart2js.dart b/pkg/compiler/lib/src/dart2js.dart
index c829eaa..ebdc6a0 100644
--- a/pkg/compiler/lib/src/dart2js.dart
+++ b/pkg/compiler/lib/src/dart2js.dart
@@ -414,7 +414,7 @@
new OptionHandler('--enable-null-aware-operators', ignoreOption),
new OptionHandler('--enable-enum', ignoreOption),
new OptionHandler(Flags.allowNativeExtensions, setAllowNativeExtensions),
- new OptionHandler(Flags.generateCodeWithCompileTimeErrors, passThrough),
+ new OptionHandler(Flags.generateCodeWithCompileTimeErrors, ignoreOption),
new OptionHandler(Flags.useMultiSourceInfo, passThrough),
new OptionHandler(Flags.useNewSourceInfo, passThrough),
new OptionHandler(Flags.testMode, passThrough),
diff --git a/pkg/compiler/lib/src/js_backend/backend.dart b/pkg/compiler/lib/src/js_backend/backend.dart
index e900a9b..001595f 100644
--- a/pkg/compiler/lib/src/js_backend/backend.dart
+++ b/pkg/compiler/lib/src/js_backend/backend.dart
@@ -22,7 +22,6 @@
import '../io/source_information.dart'
show SourceInformation, SourceInformationStrategy;
import '../js/js.dart' as jsAst;
-import '../js/js.dart' show js;
import '../js_model/elements.dart';
import '../js/rewrite_async.dart';
import '../js_emitter/js_emitter.dart' show CodeEmitterTask;
@@ -633,19 +632,6 @@
WorldImpact codegen(CodegenWorkItem work, JClosedWorld closedWorld,
GlobalTypeInferenceResults globalInferenceResults) {
MemberEntity element = work.element;
- if (compiler.elementHasCompileTimeError(element)) {
- DiagnosticMessage message =
- // If there's more than one error, the first is probably most
- // informative, as the following errors may be side-effects of the
- // first error.
- compiler.elementsWithCompileTimeErrors[element].first;
- String messageText = message.message.computeMessage();
- jsAst.LiteralString messageLiteral =
- js.escapedString("Compile time error in $element: $messageText");
- generatedCode[element] =
- js("function () { throw new Error(#); }", [messageLiteral]);
- return const WorldImpact();
- }
if (element.isConstructor &&
element.enclosingClass == closedWorld.commonElements.jsNullClass) {
// Work around a problem compiling JSNull's constructor.
@@ -776,10 +762,6 @@
tracer.close();
}
- /// Enable compilation of code with compile time errors. Returns `true` if
- /// supported by the backend.
- bool enableCodegenWithErrorsIfSupported(Spannable node) => true;
-
jsAst.Expression rewriteAsync(
CommonElements commonElements,
JElementEnvironment elementEnvironment,
diff --git a/pkg/compiler/lib/src/js_backend/impact_transformer.dart b/pkg/compiler/lib/src/js_backend/impact_transformer.dart
index 5536b96..1dbffb7 100644
--- a/pkg/compiler/lib/src/js_backend/impact_transformer.dart
+++ b/pkg/compiler/lib/src/js_backend/impact_transformer.dart
@@ -88,12 +88,6 @@
case Feature.CATCH_STATEMENT:
registerImpact(_impacts.catchStatement);
break;
- case Feature.COMPILE_TIME_ERROR:
- if (_options.generateCodeWithCompileTimeErrors) {
- // TODO(johnniwinther): This should have its own uncatchable error.
- registerImpact(_impacts.throwRuntimeError);
- }
- break;
case Feature.FALL_THROUGH_ERROR:
registerImpact(_impacts.fallThroughError);
break;
diff --git a/pkg/compiler/lib/src/options.dart b/pkg/compiler/lib/src/options.dart
index f91b15b..2e4ac4b 100644
--- a/pkg/compiler/lib/src/options.dart
+++ b/pkg/compiler/lib/src/options.dart
@@ -215,9 +215,6 @@
/// Whether to generate code containing user's `assert` statements.
bool enableUserAssertions = false;
- /// Whether to generate output even when there are compile-time errors.
- bool generateCodeWithCompileTimeErrors = false;
-
/// Whether to generate a source-map file together with the output program.
bool generateSourceMap = true;
@@ -385,8 +382,6 @@
..experimentCallInstrumentation =
_hasOption(options, Flags.experimentCallInstrumentation)
..experimentNewRti = _hasOption(options, Flags.experimentNewRti)
- ..generateCodeWithCompileTimeErrors =
- _hasOption(options, Flags.generateCodeWithCompileTimeErrors)
..generateSourceMap = !_hasOption(options, Flags.noSourceMaps)
..outputUri = _extractUriOption(options, '--out=')
..platformBinaries =
@@ -464,9 +459,6 @@
}
}
- // TODO(johnniwinther): Should we support this in the future?
- generateCodeWithCompileTimeErrors = false;
-
// Strong mode always trusts type annotations (inferred or explicit), so
// assignments checks should be trusted.
assignmentCheckPolicy = CheckPolicy.trusted;
diff --git a/pkg/compiler/lib/src/ssa/builder_kernel.dart b/pkg/compiler/lib/src/ssa/builder_kernel.dart
index 03ccfc8..877c749 100644
--- a/pkg/compiler/lib/src/ssa/builder_kernel.dart
+++ b/pkg/compiler/lib/src/ssa/builder_kernel.dart
@@ -5258,8 +5258,6 @@
return false;
}
- if (compiler.elementHasCompileTimeError(function)) return false;
-
bool insideLoop = loopDepth > 0 || graph.calledInLoop;
// Bail out early if the inlining decision is in the cache and we can't
diff --git a/pkg/compiler/lib/src/ssa/optimize.dart b/pkg/compiler/lib/src/ssa/optimize.dart
index ce7c6aa..daf93c6 100644
--- a/pkg/compiler/lib/src/ssa/optimize.dart
+++ b/pkg/compiler/lib/src/ssa/optimize.dart
@@ -3079,9 +3079,6 @@
(_, FieldEntity member) {
FieldAnalysisData fieldData = _fieldAnalysis.getFieldData(member);
if (fieldData.isElided) return;
- if (compiler.elementHasCompileTimeError(
- // ignore: UNNECESSARY_CAST
- member as Entity)) return;
if (fieldData.isInitializedInAllocator) {
// TODO(sra): Can we avoid calling HGraph.addConstant?
ConstantValue value = fieldData.initialValue;
diff --git a/pkg/compiler/lib/src/universe/feature.dart b/pkg/compiler/lib/src/universe/feature.dart
index 484ce10..f6386be 100644
--- a/pkg/compiler/lib/src/universe/feature.dart
+++ b/pkg/compiler/lib/src/universe/feature.dart
@@ -36,9 +36,6 @@
/// A catch statement.
CATCH_STATEMENT,
- /// A compile time error.
- COMPILE_TIME_ERROR,
-
/// A fall through in a switch case.
FALL_THROUGH_ERROR,
