sdk/lib/_internal/compiler/implementation/ssa/builder.dart - Issue 11783009: Big merge from experimental to bleeding edge.

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

Issue 11783009: Big merge from experimental to bleeding edge. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 years, 11 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/scanner/token.dart ('k') | sdk/lib/_internal/compiler/implementation/ssa/codegen.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 277be1e64bbff78bb51e8cc6782a6cef8886a738..ed776e7afcfd4d23684c4f1f28cbae34fdb40bd3 100644

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

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

@@ -3973,9 +3973,9 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {

visitForIn(ForIn node) {

// Generate a structure equivalent to:

- // Iterator<E> $iter = <iterable>.iterator()

- // while ($iter.hasNext) {

- // E <declaredIdentifier> = $iter.next();

+ // Iterator<E> $iter = <iterable>.iterator;

+ // while ($iter.moveNext()) {

+ // E <declaredIdentifier> = $iter.current;

// <body>

// }

@@ -3984,32 +3984,38 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {

void buildInitializer() {

SourceString iteratorName = const SourceString("iterator");

Selector selector =

- new Selector.call(iteratorName, work.element.getLibrary(), 0);

+ new Selector.getter(iteratorName, work.element.getLibrary());

Set<ClassElement> interceptedClasses =

interceptors.getInterceptedClassesOn(selector);

visit(node.expression);

HInstruction receiver = pop();

+ bool hasGetter = compiler.world.hasAnyUserDefinedGetter(selector);

if (interceptedClasses == null) {

- iterator = new HInvokeDynamicMethod(selector, <HInstruction>[receiver]);

+ iterator =

+ new HInvokeDynamicGetter(selector, null, receiver, hasGetter);

} else {

HInterceptor interceptor =

invokeInterceptor(interceptedClasses, receiver, null);

- iterator = new HInvokeDynamicMethod(

- selector, <HInstruction>[interceptor, receiver]);

+ iterator =

+ new HInvokeDynamicGetter(selector, null, interceptor, hasGetter);

+ // Add the receiver as an argument to the getter call on the

+ // interceptor.

+ iterator.inputs.add(receiver);

}

add(iterator);

}

HInstruction buildCondition() {

- SourceString name = const SourceString('hasNext');

- Selector selector = new Selector.getter(name, work.element.getLibrary());

+ SourceString name = const SourceString('moveNext');

+ Selector selector = new Selector.call(name, work.element.getLibrary(), 0);

bool hasGetter = compiler.world.hasAnyUserDefinedGetter(selector);

- push(new HInvokeDynamicGetter(selector, null, iterator, !hasGetter));

+ push(new HInvokeDynamicMethod(selector, <HInstruction>[iterator]));

return popBoolified();

}

void buildBody() {

- SourceString name = const SourceString('next');

- Selector call = new Selector.call(name, work.element.getLibrary(), 0);

- push(new HInvokeDynamicMethod(call, <HInstruction>[iterator]));

+ SourceString name = const SourceString('current');

+ Selector call = new Selector.getter(name, work.element.getLibrary());

+ bool hasGetter = compiler.world.hasAnyUserDefinedGetter(call);

+ push(new HInvokeDynamicGetter(call, null, iterator, hasGetter));

Element variable;

if (node.declaredIdentifier.asSend() != null) {

@@ -4237,7 +4243,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {

bool hasDefault = false;

Element getFallThroughErrorElement =

compiler.findHelper(const SourceString("getFallThroughError"));

- Iterator<Node> caseIterator = node.cases.iterator();

+ HasNextIterator<Node> caseIterator =

+ new HasNextIterator<Node>(node.cases.iterator);

while (caseIterator.hasNext) {

SwitchCase switchCase = caseIterator.next();

List<Constant> caseConstants = <Constant>[];