languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-22 23:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forget closure class maps.

Browse source 
R=johnniwinther@google.com

Review URL: https://codereview.chromium.org//619923004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@40883 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ahe@google.com 2014-10-02 15:48:21 +00:00
parent 121dcb94d6
commit 6e686cb8ed
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sdk/lib/_internal/compiler/implementation/js_backend/constant_handler_javascript.dart
View file

@ -250,5 +250,8 @@ class ForgetConstantNodeVisitor extends Visitor {
void visitNode(Node node) {
node.visitChildren(this);
constants.nodeConstantMap.remove(node);
// TODO(ahe): This doesn't belong here. Rename this class and generalize.
constants.compiler.closureToClassMapper.closureMappingCache.remove(node);
}
}

24
tests/try/poi/forget_element_test.dart
View file

@ -44,13 +44,16 @@ class ForgetElementTestCase extends CompilerTestCase {
final int expectedInitialDartValueCount;
final int additionalClosureClassMaps;
ForgetElementTestCase(
String source,
{int closureCount: 0,
int metadataCount: 0,
int constantCount: 0,
int initialValueCount: 0,
int initialDartValueCount: null})
int initialDartValueCount: null,
this.additionalClosureClassMaps: 0})
: this.expectedClosureCount = closureCount,
this.expectedMetadataCount = metadataCount,
this.expectedConstantCount = constantCount,
@ -93,6 +96,15 @@ class ForgetElementTestCase extends CompilerTestCase {
elementsWithDartInitialValuesIn(library).length,
'number of fields with initial values (Dart)');
// Check that the compiler has recorded the expected number of closure
// class maps. There's always at least one, from main. Each top-level
// element also seems to induce one.
Expect.equals(
expectedClosureCount + additionalClosureClassMaps,
closureClassMapsIn(library).length - 1,
'closure class map count ${closureClassMapsIn(library)}');
// Forget about all elements.
library.forEachLocalMember(compiler.forgetElement);
@ -112,6 +124,9 @@ class ForgetElementTestCase extends CompilerTestCase {
Expect.isTrue(
elementsWithDartInitialValuesIn(library).isEmpty,
'fields with initial values (Dart)');
// Check that closure class maps were forgotten.
Expect.isTrue(closureClassMapsIn(library).isEmpty, 'closure class maps');
});
Iterable closuresInLibrary(LibraryElement library) {
@ -171,6 +186,10 @@ class ForgetElementTestCase extends CompilerTestCase {
(VariableElement element) => element.library == library);
}
Iterable closureClassMapsIn(LibraryElement library) {
Map cache = compiler.closureToClassMapper.closureMappingCache;
return nodesIn(library).where((node) => cache[node] != null);
}
}
class NodeCollector extends tree.Visitor {
@ -276,7 +295,8 @@ List<CompilerTestCase> get tests => <CompilerTestCase>[
'main() => x; var x = const Constant(); $CONSTANT_CLASS',
constantCount: 1,
initialValueCount: 1,
initialDartValueCount: 0),
initialDartValueCount: 0,
additionalClosureClassMaps: 1),
// Test that a constant in a parameter initializer is discarded
// correctly.