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

Unified Diff: sdk/lib/_internal/compiler/implementation/js_backend/backend.dart

Issue 23003031: Extract interceptor calls from raw is-checks. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments. Created 7 years, 4 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 | sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
index 7a809b704837a6196034428490b1419483c962a2..8b6f8725ad2f945ae4b9170ad68dae3e29f9da01 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
@@ -268,7 +268,7 @@ class JavaScriptBackend extends Backend {
/**
* Set of classes whose methods are intercepted.
*/
- final Set<ClassElement> interceptedClasses = new Set<ClassElement>();
+ final Set<ClassElement> _interceptedClasses = new Set<ClassElement>();
/**
* Set of classes used as mixins on native classes. Methods on these classes
@@ -557,10 +557,6 @@ class JavaScriptBackend extends Backend {
jsStringToString = compiler.lookupElementIn(
jsStringClass, const SourceString('toString'));
- for (ClassElement cls in classes) {
- if (cls != null) interceptedClasses.add(cls);
- }
-
typeLiteralClass = compiler.findHelper(const SourceString('TypeImpl'));
mapLiteralClass =
compiler.coreLibrary.find(const SourceString('LinkedHashMap'));
@@ -630,6 +626,8 @@ class JavaScriptBackend extends Backend {
Enqueuer enqueuer,
TreeElements elements) {
if (enqueuer.isResolutionQueue) {
+ _interceptedClasses.add(jsInterceptorClass);
+ _interceptedClasses.add(cls);
cls.ensureResolved(compiler);
cls.forEachMember((ClassElement classElement, Element member) {
// All methods on [Object] are shadowed by [Interceptor].
@@ -643,6 +641,11 @@ class JavaScriptBackend extends Backend {
enqueueClass(enqueuer, cls, elements);
}
+ Set<ClassElement> get interceptedClasses {
+ assert(compiler.enqueuer.resolution.queueIsClosed);
+ return _interceptedClasses;
+ }
+
void registerSpecializedGetInterceptor(Set<ClassElement> classes) {
String name = namer.getInterceptorName(getInterceptorMethod, classes);
if (classes.contains(jsInterceptorClass)) {
@@ -711,8 +714,9 @@ class JavaScriptBackend extends Backend {
|| cls == jsFixedArrayClass
|| cls == jsExtendableArrayClass) {
addInterceptors(jsArrayClass, enqueuer, elements);
- enqueueClass(enqueuer, jsFixedArrayClass, elements);
- enqueueClass(enqueuer, jsExtendableArrayClass, elements);
+ addInterceptors(jsMutableArrayClass, enqueuer, elements);
+ addInterceptors(jsFixedArrayClass, enqueuer, elements);
+ addInterceptors(jsExtendableArrayClass, enqueuer, elements);
} else if (cls == compiler.intClass || cls == jsIntClass) {
addInterceptors(jsIntClass, enqueuer, elements);
addInterceptors(jsNumberClass, enqueuer, elements);
@@ -1284,6 +1288,23 @@ class JavaScriptBackend extends Backend {
}
}
+ /**
+ * Returns [:true:] if the checking of [type] is performed directly on the
+ * object and not on an interceptor.
+ */
+ bool hasDirectCheckFor(DartType type) {
+ Element element = type.element;
+ return element == compiler.stringClass ||
+ element == compiler.boolClass ||
+ element == compiler.numClass ||
+ element == compiler.intClass ||
+ element == compiler.doubleClass ||
+ element == jsArrayClass ||
+ element == jsMutableArrayClass ||
+ element == jsExtendableArrayClass ||
+ element == jsFixedArrayClass;
+ }
+
Element getExceptionUnwrapper() {
return compiler.findHelper(const SourceString('unwrapException'));
}
« no previous file with comments | « no previous file | sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698