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

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

Issue 824103005: Revert "Remove Compiler.assembledCode." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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 | « pkg/compiler/lib/compiler.dart ('k') | pkg/compiler/lib/src/dart2js.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/compiler.dart
diff --git a/pkg/compiler/lib/src/compiler.dart b/pkg/compiler/lib/src/compiler.dart
index 4646013fb6bf24eeb9adbc2abb3bdad333b56854..673fa5ba79aac85fd2d5d9284b569acc53350f70 100644
--- a/pkg/compiler/lib/src/compiler.dart
+++ b/pkg/compiler/lib/src/compiler.dart
@@ -273,9 +273,7 @@ abstract class Backend {
return new native.NativeEnqueuer();
}
- /// Generates the output and returns the total size of the generated code.
- int assembleProgram();
-
+ void assembleProgram();
List<CompilerTask> get tasks;
void onResolutionComplete() {}
@@ -629,6 +627,7 @@ abstract class Compiler implements DiagnosticListener {
final Stopwatch totalCompileTime = new Stopwatch();
int nextFreeClassId = 0;
World world;
+ String assembledCode;
Types types;
_CompilerCoreTypes _coreTypes;
@@ -1080,6 +1079,8 @@ abstract class Compiler implements DiagnosticListener {
}
void internalError(Spannable node, reason) {
+ assembledCode = null; // Compilation failed. Make sure that we
+ // don't return a bogus result.
String message = tryToString(reason);
reportDiagnosticInternal(
node, MessageKind.GENERIC, {'text': message}, api.Diagnostic.CRASH);
@@ -1614,14 +1615,17 @@ abstract class Compiler implements DiagnosticListener {
if (compilationFailed) return;
- int programSize = backend.assembleProgram();
+ backend.assembleProgram();
if (dumpInfo) {
- dumpInfoTask.reportSize(programSize);
dumpInfoTask.dumpInfo();
}
checkQueues();
+
+ if (compilationFailed) {
+ assembledCode = null; // Signals failure.
+ }
}
void fullyEnqueueLibrary(LibraryElement library, Enqueuer world) {
« no previous file with comments | « pkg/compiler/lib/compiler.dart ('k') | pkg/compiler/lib/src/dart2js.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698