Add internal options flag for exporting global type map (#5325)

Previously type map export was enabled by ad hoc rules. This makes it
more explicit, and allows it to be used by mypyc.

Author: JukkaL

mypy/build.py

@@ -86,7 +86,7 @@ def __init__(self, manager: 'BuildManager', graph: Graph) -> None:
         self.manager = manager
         self.graph = graph
         self.files = manager.modules
-        self.types = manager.all_types  # Non-empty for tests only or if dumping deps
+        self.types = manager.all_types  # Non-empty if export_types True in options
         self.used_cache = manager.cache_enabled
         self.errors = []  # type: List[str]  # Filled in by build if desired
 
@@ -662,7 +662,7 @@ class BuildManager:
                        Semantic analyzer, pass 2
       semantic_analyzer_pass3:
                        Semantic analyzer, pass 3
-      all_types:       Map {Expression: Type} collected from all modules (tests only)
+      all_types:       Map {Expression: Type} from all modules (enabled by export_types)
       options:         Build options
       missing_modules: Set of modules that could not be imported encountered so far
       stale_modules:   Set of modules that needed to be rechecked (only used by tests)
@@ -708,7 +708,7 @@ def __init__(self, data_dir: str,
                                                   self.errors, self.plugin)
         self.semantic_analyzer_pass3 = SemanticAnalyzerPass3(self.modules, self.errors,
                                                              self.semantic_analyzer)
-        self.all_types = {}  # type: Dict[Expression, Type]  # Used by tests only
+        self.all_types = {}  # type: Dict[Expression, Type]  # Enabled by export_types
         self.indirection_detector = TypeIndirectionVisitor()
         self.stale_modules = set()  # type: Set[str]
         self.rechecked_modules = set()  # type: Set[str]
@@ -2173,10 +2173,9 @@ def finish_passes(self) -> None:
         if self.options.semantic_analysis_only:
             return
         with self.wrap_context():
-            # Some tests want to look at the set of all types.
+            # Some tests (and tools) want to look at the set of all types.
             options = manager.options
-            if ((options.use_builtins_fixtures and not options.fine_grained_incremental) or
-                    manager.options.dump_deps):
+            if options.export_types:
                 manager.all_types.update(self.type_map())
 
             # We should always patch indirect dependencies, even in full (non-incremental) builds,

mypy/options.py

@@ -195,6 +195,8 @@ def __init__(self) -> None:
         self.local_partial_types = False
         # Some behaviors are changed when using Bazel (https://bazel.build).
         self.bazel = False
+        # If True, export inferred types for all expressions as BuildResult.types
+        self.export_types = False
         # List of package roots -- directories under these are packages even
         # if they don't have __init__.py.
         self.package_root = []  # type: List[str]

mypy/test/testdeps.py

@@ -83,6 +83,7 @@ def build(self,
         options.show_traceback = True
         options.cache_dir = os.devnull
         options.python_version = python_version
+        options.export_types = True
         try:
             result = build.build(sources=[BuildSource('main', None, source)],
                                  options=options,

mypy/test/testtypegen.py

@@ -34,6 +34,7 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
             options.strict_optional = False  # TODO: Enable strict optional checking
             options.use_builtins_fixtures = True
             options.show_traceback = True
+            options.export_types = True
             result = build.build(sources=[BuildSource('main', None, src)],
                                  options=options,
                                  alt_lib_path=test_temp_dir)