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

Unified Diff: pkg/compiler/lib/src/js_backend/codegen/task.dart

Issue 1196443002: Revert "cps-ir: Support foreign code." (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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
Index: pkg/compiler/lib/src/js_backend/codegen/task.dart
diff --git a/pkg/compiler/lib/src/js_backend/codegen/task.dart b/pkg/compiler/lib/src/js_backend/codegen/task.dart
index ebe3403b6f58cc4661517d2e8ed773bc0392fc6a..93fe011ff425145658aa8d71b0fdca8fb7960f24 100644
--- a/pkg/compiler/lib/src/js_backend/codegen/task.dart
+++ b/pkg/compiler/lib/src/js_backend/codegen/task.dart
@@ -57,35 +57,20 @@ class CpsFunctionCompiler implements FunctionCompiler {
String get name => 'CPS Ir pipeline';
- /// Generates JavaScript code for `work.element`.
+ /// Generates JavaScript code for `work.element`. First tries to use the
+ /// Cps Ir -> tree ir -> js pipeline, and if that fails due to language
+ /// features not implemented it will fall back to the ssa pipeline (for
+ /// platform code) or will cancel compilation (for user code).
js.Fun compile(CodegenWorkItem work) {
AstElement element = work.element;
JavaScriptBackend backend = compiler.backend;
return compiler.withCurrentElement(element, () {
+ if (element.library.isPlatformLibrary ||
+ element.library == backend.interceptorsLibrary) {
+ compiler.log('Using SSA compiler for platform element $element');
+ return fallbackCompiler.compile(work);
+ }
try {
- ClassElement cls = element.enclosingClass;
- String name = element.name;
- String className = cls == null ? null : cls.name;
- LibraryElement library = element.library;
- String libraryName = library == null ? null : library.toString();
- // TODO(karlklose): remove this fallback.
- // Fallback for a few functions that we know require try-finally and
- // switch.
- if (element.isNative ||
- libraryName == 'origin library(dart:typed_data)' ||
- // switch
- library.isInternalLibrary && name == 'unwrapException' ||
- // try-finally
- library.isPlatformLibrary && className == 'IterableBase' ||
- library.isInternalLibrary && className == 'Closure' ||
-
- libraryName == 'origin library(dart:collection)' &&
- name == 'mapToString' ||
- libraryName == 'library(dart:html)' && name == 'sanitizeNode') {
- compiler.log('Using SSA compiler for platform element $element');
- return fallbackCompiler.compile(work);
- }
-
if (tracer != null) {
tracer.traceCompilation(element.name, null);
}

Powered by Google App Engine
This is Rietveld 408576698