languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 10:49:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for combining private members.

Browse source 
Bug:
Change-Id: If623420777c13a2d6e56dfcc33be4f2d4ae69f34
Reviewed-on: https://dart-review.googlesource.com/18686
Reviewed-by: Sigmund Cherem <sigmund@google.com>
This commit is contained in:
Konstantin Shcheglov 2017-11-06 18:25:44 +00:00
parent 3828f6ac10
commit 00d9c180c3
2 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/front_end/lib/src/incremental/combine.dart
View file

@ -128,6 +128,10 @@ class _Combiner {
CanonicalName _adoptMemberName(NamedNode target, Member source) {
String qualifier = CanonicalName.getMemberQualifier(source);
CanonicalName parentName = target.canonicalName.getChild(qualifier);
if (source.name.isPrivate) {
Uri libraryUri = source.name.library.importUri;
parentName = parentName.getChildFromUri(libraryUri);
}
String sourceName = source.canonicalName.name;
if (parentName.hasChild(sourceName)) {
return parentName.getChild(sourceName);

47
pkg/front_end/test/src/incremental/combine_test.dart
View file

@ -1191,6 +1191,36 @@ class B4[B4]<T[T] extends A[A1]> {}
});
}
void test_procedure_method_private_updateReferences() {
var libraryA1 = _newLibrary('a');
var procedureA1A = _newMethod('_A', libraryForPrivate: libraryA1);
libraryA1.addProcedure(procedureA1A);
var libraryA2 = _newLibrary('a');
var procedureA2A = _newMethod('_A', libraryForPrivate: libraryA2);
libraryA2.addProcedure(procedureA2A);
var libraryB = _newLibrary('b');
libraryB.addProcedure(_newExpressionsProcedure([
new StaticInvocation(procedureA2A, new Arguments.empty()),
]));
var outline1 = _newOutline([libraryA1]);
var outline2 = _newOutline([libraryA2, libraryB]);
_runCombineTest([outline1, outline2], (result) {
var libraryA = _getLibrary(result.program, 'a');
_getProcedure(libraryA, '_A', '@methods');
var libraryB = _getLibrary(result.program, 'b');
var main = _getProcedure(libraryB, 'main', '@methods');
expect(
(_getProcedureExpression(main, 0) as StaticInvocation)
.targetReference,
same(procedureA1A.reference));
});
}
void test_procedure_method_skipDuplicate() {
var libraryA1 = _newLibrary('a');
libraryA1.addProcedure(_newMethod('A'));
@ -1367,10 +1397,13 @@ class B4[B4]<T[T] extends A[A1]> {}
/// Get a single [Procedure] with the given [name].
/// Throw if there is not exactly one.
Procedure _getProcedure(NamedNode parent, String name, String prefixName) {
Library enclosingLibrary;
List<Procedure> procedures;
if (parent is Library) {
enclosingLibrary = parent;
procedures = parent.procedures;
} else if (parent is Class) {
enclosingLibrary = parent.enclosingLibrary;
procedures = parent.procedures;
} else {
throw new ArgumentError('Only Library or Class expected');
@ -1383,6 +1416,9 @@ class B4[B4]<T[T] extends A[A1]> {}
expect(result.parent, parent);
var parentName = parent.canonicalName.getChild(prefixName);
if (name.startsWith('_')) {
parentName = parentName.getChildFromUri(enclosingLibrary.importUri);
}
expect(result.canonicalName.parent, parentName);
return result;
@ -1424,10 +1460,11 @@ class B4[B4]<T[T] extends A[A1]> {}
return new Library(uri, name: name);
}
Procedure _newMethod(String name, {Statement body}) {
Procedure _newMethod(String name,
{Statement body, Library libraryForPrivate}) {
body ??= new EmptyStatement();
return new Procedure(
new Name(name), ProcedureKind.Method, new FunctionNode(body));
return new Procedure(new Name(name, libraryForPrivate),
ProcedureKind.Method, new FunctionNode(body));
}
Program _newOutline(List<Library> libraries) {
@ -1751,6 +1788,10 @@ class _OutlineState {
if (child is Member) {
var qualifier = CanonicalName.getMemberQualifier(child);
var parentName = parent.canonicalName.getChild(qualifier);
if (child.name.isPrivate) {
var libraryUri = child.enclosingLibrary.importUri;
parentName = parentName.getChildFromUri(libraryUri);
}
expect(child.canonicalName.parent, parentName);
} else {
expect(child.canonicalName.parent, parent.canonicalName);