Skip to content

Commit 0fd3e88

Browse files
vsmenonvsmenon
committed
Fix wrt analyzer tip
This sidesteps #618 for now. [email protected] Review URL: https://codereview.chromium.org/2209473002 .
1 parent 803b0e3 commit 0fd3e88

13 files changed

+409
-61
lines changed

‎pkg/dev_compiler/lib/runtime/dart_sdk.js

Lines changed: 36 additions & 28 deletions
Large diffs are not rendered by default.

‎pkg/dev_compiler/lib/src/compiler/reify_coercions.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class _TreeCloner extends analyzer.AstCloner {
137137
}
138138

139139
@override
140-
List/*<E>*/ cloneNodeList/*<E extends AstNode>*/(NodeList/*<E>*/ list) {
140+
List/*<E>*/ cloneNodeList/*<E extends AstNode>*/(List/*<E>*/ list) {
141141
var clone = super.cloneNodeList(list);
142142
for (int i = 0, len = list.length; i < len; i++) {
143143
_cloneProperties(clone[i], list[i]);

‎pkg/dev_compiler/pubspec.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ packages:
66
name: analyzer
77
url: "https://pub.dartlang.org"
88
source: hosted
9-
version: "0.27.4-alpha.19"
9+
version: "0.27.4"
1010
args:
1111
description:
1212
name: args
@@ -162,7 +162,7 @@ packages:
162162
name: package_config
163163
url: "https://pub.dartlang.org"
164164
source: hosted
165-
version: "0.1.5"
165+
version: "1.0.0"
166166
package_resolver:
167167
description:
168168
name: package_resolver
@@ -205,6 +205,12 @@ packages:
205205
url: "https://pub.dartlang.org"
206206
source: hosted
207207
version: "0.6.5+2"
208+
shelf_packages_handler:
209+
description:
210+
name: shelf_packages_handler
211+
url: "https://pub.dartlang.org"
212+
source: hosted
213+
version: "1.0.0"
208214
shelf_static:
209215
description:
210216
name: shelf_static
@@ -258,7 +264,7 @@ packages:
258264
name: test
259265
url: "https://pub.dartlang.org"
260266
source: hosted
261-
version: "0.12.15+1"
267+
version: "0.12.15+2"
262268
typed_data:
263269
description:
264270
name: typed_data
@@ -313,4 +319,4 @@ packages:
313319
url: "https://pub.dartlang.org"
314320
source: hosted
315321
version: "2.1.10"
316-
sdk: ">=1.17.0-dev.6.2 <1.20.0"
322+
sdk: ">=1.17.0-dev.6.2 <2.0.0"

‎pkg/dev_compiler/test/browser/language_tests.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,11 @@
774774
'const_types_test_04_multi': notyetstrong,
775775
'const_types_test_05_multi': notyetstrong,
776776
'const_types_test_06_multi': notyetstrong,
777-
'const_types_test_07_multi': notyetstrong,
778-
'const_types_test_08_multi': notyetstrong,
779777
'const_types_test_09_multi': notyetstrong,
780778
'const_types_test_10_multi': notyetstrong,
781779
'const_types_test_11_multi': notyetstrong,
782780
'const_types_test_12_multi': notyetstrong,
783781
'const_types_test_13_multi': notyetstrong,
784-
'const_types_test_14_multi': notyetstrong,
785-
'const_types_test_15_multi': notyetstrong,
786782
'const_types_test_16_multi': notyetstrong,
787783
'const_types_test_17_multi': notyetstrong,
788784
'const_types_test_18_multi': notyetstrong,
@@ -815,7 +811,6 @@
815811
'constant_locals_test_03_multi': notyetstrong,
816812
'constant_locals_test_04_multi': notyetstrong,
817813
'constant_locals_test_05_multi': notyetstrong,
818-
'constant_type_literal_test_01_multi': notyetstrong,
819814
'constructor10_test_00_multi': notyetstrong,
820815
'constructor10_test_01_multi': notyetstrong,
821816
'constructor10_test_02_multi': notyetstrong,
@@ -1259,7 +1254,6 @@
12591254
'interface_cycle_test_02_multi': notyetstrong,
12601255
'interface_test_00_multi': notyetstrong,
12611256
'interface_test_none_multi': notyetstrong,
1262-
'internal_library_test_02_multi': notyetstrong,
12631257
'invocation_mirror2_test': notyetstrong,
12641258
'invocation_mirror_invoke_on2_test': notyetstrong,
12651259
'invocation_mirror_invoke_on_test': notyetstrong,

‎pkg/dev_compiler/test/codegen/language/internal_library_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ library internal_library_test;
99
import 'dart:core'; // This loads 'dart:_foreign_helper' and 'patch:core'.
1010
import 'dart:_foreign_helper'; /// 01: compile-time error
1111
12-
part 'dart:_foreign_helper'; /// 02: compile-time error
12+
// TODO(vsm): Restore once #618 is fixed.
13+
// part 'dart:_foreign_helper'; /// 02: static type warning
1314

1415
void main() {
1516
JS('int', '0'); /// 01: continued
16-
JS('int', '0'); /// 02: continued
17+
// JS('int', '0'); /// 02: continued
1718
}

‎pkg/dev_compiler/test/codegen_expected/language/const_types_test_07_multi.js

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,74 @@
1-
//FAILED TO COMPILE
1+
dart_library.library('language/const_types_test_07_multi', null, /* Imports */[
2+
'dart_sdk'
3+
], function load__const_types_test_07_multi(exports, dart_sdk) {
4+
'use strict';
5+
const core = dart_sdk.core;
6+
const dart = dart_sdk.dart;
7+
const dartx = dart_sdk.dartx;
8+
const const_types_test_07_multi = Object.create(null);
9+
let ClassOfint = () => (ClassOfint = dart.constFn(const_types_test_07_multi.Class$(core.int)))();
10+
let Class = () => (Class = dart.constFn(const_types_test_07_multi.Class$()))();
11+
let Superclass = () => (Superclass = dart.constFn(const_types_test_07_multi.Superclass$()))();
12+
let dynamicTodynamic = () => (dynamicTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [dart.dynamic])))();
13+
let VoidTovoid = () => (VoidTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [])))();
14+
const_types_test_07_multi.use = function(x) {
15+
};
16+
dart.fn(const_types_test_07_multi.use, dynamicTodynamic());
17+
let const$;
18+
let const$0;
19+
let const$1;
20+
let const$2;
21+
let const$3;
22+
let const$4;
23+
let const$5;
24+
let const$6;
25+
let const$7;
26+
let const$8;
27+
const_types_test_07_multi.Class$ = dart.generic(T => {
28+
let ClassOfT = () => (ClassOfT = dart.constFn(const_types_test_07_multi.Class$(T)))();
29+
class Class extends core.Object {
30+
new() {
31+
}
32+
named() {
33+
}
34+
test() {
35+
const_types_test_07_multi.use(const$ || (const$ = dart.constList([], dart.dynamic)));
36+
const_types_test_07_multi.use(const$0 || (const$0 = dart.constList([], const_types_test_07_multi.Class)));
37+
const_types_test_07_multi.use(const$1 || (const$1 = dart.constList([], ClassOfint())));
38+
const_types_test_07_multi.use(const$2 || (const$2 = dart.const(dart.map())));
39+
const_types_test_07_multi.use(const$3 || (const$3 = dart.const(dart.map({}, core.String, const_types_test_07_multi.Class))));
40+
const_types_test_07_multi.use(const$4 || (const$4 = dart.const(dart.map({}, core.String, ClassOfint()))));
41+
const_types_test_07_multi.use(const$5 || (const$5 = dart.const(new const_types_test_07_multi.Class())));
42+
const_types_test_07_multi.use(const$6 || (const$6 = dart.const(new (ClassOfint())())));
43+
const_types_test_07_multi.use(dart.const(new (ClassOfT())()));
44+
const_types_test_07_multi.use(const$7 || (const$7 = dart.const(new const_types_test_07_multi.Class.named())));
45+
const_types_test_07_multi.use(const$8 || (const$8 = dart.const(new (ClassOfint()).named())));
46+
}
47+
}
48+
dart.addTypeTests(Class);
49+
dart.defineNamedConstructor(Class, 'named');
50+
Class[dart.implements] = () => [const_types_test_07_multi.Superclass];
51+
dart.setSignature(Class, {
52+
constructors: () => ({
53+
new: dart.definiteFunctionType(const_types_test_07_multi.Class$(T), []),
54+
named: dart.definiteFunctionType(const_types_test_07_multi.Class$(T), [])
55+
}),
56+
methods: () => ({test: dart.definiteFunctionType(dart.void, [])})
57+
});
58+
return Class;
59+
});
60+
const_types_test_07_multi.Class = Class();
61+
const_types_test_07_multi.Superclass$ = dart.generic(T => {
62+
class Superclass extends core.Object {}
63+
dart.addTypeTests(Superclass);
64+
return Superclass;
65+
});
66+
const_types_test_07_multi.Superclass = Superclass();
67+
const_types_test_07_multi.main = function() {
68+
new const_types_test_07_multi.Class().test();
69+
new const_types_test_07_multi.Superclass();
70+
};
71+
dart.fn(const_types_test_07_multi.main, VoidTovoid());
72+
// Exports:
73+
exports.const_types_test_07_multi = const_types_test_07_multi;
74+
});

