Skip to content

Commit 1b91195

Browse files
aartbikcommit-bot@chromium.org
authored andcommitted
[vm/fuzzer] split analyzer import from nightly run
Rationale: Table generation uses the analyzers, but bots don't. Change-Id: I75cda624244493e7bb81657add9e7401480971ba Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/119528 Commit-Queue: Aart Bik <[email protected]> Reviewed-by: Felicitas Hetzelt <[email protected]>
1 parent 036c404 commit 1b91195

File tree

5 files changed

+25
-22
lines changed

5 files changed

+25
-22
lines changed

runtime/tools/dartfuzz/dartfuzz_api_table.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -697,12 +697,12 @@ class DartLib {
697697
DartLib('ceilToDouble', 'DV'),
698698
DartLib('truncateToDouble', 'DV'),
699699
DartLib('double.tryParse', 'VS'),
700-
DartLib('sign', 'Dv'),
701700
DartLib('double.nan', 'Vv'),
702701
DartLib('double.infinity', 'Vv'),
703702
DartLib('double.negativeInfinity', 'Vv'),
704703
DartLib('double.minPositive', 'Vv'),
705704
DartLib('double.maxFinite', 'Vv'),
705+
DartLib('sign', 'Dv'),
706706
DartLib('roundToDouble', 'IV'),
707707
DartLib('floorToDouble', 'IV'),
708708
DartLib('ceilToDouble', 'IV'),

runtime/tools/dartfuzz/dartfuzz_test.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'dart:math';
99
import 'package:args/args.dart';
1010

1111
import 'dartfuzz.dart';
12-
import 'dartfuzz_util.dart';
1312

1413
const debug = false;
1514
const sigkill = 9;
@@ -581,7 +580,7 @@ class DartFuzzTestSession {
581580
this.mode1,
582581
this.mode2,
583582
this.rerun)
584-
: top = DartFuzzUtil.getTop(tp);
583+
: top = getTop(tp);
585584

586585
start() async {
587586
print('\n**\n**** Dart Fuzz Testing Session\n**\n');

runtime/tools/dartfuzz/gen_api_table.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import 'package:analyzer/dart/analysis/session.dart';
1919
import 'package:analyzer/dart/element/element.dart';
2020
import 'package:analyzer/dart/element/type.dart';
2121

22-
import 'dartfuzz_util.dart';
22+
import 'gen_util.dart';
2323

2424
// Class to represent a library method by name and prototype representation.
2525
class DartLib {
@@ -38,7 +38,7 @@ var setTable = <DartLib>[];
3838
var mapTable = <DartLib>[];
3939

4040
main() async {
41-
final AnalysisSession session = DartFuzzUtil.createAnalysisSession();
41+
final AnalysisSession session = GenUtil.createAnalysisSession();
4242

4343
// Visit libraries for table generation.
4444
await visitLibraryAtUri(session, 'dart:async');

runtime/tools/dartfuzz/gen_type_table.dart

+20-16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
// Usage:
88
// dart gen_type_table.dart > dartfuzz_type_table.dart
99
//
10+
// Reformat:
11+
// tools/sdks/dart-sdk/bin/dartfmt -w \
12+
// runtime/tools/dartfuzz/dartfuzz_type_table.dart
13+
//
1014
// Then send out modified dartfuzz_type_table.dart for review together
1115
// with a modified dartfuzz.dart that increases the version.
1216

@@ -20,7 +24,7 @@ import 'package:analyzer/dart/analysis/results.dart';
2024
import 'package:analyzer/dart/analysis/session.dart';
2125
import 'package:analyzer/dart/element/element.dart';
2226

23-
import 'dartfuzz_util.dart';
27+
import 'gen_util.dart';
2428

2529
// Minimum number of operators that are required for a type to be included in
2630
// the type table.
@@ -478,8 +482,8 @@ void printTypeTable(Set<InterfaceType> allTypes,
478482

479483
String className = 'DartType${fp ? "" : "NoFp"}${flatTp ? "FlatTp" : ""}';
480484

481-
print('class $className '
482-
'${subclass ? "extends DartType" : ""} {');
485+
print('class $className'
486+
'${subclass ? " extends DartType" : ""} {');
483487
print(" final String name;");
484488
if (!subclass) {
485489
print(" const DartType._withName(this.name);");
@@ -537,21 +541,21 @@ void printTypeTable(Set<InterfaceType> allTypes,
537541
}
538542
539543
Set<DartType> interfaces(DartType tp) {
540-
if(_interfaceRels.containsKey(tp)) {
544+
if (_interfaceRels.containsKey(tp)) {
541545
return _interfaceRels[tp];
542546
}
543547
return null;
544548
}
545549
546550
DartType indexType(DartType tp) {
547-
if(_indexedBy.containsKey(tp)) {
551+
if (_indexedBy.containsKey(tp)) {
548552
return _indexedBy[tp];
549553
}
550554
return null;
551555
}
552556
553557
Set<DartType> indexableElementTypes(DartType tp) {
554-
if(_indexableElementOf.containsKey(tp)) {
558+
if (_indexableElementOf.containsKey(tp)) {
555559
return _indexableElementOf[tp];
556560
}
557561
return null;
@@ -562,7 +566,7 @@ void printTypeTable(Set<InterfaceType> allTypes,
562566
}
563567
564568
DartType elementType(DartType tp) {
565-
if(_subscriptsTo.containsKey(tp)) {
569+
if (_subscriptsTo.containsKey(tp)) {
566570
return _subscriptsTo[tp];
567571
}
568572
return null;
@@ -573,36 +577,36 @@ void printTypeTable(Set<InterfaceType> allTypes,
573577
}
574578
575579
Set<String> uniOps(DartType tp) {
576-
if(_uniOps.containsKey(tp)) {
580+
if (_uniOps.containsKey(tp)) {
577581
return _uniOps[tp];
578582
}
579583
return <String>{};
580584
}
581585
582586
Set<String> binOps(DartType tp) {
583-
if(_binOps.containsKey(tp)) {
587+
if (_binOps.containsKey(tp)) {
584588
return _binOps[tp].keys.toSet();
585589
}
586590
return <String>{};
587591
}
588592
589593
Set<List<DartType>> binOpParameters(DartType tp, String op) {
590-
if(_binOps.containsKey(tp) &&
594+
if (_binOps.containsKey(tp) &&
591595
_binOps[tp].containsKey(op)) {
592596
return _binOps[tp][op];
593597
}
594598
return null;
595599
}
596600
597601
Set<String> assignOps(DartType tp) {
598-
if(_assignOps.containsKey(tp)) {
602+
if (_assignOps.containsKey(tp)) {
599603
return _assignOps[tp].keys.toSet();
600604
}
601605
return <String>{};
602606
}
603607
604608
Set<DartType> assignOpRhs(DartType tp, String op) {
605-
if(_assignOps.containsKey(tp) &&
609+
if (_assignOps.containsKey(tp) &&
606610
_assignOps[tp].containsKey(op)) {
607611
return _assignOps[tp][op];
608612
}
@@ -614,14 +618,14 @@ void printTypeTable(Set<InterfaceType> allTypes,
614618
}
615619
616620
Set<String> constructors(DartType tp) {
617-
if(_constructors.containsKey(tp)) {
621+
if (_constructors.containsKey(tp)) {
618622
return _constructors[tp].keys.toSet();
619623
}
620624
return <String>{};
621625
}
622626
623627
List<DartType> constructorParameters(DartType tp, String constructor) {
624-
if(_constructors.containsKey(tp) &&
628+
if (_constructors.containsKey(tp) &&
625629
_constructors[tp].containsKey(constructor)) {
626630
return _constructors[tp][constructor];
627631
}
@@ -1198,7 +1202,7 @@ int countOperators(ClassElement ce) {
11981202

11991203
// Analyze typed_data and core libraries to extract data types.
12001204
void getDataTypes(Set<InterfaceType> allTypes, String dartTop) async {
1201-
final AnalysisSession session = DartFuzzUtil.createAnalysisSession(dartTop);
1205+
final AnalysisSession session = GenUtil.createAnalysisSession(dartTop);
12021206

12031207
// Visit libraries for type table generation.
12041208
await visitLibraryAtUri(session, 'dart:typed_data', allTypes);
@@ -1298,7 +1302,7 @@ main(List<String> arguments) async {
12981302
'exponentially with this, ' +
12991303
'therefore types with higher nesting ' +
13001304
'depth are partially filtered.',
1301-
defaultsTo: '0');
1305+
defaultsTo: '1');
13021306
try {
13031307
final results = parser.parse(arguments);
13041308
int depth = int.parse(results['depth']);

runtime/tools/dartfuzz/dartfuzz_util.dart renamed to runtime/tools/dartfuzz/gen_util.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:analyzer/file_system/physical_file_system.dart';
99
import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
1010

1111
/// Wrapper class for some static utilities.
12-
class DartFuzzUtil {
12+
class GenUtil {
1313
// Picks a top directory (command line, environment, or current).
1414
static String getTop(String top) {
1515
if (top == null || top == '') {

0 commit comments

Comments
 (0)