Skip to content

Commit 350481a

Browse files
Markzipancommit-bot@chromium.org
authored andcommitted
Revert "[dartdevc] Fixing issue related to dual exports of multiple entrypoints in a cyclic import loop."
This reverts commit 53895b2. Reason for revert: Replacing this change with a new strategy for better module reordering. Original change's description: > [dartdevc] Fixing issue related to dual exports of multiple entrypoints in a cyclic import loop. > > See: flutter/flutter#64011 > Change-Id: I8a11e9d3f19428a516cf7a60ee45c3bacf26545d > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162383 > Commit-Queue: Mark Zhou <[email protected]> > Reviewed-by: Nicholas Shahan <[email protected]> [email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: Iee91d33d1696ffa7406b724466144ab06af80394 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/165873 Commit-Queue: Mark Zhou <[email protected]> Reviewed-by: Mark Zhou <[email protected]> Reviewed-by: Sigmund Cherem <[email protected]>
1 parent 168b720 commit 350481a

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

pkg/dev_compiler/lib/src/kernel/compiler.dart

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -882,21 +882,16 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
882882
var savedTopLevelClass = _classEmittingExtends;
883883
_classEmittingExtends = c;
884884

885-
// Refers to 'S' in `class C extends S`. Set this to null to avoid
886-
// referencing deferred supertypes in _emitClassConstructor's JS output.
887-
js_ast.Expression baseClass;
888-
885+
// Unroll mixins.
889886
if (shouldDefer(supertype)) {
890887
deferredSupertypes.add(runtimeStatement('setBaseClass(#, #)', [
891888
getBaseClass(isMixinAliasClass(c) ? 0 : mixinApplications.length),
892889
emitDeferredType(supertype),
893890
]));
894-
// Refers to 'supertype' without any type arguments.
895891
supertype =
896892
_coreTypes.rawType(supertype.classNode, _currentLibrary.nonNullable);
897-
} else {
898-
baseClass = emitClassRef(supertype);
899893
}
894+
var baseClass = emitClassRef(supertype);
900895

901896
if (isMixinAliasClass(c)) {
902897
// Given `class C = Object with M [implements I1, I2 ...];`

0 commit comments

Comments
 (0)