Skip to content

Commit

Permalink
refactor inference.jl into multiple files for readability/maintainabi…
Browse files Browse the repository at this point in the history
…lity [ci skip]
  • Loading branch information
jrevels committed Jan 12, 2018
1 parent 931dc51 commit ca91862
Show file tree
Hide file tree
Showing 39 changed files with 4,425 additions and 4,305 deletions.
2 changes: 1 addition & 1 deletion HISTORY.md
Expand Up @@ -584,7 +584,7 @@ Deprecated or removed
* `Base.promote_type(op::Type, Ts::Type...)` has been removed as part of an overhaul
of `broadcast`'s promotion mechanism. If you need the functionality of that
`Base.promote_type` method, consider defining it locally via
`Core.Inference.return_type(op, Tuple{Ts...})` ([#18642]).
`Core.Compiler.return_type(op, Tuple{Ts...})` ([#18642]).

* `bitbroadcast` has been deprecated in favor of `broadcast`, which now produces a
`BitArray` instead of `Array{Bool}` for functions yielding a boolean result ([#19771]).
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -174,7 +174,7 @@ $(build_private_libdir)/%.$(SHLIB_EXT): $(build_private_libdir)/%.o
@$(DSYMUTIL) $@

CORE_SRCS := $(addprefix $(JULIAHOME)/, \
base/boot.jl base/coreimg.jl \
base/boot.jl base/compiler/compiler.jl \
base/docs/core.jl \
base/abstractarray.jl \
base/array.jl \
Expand All @@ -186,7 +186,7 @@ CORE_SRCS := $(addprefix $(JULIAHOME)/, \
base/generator.jl \
base/expr.jl \
base/hashing.jl \
base/inference.jl \
base/compiler/compiler.jl \
base/int.jl \
base/bitset.jl \
base/number.jl \
Expand All @@ -204,7 +204,7 @@ STDLIB_SRCS := $(sort $(shell find $(JULIAHOME)/stdlib/*/src -name \*.jl))
$(build_private_libdir)/inference.ji: $(CORE_SRCS) | $(build_private_libdir)
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
$(call spawn,$(JULIA_EXECUTABLE)) -C "$(JULIA_CPU_TARGET)" --output-ji $(call cygpath_w,$@) \
--startup-file=no -g0 -O0 coreimg.jl)
--startup-file=no -g0 -O0 compiler/compiler.jl)

RELBUILDROOT := $(shell $(JULIAHOME)/contrib/relative_path.sh "$(JULIAHOME)/base" "$(BUILDROOT)/base/")
COMMA:=,
Expand Down
2 changes: 1 addition & 1 deletion base/array.jl
Expand Up @@ -503,7 +503,7 @@ if isdefined(Core, :Inference)
if $I isa Generator && ($I).f isa Type
($I).f
else
Core.Inference.return_type(first, Tuple{typeof($I)})
Core.Compiler.return_type(first, Tuple{typeof($I)})
end
end
end
Expand Down

0 comments on commit ca91862

Please sign in to comment.