Skip to content

Commit ac6a3d9

Browse files
rakudramacommit-bot@chromium.org
rakudrama
authored and
[email protected]
committed
Revert "[dart2js] new-rti: Add 'minified:' tag to minified names"
This reverts commit e0ee7cb. Reason for revert: The new code in the tests does not compile yet with new rti. Original change's description: > [dart2js] new-rti: Add 'minified:' tag to minified names > > Change-Id: I9ea58068bdc3bea74244c31d7c60a59e7ea08b9d > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108208 > Reviewed-by: Mayank Patke <[email protected]> > Commit-Queue: Stephen Adams <[email protected]> [email protected],[email protected] Change-Id: I35c341a0c18932806ffe4ae4ada6029438a58573 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110421 Reviewed-by: Stephen Adams <[email protected]> Commit-Queue: Stephen Adams <[email protected]>
1 parent 9fe8865 commit ac6a3d9

File tree

6 files changed

+38
-74
lines changed

6 files changed

+38
-74
lines changed

‎sdk/lib/_internal/js_runtime/lib/js_names.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ List extractKeys(victim) {
150150
/// example).
151151
String unmangleGlobalNameIfPreservedAnyways(String name) {
152152
var names = JS_EMBEDDED_GLOBAL('', MANGLED_GLOBAL_NAMES);
153-
return JS('String|Null', '#', JsCache.fetch(names, name));
153+
return JsCache.fetch(names, name);
154154
}
155155

156156
String unmangleAllIdentifiersIfPreservedAnyways(String str) {

‎sdk/lib/_internal/js_runtime/lib/rti.dart‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ import 'dart:_foreign_helper'
1212
JS,
1313
JS_BUILTIN,
1414
JS_EMBEDDED_GLOBAL,
15-
JS_GET_FLAG,
1615
JS_GET_NAME,
17-
JS_STRING_CONCAT,
1816
RAW_DART_FUNCTION_REF;
1917

2018
import 'dart:_interceptors' show JSArray, JSUnmodifiableArray;
2119

22-
import 'dart:_js_names' show unmangleGlobalNameIfPreservedAnyways;
23-
2420
import 'dart:_js_embedded_names'
2521
show JsBuiltin, JsGetName, RtiUniverseFieldNames, RTI_UNIVERSE, TYPES;
2622

@@ -486,7 +482,6 @@ String _rtiToString(Rti rti, List<String> genericContext) {
486482

487483
if (kind == Rti.kindInterface) {
488484
String name = Rti._getInterfaceName(rti);
489-
name = _unminifyOrTag(name);
490485
var arguments = Rti._getInterfaceTypeArguments(rti);
491486
if (arguments.length != 0) {
492487
name += '<';
@@ -538,12 +533,6 @@ String _rtiToString(Rti rti, List<String> genericContext) {
538533
return '?';
539534
}
540535

541-
String _unminifyOrTag(String rawClassName) {
542-
String preserved = unmangleGlobalNameIfPreservedAnyways(rawClassName);
543-
if (preserved != null) return preserved;
544-
return JS_GET_FLAG('MINIFIED') ? 'minified:$rawClassName' : rawClassName;
545-
}
546-
547536
String _rtiToDebugString(Rti rti) {
548537
String arrayToString(Object array) {
549538
String s = '[', sep = '';

‎tests/compiler/dart2js_extra/rti/bind_test.dart‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,33 @@ void checkRtiIdentical(Object rti1, Object rti2) {
1111
identical(rti1, rti2), 'identical(${format(rti1)}, ${format(rti2)}');
1212
}
1313

14-
void checkToString(String expected, Object rti1) {
15-
String result = rti.testingRtiToString(rti1);
16-
if (expected == result) return;
17-
Expect.equals(expected, result.replaceAll('minified:', ''));
18-
}
19-
2014
test1() {
2115
var universe = rti.testingCreateUniverse();
2216

2317
// Extend environment in one step
2418
var env1a = rti.testingUniverseEval(universe, 'Foo');
25-
var args1 = rti.testingUniverseEval(universe, '@<aaa,bbb>');
19+
var args1 = rti.testingUniverseEval(universe, '@<aa,bb>');
2620
var env1b = rti.testingEnvironmentBind(universe, env1a, args1);
2721

28-
var rti1 = rti.testingEnvironmentEval(universe, env1b, 'AAA<0,1,2>');
29-
checkToString('AAA<Foo, aaa, bbb>', rti1);
22+
var rti1 = rti.testingEnvironmentEval(universe, env1b, 'A<0,1,2>');
23+
Expect.equals('A<Foo, aa, bb>', rti.testingRtiToString(rti1));
3024

31-
Expect.equals(
32-
'binding(interface("Foo"), [interface("aaa"), interface("bbb")])',
25+
Expect.equals('binding(interface("Foo"), [interface("aa"), interface("bb")])',
3326
rti.testingRtiToDebugString(env1b));
3427

3528
// Extend environment in two steps
3629
var env2a = rti.testingUniverseEval(universe, 'Foo');
37-
var args2a = rti.testingUniverseEval(universe, 'aaa');
30+
var args2a = rti.testingUniverseEval(universe, 'aa');
3831
var env2b = rti.testingEnvironmentBind(universe, env2a, args2a);
39-
var args2b = rti.testingUniverseEval(universe, 'bbb');
32+
var args2b = rti.testingUniverseEval(universe, 'bb');
4033
var env2c = rti.testingEnvironmentBind(universe, env2b, args2b);
4134

42-
var rti2 = rti.testingEnvironmentEval(universe, env2c, 'AAA<0,1,2>');
43-
checkToString('AAA<Foo, aaa, bbb>', rti2);
35+
var rti2 = rti.testingEnvironmentEval(universe, env2c, 'A<0,1,2>');
36+
Expect.equals('A<Foo, aa, bb>', rti.testingRtiToString(rti2));
4437

45-
Expect.equals('binding(interface("Foo"), [interface("aaa")])',
38+
Expect.equals('binding(interface("Foo"), [interface("aa")])',
4639
rti.testingRtiToDebugString(env2b));
47-
Expect.equals(
48-
'binding(interface("Foo"), [interface("aaa"), interface("bbb")])',
40+
Expect.equals('binding(interface("Foo"), [interface("aa"), interface("bb")])',
4941
rti.testingRtiToDebugString(env2c));
5042

5143
checkRtiIdentical(env1b, env2c);

‎tests/compiler/dart2js_extra/rti/bound_environment_test.dart‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,19 @@ void checkRtiIdentical(Object rti1, Object rti2) {
1111
identical(rti1, rti2), 'identical(${format(rti1)}, ${format(rti2)}');
1212
}
1313

14-
void checkToString(String expected, Object rti1) {
15-
String result = rti.testingRtiToString(rti1);
16-
if (expected == result) return;
17-
Expect.equals(expected, result.replaceAll('minified:', ''));
18-
}
19-
2014
test1() {
2115
var universe = rti.testingCreateUniverse();
2216

2317
var env = rti.testingUniverseEval(universe, 'Foo<bool><int>');
2418
var rti1 = rti.testingUniverseEval(universe, 'int');
2519
var rti2 = rti.testingEnvironmentEval(universe, env, '1');
2620

27-
checkToString('int', rti1);
28-
checkToString('int', rti2);
21+
Expect.equals('int', rti.testingRtiToString(rti1));
22+
Expect.equals('int', rti.testingRtiToString(rti2));
2923
checkRtiIdentical(rti1, rti2);
3024

3125
var rti3 = rti.testingEnvironmentEval(universe, env, 'A<0,1,2>');
32-
checkToString('A<Foo<bool>, int, bool>', rti3);
26+
Expect.equals('A<Foo<bool>, int, bool>', rti.testingRtiToString(rti3));
3327
}
3428

3529
test2() {
@@ -43,31 +37,32 @@ test2() {
4337

4438
var rti1 = rti.testingEnvironmentEval(universe, env1, 'A<0,1,2>');
4539
var rti2 = rti.testingEnvironmentEval(universe, env2, 'A<0,1,2>');
46-
checkToString('A<Foo<bool>, int, bool>', rti1);
47-
checkToString('A<Foo, bool, int>', rti2);
40+
Expect.equals('A<Foo<bool>, int, bool>', rti.testingRtiToString(rti1));
41+
Expect.equals('A<Foo, bool, int>', rti.testingRtiToString(rti2));
4842
}
4943

5044
test3() {
5145
var universe = rti.testingCreateUniverse();
52-
var env = rti.testingUniverseEval(universe, 'C<aaa,bbb><ccc,@>');
46+
var env = rti.testingUniverseEval(universe, 'C<aa,bb><cc,@>');
5347
var rti1 = rti.testingEnvironmentEval(universe, env, 'A<0,1,2,3,4>');
54-
checkToString('A<C<aaa, bbb>, ccc, dynamic, aaa, bbb>', rti1);
48+
Expect.equals(
49+
'A<C<aa, bb>, cc, dynamic, aa, bb>', rti.testingRtiToString(rti1));
5550
}
5651

5752
test4() {
5853
var universe = rti.testingCreateUniverse();
59-
var env = rti.testingUniverseEval(universe, '@<aaa,bbb>');
54+
var env = rti.testingUniverseEval(universe, '@<aa,bb>');
6055
var rti1 = rti.testingEnvironmentEval(universe, env, 'A<0,1,2>');
61-
checkToString('A<dynamic, aaa, bbb>', rti1);
56+
Expect.equals('A<dynamic, aa, bb>', rti.testingRtiToString(rti1));
6257
}
6358

6459
test5() {
6560
var universe = rti.testingCreateUniverse();
66-
var env1 = rti.testingUniverseEval(universe, '@<aaa><bbb><ccc>');
67-
var env2 = rti.testingUniverseEval(universe, '@;<aaa><bbb><ccc>');
61+
var env1 = rti.testingUniverseEval(universe, '@<aa><bb><cc>');
62+
var env2 = rti.testingUniverseEval(universe, '@;<aa><bb><cc>');
6863
var rti1 = rti.testingEnvironmentEval(universe, env1, 'A<0,1,2,3>');
6964
var rti2 = rti.testingEnvironmentEval(universe, env2, 'A<0,1,2,3>');
70-
checkToString('A<dynamic, aaa, bbb, ccc>', rti1);
65+
Expect.equals('A<dynamic, aa, bb, cc>', rti.testingRtiToString(rti1));
7166
checkRtiIdentical(rti1, rti2);
7267
}
7368

‎tests/compiler/dart2js_extra/rti/class_environment_test.dart‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,15 @@ void checkRtiIdentical(Object rti1, Object rti2) {
1111
identical(rti1, rti2), 'identical(${format(rti1)}, ${format(rti2)}');
1212
}
1313

14-
void checkToString(String expected, Object rti1) {
15-
String result = rti.testingRtiToString(rti1);
16-
if (expected == result) return;
17-
Expect.equals(expected, result.replaceAll('minified:', ''));
18-
}
19-
2014
testInterface1() {
2115
var universe = rti.testingCreateUniverse();
2216

2317
var env = rti.testingUniverseEval(universe, 'Foo<int>');
2418
var rti1 = rti.testingUniverseEval(universe, 'int');
2519
var rti2 = rti.testingEnvironmentEval(universe, env, '1');
2620

27-
checkToString('int', rti1);
28-
checkToString('int', rti2);
21+
Expect.equals('int', rti.testingRtiToString(rti1));
22+
Expect.equals('int', rti.testingRtiToString(rti2));
2923
checkRtiIdentical(rti1, rti2);
3024
}
3125

@@ -37,9 +31,9 @@ testInterface2() {
3731
var rti2 = rti.testingEnvironmentEval(universe, env, '2');
3832
var rti3 = rti.testingEnvironmentEval(universe, env, 'List<1>');
3933

40-
checkToString('List<int>', rti1);
41-
checkToString('List<int>', rti2);
42-
checkToString('List<int>', rti3);
34+
Expect.equals('List<int>', rti.testingRtiToString(rti1));
35+
Expect.equals('List<int>', rti.testingRtiToString(rti2));
36+
Expect.equals('List<int>', rti.testingRtiToString(rti3));
4337
checkRtiIdentical(rti1, rti2);
4438
checkRtiIdentical(rti1, rti3);
4539
}

‎tests/compiler/dart2js_extra/rti/simple_2_test.dart‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
import 'dart:_rti' as rti;
66
import "package:expect/expect.dart";
77

8-
void checkToString(String expected, Object rti1) {
9-
String result = rti.testingRtiToString(rti1);
10-
if (expected == result) return;
11-
Expect.equals(expected, result.replaceAll('minified:', ''));
12-
}
13-
148
testDynamic1() {
159
var universe = rti.testingCreateUniverse();
1610

@@ -19,7 +13,7 @@ testDynamic1() {
1913

2014
Expect.isTrue(identical(rti1, rti2), 'dynamic should be identical');
2115
Expect.isFalse(rti1 is String);
22-
checkToString('dynamic', rti1);
16+
Expect.equals('dynamic', rti.testingRtiToString(rti1));
2317
}
2418

2519
testDynamic2() {
@@ -30,7 +24,7 @@ testDynamic2() {
3024

3125
Expect.isTrue(identical(rti1, rti2), 'dynamic should be identical');
3226
Expect.isFalse(rti1 is String);
33-
checkToString('dynamic', rti1);
27+
Expect.equals('dynamic', rti.testingRtiToString(rti1));
3428
}
3529

3630
testVoid() {
@@ -41,7 +35,7 @@ testVoid() {
4135

4236
Expect.isTrue(identical(rti1, rti2), 'void should be identical');
4337
Expect.isFalse(rti1 is String);
44-
checkToString('void', rti1);
38+
Expect.equals('void', rti.testingRtiToString(rti1));
4539
}
4640

4741
testNever() {
@@ -52,7 +46,7 @@ testNever() {
5246

5347
Expect.isTrue(identical(rti1, rti2), 'Never should be identical');
5448
Expect.isFalse(rti1 is String);
55-
checkToString('Never', rti1);
49+
Expect.equals('Never', rti.testingRtiToString(rti1));
5650
}
5751

5852
testAny() {
@@ -63,7 +57,7 @@ testAny() {
6357

6458
Expect.isTrue(identical(rti1, rti2), "'any' should be identical");
6559
Expect.isFalse(rti1 is String);
66-
checkToString('any', rti1);
60+
Expect.equals('any', rti.testingRtiToString(rti1));
6761
}
6862

6963
testTerminal() {
@@ -90,7 +84,7 @@ testInterface1() {
9084

9185
Expect.isTrue(identical(rti1, rti2));
9286
Expect.isFalse(rti1 is String);
93-
checkToString('int', rti1);
87+
Expect.equals('int', rti.testingRtiToString(rti1));
9488
}
9589

9690
testInterface2() {
@@ -101,7 +95,7 @@ testInterface2() {
10195

10296
Expect.isTrue(identical(rti1, rti2));
10397
Expect.isFalse(rti1 is String);
104-
checkToString('Foo<int, bool>', rti1);
98+
Expect.equals('Foo<int, bool>', rti.testingRtiToString(rti1));
10599
}
106100

107101
testInterface3() {
@@ -112,7 +106,7 @@ testInterface3() {
112106

113107
Expect.isTrue(identical(rti1, rti2));
114108
Expect.isFalse(rti1 is String);
115-
checkToString('Foo<Bar<int>, Bar<bool>>', rti1);
109+
Expect.equals('Foo<Bar<int>, Bar<bool>>', rti.testingRtiToString(rti1));
116110
}
117111

118112
testInterface4() {
@@ -123,7 +117,7 @@ testInterface4() {
123117

124118
Expect.isTrue(identical(rti1, rti2));
125119
Expect.isFalse(rti1 is String);
126-
checkToString('Foo<Foo<Foo<Foo<int>>>>', rti1);
120+
Expect.equals('Foo<Foo<Foo<Foo<int>>>>', rti.testingRtiToString(rti1));
127121
}
128122

129123
main() {

0 commit comments

Comments
 (0)