‎pkg/dev_compiler/test/codegen_expected/language/const_types_test_08_multi.js

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,75 @@
1-
//FAILED TO COMPILE
1+
dart_library.library('language/const_types_test_08_multi', null, /* Imports */[
2+
'dart_sdk'
3+
], function load__const_types_test_08_multi(exports, dart_sdk) {
4+
'use strict';
5+
const core = dart_sdk.core;
6+
const dart = dart_sdk.dart;
7+
const dartx = dart_sdk.dartx;
8+
const const_types_test_08_multi = Object.create(null);
9+
let ClassOfint = () => (ClassOfint = dart.constFn(const_types_test_08_multi.Class$(core.int)))();
10+
let Class = () => (Class = dart.constFn(const_types_test_08_multi.Class$()))();
11+
let Superclass = () => (Superclass = dart.constFn(const_types_test_08_multi.Superclass$()))();
12+
let dynamicTodynamic = () => (dynamicTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [dart.dynamic])))();
13+
let VoidTovoid = () => (VoidTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [])))();
14+
const_types_test_08_multi.use = function(x) {
15+
};
16+
dart.fn(const_types_test_08_multi.use, dynamicTodynamic());
17+
let const$;
18+
let const$0;
19+
let const$1;
20+
let const$2;
21+
let const$3;
22+
let const$4;
23+
let const$5;
24+
let const$6;
25+
let const$7;
26+
let const$8;
27+
const_types_test_08_multi.Class$ = dart.generic(T => {
28+
let ClassOfT = () => (ClassOfT = dart.constFn(const_types_test_08_multi.Class$(T)))();
29+
let ClassOfClassOfT = () => (ClassOfClassOfT = dart.constFn(const_types_test_08_multi.Class$(ClassOfT())))();
30+
class Class extends core.Object {
31+
new() {
32+
}
33+
named() {
34+
}
35+
test() {
36+
const_types_test_08_multi.use(const$ || (const$ = dart.constList([], dart.dynamic)));
37+
const_types_test_08_multi.use(const$0 || (const$0 = dart.constList([], const_types_test_08_multi.Class)));
38+
const_types_test_08_multi.use(const$1 || (const$1 = dart.constList([], ClassOfint())));
39+
const_types_test_08_multi.use(const$2 || (const$2 = dart.const(dart.map())));
40+
const_types_test_08_multi.use(const$3 || (const$3 = dart.const(dart.map({}, core.String, const_types_test_08_multi.Class))));
41+
const_types_test_08_multi.use(const$4 || (const$4 = dart.const(dart.map({}, core.String, ClassOfint()))));
42+
const_types_test_08_multi.use(const$5 || (const$5 = dart.const(new const_types_test_08_multi.Class())));
43+
const_types_test_08_multi.use(const$6 || (const$6 = dart.const(new (ClassOfint())())));
44+
const_types_test_08_multi.use(dart.const(new (ClassOfClassOfT())()));
45+
const_types_test_08_multi.use(const$7 || (const$7 = dart.const(new const_types_test_08_multi.Class.named())));
46+
const_types_test_08_multi.use(const$8 || (const$8 = dart.const(new (ClassOfint()).named())));
47+
}
48+
}
49+
dart.addTypeTests(Class);
50+
dart.defineNamedConstructor(Class, 'named');
51+
Class[dart.implements] = () => [const_types_test_08_multi.Superclass];
52+
dart.setSignature(Class, {
53+
constructors: () => ({
54+
new: dart.definiteFunctionType(const_types_test_08_multi.Class$(T), []),
55+
named: dart.definiteFunctionType(const_types_test_08_multi.Class$(T), [])
56+
}),
57+
methods: () => ({test: dart.definiteFunctionType(dart.void, [])})
58+
});
59+
return Class;
60+
});
61+
const_types_test_08_multi.Class = Class();
62+
const_types_test_08_multi.Superclass$ = dart.generic(T => {
63+
class Superclass extends core.Object {}
64+
dart.addTypeTests(Superclass);
65+
return Superclass;
66+
});
67+
const_types_test_08_multi.Superclass = Superclass();
68+
const_types_test_08_multi.main = function() {
69+
new const_types_test_08_multi.Class().test();
70+
new const_types_test_08_multi.Superclass();
71+
};
72+
dart.fn(const_types_test_08_multi.main, VoidTovoid());
73+
// Exports:
74+
exports.const_types_test_08_multi = const_types_test_08_multi;
75+
});

