sdk/lib/_internal/compiler/implementation/ssa/builder.dart - Issue 256453004: Avoid inlining constants that are used via a deferred import.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Issue 256453004: Avoid inlining constants that are used via a deferred import. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Rebase Created 6 years, 7 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 | « sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart ('k') | sdk/lib/_internal/compiler/implementation/ssa/nodes.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/ssa/builder.dart

diff --git a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart

index 786fc5fa56c5b7adca866dcd5084286e3b958b41..fcef11087ef166cf634fd3dad454dd22fc521211 100644

--- a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart

+++ b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart

@@ -2996,7 +2996,16 @@ class SsaBuilder extends ResolvedVisitor {

value = backend.constants.getConstantForVariable(element);

}

if (value != null) {

- HConstant instruction = graph.addConstant(value, compiler);

+ HConstant instruction;

+ // Constants that are referred via a deferred prefix should be referred

+ // by reference.

+ PrefixElement prefix = compiler.deferredLoadTask

+ .deferredPrefixElement(send, elements);

+ if (prefix != null) {

+ instruction = graph.addDeferredConstant(value, prefix, compiler);

+ } else {

+ instruction = graph.addConstant(value, compiler);

+ }

stack.add(instruction);

// The inferrer may have found a better type than the constant

// handler in the case of lists, because the constant handler