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

Unified Diff: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart

Issue 810473003: dart2js: Fix of deferred static functions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Improve tests Created 6 years 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 | tests/language/deferred_static_seperate_lib1.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
index c52b465d4667a2c21d2f2f3b475a72feebd5b035..ad8fa35a7bbcbbf690141ca3007118df8013784f 100644
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart
@@ -2030,8 +2030,10 @@ function(originalDescriptor, name, holder, isStatic, globalFunctionsAccess) {
// native elements.
ClassElement cls =
element.enclosingClassOrCompilationUnit.declaration;
- if (compiler.codegenWorld.directlyInstantiatedClasses.contains(cls)
- && !cls.isNative) {
+ if (compiler.codegenWorld.directlyInstantiatedClasses.contains(cls) &&
+ !cls.isNative &&
+ compiler.deferredLoadTask.outputUnitForElement(element) ==
+ compiler.deferredLoadTask.outputUnitForElement(cls)) {
owner = cls;
}
}
« no previous file with comments | « no previous file | tests/language/deferred_static_seperate_lib1.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698