‎pkg/dev_compiler/test/codegen_expected/language/const_types_test_14_multi.js

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,74 @@
1-
//FAILED TO COMPILE
1+
dart_library.library('language/const_types_test_14_multi', null, /* Imports */[
2+
'dart_sdk'
3+
], function load__const_types_test_14_multi(exports, dart_sdk) {
4+
'use strict';
5+
const core = dart_sdk.core;
6+
const dart = dart_sdk.dart;
7+
const dartx = dart_sdk.dartx;
8+
const const_types_test_14_multi = Object.create(null);
9+
let ClassOfint = () => (ClassOfint = dart.constFn(const_types_test_14_multi.Class$(core.int)))();
10+
let Class = () => (Class = dart.constFn(const_types_test_14_multi.Class$()))();
11+
let Superclass = () => (Superclass = dart.constFn(const_types_test_14_multi.Superclass$()))();
12+
let dynamicTodynamic = () => (dynamicTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [dart.dynamic])))();
13+
let VoidTovoid = () => (VoidTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [])))();
14+
const_types_test_14_multi.use = function(x) {
15+
};
16+
dart.fn(const_types_test_14_multi.use, dynamicTodynamic());
17+
let const$;
18+
let const$0;
19+
let const$1;
20+
let const$2;
21+
let const$3;
22+
let const$4;
23+
let const$5;
24+
let const$6;
25+
let const$7;
26+
let const$8;
27+
const_types_test_14_multi.Class$ = dart.generic(T => {
28+
let ClassOfT = () => (ClassOfT = dart.constFn(const_types_test_14_multi.Class$(T)))();
29+
class Class extends core.Object {
30+
new() {
31+
}
32+
named() {
33+
}
34+
test() {
35+
const_types_test_14_multi.use(const$ || (const$ = dart.constList([], dart.dynamic)));
36+
const_types_test_14_multi.use(const$0 || (const$0 = dart.constList([], const_types_test_14_multi.Class)));
37+
const_types_test_14_multi.use(const$1 || (const$1 = dart.constList([], ClassOfint())));
38+
const_types_test_14_multi.use(const$2 || (const$2 = dart.const(dart.map())));
39+
const_types_test_14_multi.use(const$3 || (const$3 = dart.const(dart.map({}, core.String, const_types_test_14_multi.Class))));
40+
const_types_test_14_multi.use(const$4 || (const$4 = dart.const(dart.map({}, core.String, ClassOfint()))));
41+
const_types_test_14_multi.use(const$5 || (const$5 = dart.const(new const_types_test_14_multi.Class())));
42+
const_types_test_14_multi.use(const$6 || (const$6 = dart.const(new (ClassOfint())())));
43+
const_types_test_14_multi.use(const$7 || (const$7 = dart.const(new const_types_test_14_multi.Class.named())));
44+
const_types_test_14_multi.use(const$8 || (const$8 = dart.const(new (ClassOfint()).named())));
45+
const_types_test_14_multi.use(dart.const(new (ClassOfT()).named()));
46+
}
47+
}
48+
dart.addTypeTests(Class);
49+
dart.defineNamedConstructor(Class, 'named');
50+
Class[dart.implements] = () => [const_types_test_14_multi.Superclass];
51+
dart.setSignature(Class, {
52+
constructors: () => ({
53+
new: dart.definiteFunctionType(const_types_test_14_multi.Class$(T), []),
54+
named: dart.definiteFunctionType(const_types_test_14_multi.Class$(T), [])
55+
}),
56+
methods: () => ({test: dart.definiteFunctionType(dart.void, [])})
57+
});
58+
return Class;
59+
});
60+
const_types_test_14_multi.Class = Class();
61+
const_types_test_14_multi.Superclass$ = dart.generic(T => {
62+
class Superclass extends core.Object {}
63+
dart.addTypeTests(Superclass);
64+
return Superclass;
65+
});
66+
const_types_test_14_multi.Superclass = Superclass();
67+
const_types_test_14_multi.main = function() {
68+
new const_types_test_14_multi.Class().test();
69+
new const_types_test_14_multi.Superclass();
70+
};
71+
dart.fn(const_types_test_14_multi.main, VoidTovoid());
72+
// Exports:
73+
exports.const_types_test_14_multi = const_types_test_14_multi;
74+
});

0 commit comments

Comments
 (0)