Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
prevision for the merge of wasm_of_ocaml
* Compiler: introduce a Targetint module
that follows the semantic of the backend (js or wasm)
* Compiler: warn on joo_global_object
* Runtime: change Sys.os_type on windows (Cygwin -> Win32)
* Runtime: backtraces are really expensive, they need to be be explicitly
requested at compile time (--enable with-js-error) or at startup (OCAMLRUNPARAM=b=1)
Expand Down
5 changes: 1 addition & 4 deletions compiler/lib/linker.ml
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,7 @@ module Check = struct
let freename = StringSet.diff freename Reserved.provided in
let freename = StringSet.remove Global_constant.global_object freename in
let freename = if has_flags then StringSet.remove "FLAG" freename else freename in
if StringSet.mem Global_constant.old_global_object freename && false
(* Don't warn yet, we want to give a transition period where both
"globalThis" and "joo_global_object" are allowed without extra
noise *)
if StringSet.mem Global_constant.old_global_object freename
then
warn
"warning: %s: 'joo_global_object' is being deprecated, please use `globalThis` \
Expand Down